Merge remote-tracking branch 'origin/main'

Author: schell

Diff for: Cargo.lock

@@ -16,7 +16,8 @@ resolver = "2"
 assert_approx_eq = "1.1.0"
 async-channel = "1.8"
 bytemuck = { version = "1.13.0", features = ["derive"] }
-crabslab = { version = "0.4.5", default-features = false }
+crabslab = { version = "0.4.6", default-features = false }
+dagga = "0.2.1"
 env_logger = "0.10.0"
 futures-lite = "1.13"
 gltf = { git = 'https://github.com/gltf-rs/gltf.git', features = ["KHR_lights_punctual", "KHR_materials_unlit", "KHR_materials_emissive_strength", "extras"] }

Diff for: Cargo.toml

@@ -60,6 +60,7 @@ pub async fn load(path: &str) -> Result<Vec<u8>, LoadingBytesError> {
     array.copy_to(&mut bytes);
     Ok(bytes)
 }
+
 #[cfg(not(target_arch = "wasm32"))]
 pub async fn load(path: &str) -> Result<Vec<u8>, LoadingBytesError> {
     let bytes: Vec<u8> = async_fs::read(path).await.with_context(|_| FsSnafu {

Diff for: crates/loading-bytes/src/lib.rs

@@ -89,6 +89,7 @@ glam = { version = "0.24.2", default-features = false, features = ["libm"] }
 async-channel = {workspace = true}
 bytemuck = {workspace = true}
 crabslab = { workspace = true, features = ["default"] }
+dagga = {workspace=true}
 crunch = "0.5"
 futures-lite = {workspace=true}
 glam = { workspace = true, features = ["std"] }

Diff for: crates/renderling/Cargo.toml

@@ -23,8 +23,8 @@ pub mod convolution;
 pub mod cubemap;
 #[cfg(not(target_arch = "spirv"))]
 pub mod frame;
-#[cfg(feature = "gltf")]
-pub mod gltf;
+// #[cfg(feature = "gltf")]
+// pub mod gltf;
 #[cfg(not(target_arch = "spirv"))]
 mod hdr;
 #[cfg(not(target_arch = "spirv"))]
@@ -919,39 +919,57 @@ mod test {
             Vertex::default().with_position([size, size, 0.0]),
             Vertex::default().with_position([size, 0.0, 0.0]),
         ]);
-        let root_mat4 = Mat4::from(Transform {
+
+        let mut root_node = stage.new_nested_transform();
+        root_node.set_local_transform(Transform {
             scale: Vec3::new(25.0, 25.0, 1.0),
             ..Default::default()
         });
-        let offset_mat4 = Mat4::from(Transform {
+        println!("root_node: {:#?}", root_node.get_global_transform());
+
+        let offset = Transform {
             translation: Vec3::new(1.0, 1.0, 0.0),
             ..Default::default()
-        });
-        let cyan_mat4 = root_mat4 * offset_mat4;
-        let cyan_transform = stage.append(&cyan_mat4.into());
-        let yellow_mat4 = cyan_mat4 * offset_mat4;
-        let yellow_transform = stage.append(&yellow_mat4.into());
-        let red_mat4 = yellow_mat4 * offset_mat4;
-        let red_transform = stage.append(&red_mat4.into());
+        };
+
+        let mut cyan_node = NestedTransform::new(&mut stage);
+        cyan_node.set_local_transform(offset);
+        println!("cyan_node: {:#?}", cyan_node.get_global_transform());
+
+        let mut yellow_node = NestedTransform::new(&mut stage);
+        yellow_node.set_local_transform(offset);
+        println!("yellow_node: {:#?}", yellow_node.get_global_transform());
+
+        let mut red_node = NestedTransform::new(&mut stage);
+        red_node.set_local_transform(offset);
+        println!("red_node: {:#?}", red_node.get_global_transform());
+
+        root_node.add_child(&cyan_node);
+        println!("cyan_node: {:#?}", cyan_node.get_global_transform());
+        cyan_node.add_child(&yellow_node);
+        println!("yellow_node: {:#?}", yellow_node.get_global_transform());
+        yellow_node.add_child(&red_node);
+        println!("red_node: {:#?}", red_node.get_global_transform());
+
         let _cyan_primitive = stage.draw(&Renderlet {
             vertices: geometry,
             camera,
             material: cyan_material,
-            transform: cyan_transform,
+            transform: cyan_node.global_transform_id(),
             ..Default::default()
         });
         let _yellow_primitive = stage.draw(&Renderlet {
             vertices: geometry,
             camera,
             material: yellow_material,
-            transform: yellow_transform,
+            transform: yellow_node.global_transform_id(),
             ..Default::default()
         });
         let _red_primitive = stage.draw(&Renderlet {
             vertices: geometry,
             camera,
             material: red_material,
-            transform: red_transform,
+            transform: red_node.global_transform_id(),
             ..Default::default()
         });
 

Diff for: crates/renderling/src/lib.rs

@@ -23,10 +23,10 @@ mod cpu;
 #[cfg(not(target_arch = "spirv"))]
 pub use cpu::*;
 
-// #[cfg(all(feature = "gltf", not(target_arch = "spirv")))]
-// mod gltf_support;
-// #[cfg(all(feature = "gltf", not(target_arch = "spirv")))]
-// pub use gltf_support::*;
+#[cfg(all(feature = "gltf", not(target_arch = "spirv")))]
+mod gltf_support;
+#[cfg(all(feature = "gltf", not(target_arch = "spirv")))]
+pub use gltf_support::*;
 
 /// A vertex in a mesh.
 #[cfg_attr(not(target_arch = "spirv"), derive(Debug))]
@@ -175,7 +175,7 @@ impl Vertex {
 /// `Id::new(0)`. This corresponds to the `PbrConfig` that is maintained by
 /// the [`Stage`].
 #[cfg_attr(not(target_arch = "spirv"), derive(Debug))]
-#[derive(Clone, Copy, SlabItem)]
+#[derive(Clone, Copy, PartialEq, SlabItem)]
 pub struct Renderlet {
     pub visible: bool,
     pub vertices: Array<Vertex>,