fix macos and ios builds (but they currently crash on init)

paxdotdev · Nov 21, 2024 · e99baa2 · e99baa2
1 parent 51dbc3a
commit e99baa2
Show file tree

Hide file tree

Showing 22 changed files with 24 additions and 3 deletions.
diff --git a/examples/src/breakout/Cargo.toml b/examples/src/breakout/Cargo.toml
@@ -13,6 +13,7 @@ pax-kit = { version = "0.38.3", path="../../../pax-kit" }
 
 [lib]
 crate-type = ["cdylib", "rlib"]
+name = "paxcartridge"
 
 [[bin]]
 name = "parser"

diff --git a/examples/src/calculator/Cargo.toml b/examples/src/calculator/Cargo.toml
@@ -9,6 +9,7 @@ pax-kit = { version = "0.38.3", path="../../../pax-kit" }
 
 [lib]
 crate-type = ["cdylib", "rlib"]
+name = "paxcartridge"
 
 [[bin]]
 name = "parser"

diff --git a/examples/src/color-picker/Cargo.toml b/examples/src/color-picker/Cargo.toml
@@ -9,6 +9,7 @@ pax-kit = { version = "0.38.3", path="../../../pax-kit" }
 
 [lib]
 crate-type = ["cdylib", "rlib"]
+name = "paxcartridge"
 
 [[bin]]
 name = "parser"

diff --git a/examples/src/fireworks/Cargo.toml b/examples/src/fireworks/Cargo.toml
@@ -9,6 +9,7 @@ pax-kit = { version = "0.38.3", path="../../../pax-kit" }
 
 [lib]
 crate-type = ["cdylib", "rlib"]
+name = "paxcartridge"
 
 [[bin]]
 name = "parser"

diff --git a/examples/src/fireworks/src/fireworks.pax b/examples/src/fireworks/src/fireworks.pax
@@ -1,4 +1,4 @@
-<Group @wheel=self.handle_wheel>
+<Group @wheel=self.handle_wheel y=50.00% x=50.00% width=7.98% height=13.92%>
     <Text x=0% y=0% text="SCROLL" height=100% width=100% style={
         font: Font::Web(
             "Roboto",

diff --git a/examples/src/game-of-life/Cargo.toml b/examples/src/game-of-life/Cargo.toml
@@ -9,6 +9,7 @@ pax-kit = { version = "0.38.3", path="../../../pax-kit" }
 
 [lib]
 crate-type = ["cdylib", "rlib"]
+name = "paxcartridge"
 
 [[bin]]
 name = "parser"

diff --git a/examples/src/increment/Cargo.toml b/examples/src/increment/Cargo.toml
@@ -9,6 +9,7 @@ pax-kit = { version = "0.38.3", path="../../../pax-kit" }
 
 [lib]
 crate-type = ["cdylib", "rlib"]
+name = "paxcartridge"
 
 [[bin]]
 name = "parser"

diff --git a/examples/src/llm-interface/Cargo.toml b/examples/src/llm-interface/Cargo.toml
@@ -11,6 +11,7 @@ getrandom = { version = "0.2.15", features = ["js"] }
 
 [lib]
 crate-type = ["cdylib", "rlib"]
+name = "paxcartridge"
 
 [[bin]]
 name = "parser"

diff --git a/examples/src/marketing-site/Cargo.toml b/examples/src/marketing-site/Cargo.toml
@@ -11,6 +11,7 @@ getrandom = { version = "0.2.15", features = ["js"] }
 
 [lib]
 crate-type = ["cdylib", "rlib"]
+name = "paxcartridge"
 
 [[bin]]
 name = "parser"

diff --git a/examples/src/mouse-animation/Cargo.toml b/examples/src/mouse-animation/Cargo.toml
@@ -9,6 +9,7 @@ pax-kit = { version = "0.38.3", path="../../../pax-kit" }
 
 [lib]
 crate-type = ["cdylib", "rlib"]
+name = "paxcartridge"
 
 [[bin]]
 name = "parser"

diff --git a/examples/src/particles/Cargo.toml b/examples/src/particles/Cargo.toml
@@ -11,6 +11,7 @@ pax-kit = { version = "0.38.3", path="../../../pax-kit" }
 
 [lib]
 crate-type = ["cdylib", "rlib"]
+name = "paxcartridge"
 
 [[bin]]
 name = "parser"

diff --git a/examples/src/perf-testbed/Cargo.toml b/examples/src/perf-testbed/Cargo.toml
@@ -11,6 +11,7 @@ getrandom = { version = "0.2.15", features = ["js"] }
 
 [lib]
 crate-type = ["cdylib", "rlib"]
+name = "paxcartridge"
 
 [[bin]]
 name = "parser"

diff --git a/examples/src/slot-particles/Cargo.toml b/examples/src/slot-particles/Cargo.toml
@@ -12,6 +12,7 @@ fireworks = {version = "0.36.3", path="../fireworks" }
 
 [lib]
 crate-type = ["cdylib", "rlib"]
+name = "paxcartridge"
 
 [[bin]]
 name = "parser"

diff --git a/examples/src/space-game/Cargo.toml b/examples/src/space-game/Cargo.toml
@@ -11,6 +11,7 @@ pax-kit = { version = "0.38.3", path="../../../pax-kit" }
 
 [lib]
 crate-type = ["cdylib", "rlib"]
+name = "paxcartridge"
 
 [[bin]]
 name = "parser"

diff --git a/examples/src/starter-project/Cargo.toml b/examples/src/starter-project/Cargo.toml
@@ -13,6 +13,7 @@ space-game = { version = "0.38.3", path="../space-game" }
 
 [lib]
 crate-type = ["cdylib", "rlib"]
+name = "paxcartridge"
 
 [[bin]]
 name = "parser"

diff --git a/pax-chassis-common/src/core_graphics_c_bridge.rs b/pax-chassis-common/src/core_graphics_c_bridge.rs
@@ -128,6 +128,7 @@ pub extern "C" fn pax_tick(
         (
             CoreGraphicsContext::new_y_up(ctx, height as f64, None),
             Box::new(|| (/* clear screen here */)),
+            Box::new(|| (/* handle resize here */)),
         )
     });
 

diff --git a/pax-compiler/files/new-project/new-libdev-project-template/Cargo.toml.template b/pax-compiler/files/new-project/new-libdev-project-template/Cargo.toml.template
@@ -11,6 +11,7 @@ getrandom = { version = "0.2.15", features = ["js"] }
 
 [lib]
 crate-type = ["cdylib", "rlib"]
+name = "paxcartridge"
 
 [[bin]]
 name = "parser"

diff --git a/pax-compiler/files/new-project/new-project-template/Cargo.toml.template b/pax-compiler/files/new-project/new-project-template/Cargo.toml.template
@@ -11,6 +11,7 @@ getrandom = { version = "0.2.15", features = ["js"] }
 
 [lib]
 crate-type = ["cdylib", "rlib"]
+name = "paxcartridge"
 
 [[bin]]
 name = "parser"

diff --git a/pax-compiler/tests/data/code_serialization/serialization_test_project/Cargo.toml b/pax-compiler/tests/data/code_serialization/serialization_test_project/Cargo.toml
@@ -9,6 +9,7 @@ pax-kit = { version = "0.38.3", path="../../../../../pax-kit" }
 
 [lib]
 crate-type = ["cdylib", "rlib"]
+name = "paxcartridge"
 
 [[bin]]
 name = "parser"

diff --git a/pax-generation/generated_project/Cargo.toml b/pax-generation/generated_project/Cargo.toml
@@ -11,6 +11,7 @@ getrandom = { version = "0.2.15", features = ["js"] }
 
 [lib]
 crate-type = ["cdylib", "rlib"]
+name = "paxcartridge"
 
 [[bin]]
 name = "parser"

diff --git a/pax-macro/templates/derive_pax.stpl b/pax-macro/templates/derive_pax.stpl
@@ -100,9 +100,9 @@
         <%= engine_import_path %>::pax_chassis_common::env_logger::init();
 
         let manifest = init_manifest();
-        let definition_to_instance_traverser = init_definition_to_instance_traverser(manifest);
+        let definition_to_instance_traverser = init_definition_to_instance_traverser(manifest.clone());
 
-        let main_component_instance = definition_to_instance_traverser.get_main_component();
+        let main_component_instance = definition_to_instance_traverser.get_main_component(&manifest.main_component_type_id.to_string());
 
         //Initialize a ManuallyDrop-contained PaxEngine, so that a pointer to that
         //engine can be passed back to Swift via the C (FFI) bridge
@@ -115,6 +115,7 @@
             OS::Mac,
             #[cfg(feature="ios")]
             OS::IPhone,
+            Box::new(||{ /* return elapsed millis here */ 0 })
         )));
 
         let container = std::mem::ManuallyDrop::new(Box::new(<%= engine_import_path %>::pax_chassis_common::core_graphics_c_bridge::PaxEngineContainer {

diff --git a/tests/src/playground/Cargo.toml b/tests/src/playground/Cargo.toml
@@ -12,6 +12,7 @@ pax-designtime = {version = "0.23.0", path="../../../pax-designtime"}
 
 [lib]
 crate-type = ["cdylib", "rlib"]
+name = "paxcartridge"
 
 [[bin]]
 name = "parser"
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,6 +13,7 @@ pax-kit = { version = "0.38.3", path="../../../pax-kit" } @@
     [lib]
     crate-type = ["cdylib", "rlib"]
+    name = "paxcartridge"
     [[bin]]
     name = "parser"
@@ Expand Down @@