tirbofish/dropbear · diff

a52fdb7 · tk

Merge remote-tracking branch 'origin/main' # Conflicts: # eucalyptus-core/src/scripting/jni/exports.rs # src/commonMain/kotlin/com/dropbear/EntityRef.kt # src/commonMain/kotlin/com/dropbear/ffi/NativeEngine.kt # src/jvmMain/java/com/dropbear/ffi/JNINative.java # src/jvmMain/kotlin/com/dropbear/ffi/NativeEngine.jvm.kt # src/nativeMain/kotlin/com/dropbear/ffi/NativeEngine.native.kt

diff --git a/Cargo.toml b/Cargo.toml
index da6298c..91d35fa 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -6,7 +6,7 @@ package.repository = "https://github.com/4tkbytes/dropbear"
 package.readme = "README.md"
 
 resolver = "3"
-members = [ "dropbear-engine", "dropbear-shader", "dropbear_future-queue", "eucalyptus-core", "eucalyptus-editor", "magna-carta", "redback-runtime"]
+members = [ "dropbear-engine", "dropbear-macro", "dropbear-shader", "dropbear-traits", "dropbear_future-queue", "eucalyptus-core", "eucalyptus-editor", "magna-carta", "redback-runtime"]
 
 [workspace.dependencies]
 anyhow = { version = "1.0", features = ["backtrace"] }
@@ -64,6 +64,9 @@ dashmap = "6.1"
 open = "5.3"
 egui_plot = "0.34"
 memory-stats = "1.2"
+typetag = "0.2"
+syn = { version = "2.0", features = ["full"] }
+quote = "1.0"
 
 [workspace.dependencies.image]
 version = "0.25"
@@ -79,4 +82,4 @@ lto = false
 
 # makes the debug builds so much more faster
 [profile.dev.package."*"]
-opt-level = 3
\ No newline at end of file
+opt-level = 3
diff --git a/dropbear-engine/Cargo.toml b/dropbear-engine/Cargo.toml
index a608343..9d4992d 100644
--- a/dropbear-engine/Cargo.toml
+++ b/dropbear-engine/Cargo.toml
@@ -11,6 +11,8 @@ readme.workspace = true
 [dependencies]
 dropbear_future-queue = { path = "../dropbear_future-queue" }
 dropbear-shader = { path = "../dropbear-shader" }
+dropbear-traits = { path = "../dropbear-traits" }
+dropbear-macro = { path = "../dropbear-macro" }
 
 anyhow.workspace = true
 app_dirs2.workspace = true
@@ -33,7 +35,6 @@ wgpu.workspace = true
 winit.workspace = true
 hecs.workspace = true
 parking_lot.workspace = true
-lazy_static.workspace = true
 gltf.workspace = true
 rayon.workspace = true

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