tirbofish/dropbear · diff

bd6a938 · Thribhu K

feature: native kotlin fix: fixed up model not being saved properly refactor: removed building for the time being. jarvis, run github actions

diff --git a/crates/dropbear-engine/src/model.rs b/crates/dropbear-engine/src/model.rs
index fd4db41..51612e9 100644
--- a/crates/dropbear-engine/src/model.rs
+++ b/crates/dropbear-engine/src/model.rs
@@ -1132,6 +1132,7 @@ impl Model {
         B: AsRef<[u8]>,
     {
         puffin::profile_function!(label.unwrap_or("unlabelled model"));
+        log::debug!("Loading model: {:?}", label);
         let mut registry = registry.write();
 
         let model_label = label
diff --git a/crates/eucalyptus-core/src/component.rs b/crates/eucalyptus-core/src/component.rs
index 176f098..dad4208 100644
--- a/crates/eucalyptus-core/src/component.rs
+++ b/crates/eucalyptus-core/src/component.rs
@@ -2,7 +2,7 @@ use crate::hierarchy::EntityTransformExt;
 use crate::physics::PhysicsState;
 use crate::ser::model::EucalyptusModel;
 use crate::states::{SerializedMaterialCustomisation, SerializedMeshRenderer};
-use crate::utils::{AsFile, ResolveReference};
+use crate::utils::{ResolveReference};
 use downcast_rs::{Downcast, impl_downcast};
 use dropbear_engine::asset::{ASSET_REGISTRY, Handle};
 use dropbear_engine::entity::{EntityTransform, MeshRenderer, Transform};
@@ -600,7 +600,7 @@ impl Component for MeshRenderer {
                 match crate::metadata::find_asset_by_uuid(&project_root, uuid) {
                     Ok(entry) => {
                         if let crate::resource::ResourceReference::File(rel) = &entry.location {
-                            let abs = project_root.join("resources").join(rel);
+                            let abs = project_root.join(rel);
                             match ResourceReference::from_path(&abs) {
                                 Ok(engine_ref) => {
                                     log::debug!("Loading model '{}' via UUID {}", entry.name, uuid);
diff --git a/crates/eucalyptus-editor/src/build.rs b/crates/eucalyptus-editor/src/build.rs
index e5d36e1..5aa33a6 100644
--- a/crates/eucalyptus-editor/src/build.rs
+++ b/crates/eucalyptus-editor/src/build.rs
@@ -4,10 +4,8 @@ use crossbeam_channel::Sender;
 use eucalyptus_core::APP_INFO;
 use eucalyptus_core::config::ProjectConfig;
 use eucalyptus_core::runtime::RuntimeProjectConfig;
-use eucalyptus_core::scene::SceneConfig;
 use magna_carta::Target;
 use ron::ser::PrettyConfig;
-use semver::Version;
 use std::fs;
 use std::path::{Path, PathBuf};
 use std::time::UNIX_EPOCH;
@@ -16,83 +14,85 @@ use tokio::{fs as tokio_fs, process::Command, task};

Large diffs are not rendered by default. Showing the first 50 of 2817 lines. Show full diff