Make system_update_world_transforms also update world transforms for SceneGraphs

Before this couldn't be done since lyra-scene could not depend on lyra-resource, it would have caused a cyclic dependency. The last commit, where I created lyra-gltf from code inside lyra-resource, made this possible

.gitmodules

@@ -1,6 +1,6 @@
 [submodule "lyra-scripting/elua"]
-	path = lyra-scripting/elua
+	path = crates/lyra-scripting/elua
 	url = ../elua.git # git@git.seanomik.net:SeanOMik/elua.git
 [submodule "wgsl-preprocessor"]
-	path = wgsl-preprocessor
+	path = crates/wgsl-preprocessor
 	url = git@git.seanomik.net:SeanOMik/wgsl-preprocessor.git

Cargo.lock

@@ -1,6 +1,6 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 
 [[package]]
 name = "ab_glyph"
@@ -854,6 +854,16 @@ dependencies = [
  "crypto-common",
 ]
 
+[[package]]
+name = "dim_2d"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "async-std",
+ "lyra-engine",
+ "tracing",
+]
+
 [[package]]
 name = "dispatch"
 version = "0.2.0"
@@ -1819,6 +1829,7 @@ dependencies = [
  "itertools 0.13.0",
  "lyra-ecs",
  "lyra-game-derive",
+ "lyra-gltf",
  "lyra-math",
  "lyra-reflect",
  "lyra-resource",
@@ -1850,6 +1861,34 @@ dependencies = [
  "syn 2.0.77",
 ]
 
+[[package]]
+name = "lyra-gltf"
+version = "0.0.1"
+dependencies = [
+ "anyhow",
+ "async-std",
+ "base64 0.21.7",
+ "crossbeam",
+ "glam",
+ "gltf",
+ "image",
+ "infer",
+ "instant",
+ "lyra-ecs",
+ "lyra-math",
+ "lyra-reflect",
+ "lyra-resource",
+ "lyra-scene",
+ "mime",
+ "notify",
+ "notify-debouncer-full",
+ "percent-encoding",
+ "rand",
+ "thiserror",
+ "tracing",
+ "uuid",
+]
+
 [[package]]
 name = "lyra-math"
 version = "0.1.0"
@@ -1884,14 +1923,12 @@ dependencies = [
  "base64 0.21.7",
  "crossbeam",
  "glam",
- "gltf",
  "image",
  "infer",
  "instant",
  "lyra-ecs",
  "lyra-math",
  "lyra-reflect",
- "lyra-scene",
  "mime",
  "notify",
  "notify-debouncer-full",
@@ -1910,6 +1947,7 @@ dependencies = [
  "lyra-ecs",
  "lyra-math",
  "lyra-reflect",
+ "lyra-resource",
 ]
 
 [[package]]

Cargo.toml

@@ -5,20 +5,15 @@ edition = "2021"
 
 [workspace]
 members = [
-    "lyra-resource",
-    "lyra-ecs",
-    "lyra-reflect",
-    "lyra-scripting",
-    "lyra-game",
-    "lyra-math",
-    "lyra-scene",
+    "crates/*",
     
-    "examples/testbed",
-    "examples/many-lights",
+    "examples/2d",
     "examples/fixed-timestep-rotating-model",
     "examples/lua-scripting",
-    "examples/simple_scene",
+    "examples/many-lights",
     "examples/shadows",
+    "examples/simple_scene",
+    "examples/testbed",
 ]
 
 [features]
@@ -27,8 +22,8 @@ lua_scripting = ["scripting", "lyra-scripting/lua"]
 tracy = ["lyra-game/tracy"]
 
 [dependencies]
-lyra-game = { path = "lyra-game" }
-lyra-scripting = { path = "lyra-scripting", optional = true }
+lyra-game = { path = "crates/lyra-game" }
+lyra-scripting = { path = "crates/lyra-scripting", optional = true }
 
 #[profile.dev]
 #opt-level = 1

crates/lyra-ecs/src/query/filter/changed.rs

@@ -90,7 +90,7 @@ impl<T: Component> AsQuery for Changed<T> {
     type Query = Self;
 }
 
-impl<'a, T: Component> Filter for Changed<T> { }
+impl<T: Component> Filter for Changed<T> { }
 
 impl<T: Component> AsFilter for Changed<T> {
     type Filter = Self;

crates/lyra-ecs/src/query/filter/has.rs

@@ -1,6 +1,8 @@
 use std::marker::PhantomData;
 
-use crate::{query::{AsQuery, Query}, Archetype, Component, DynTypeId, World};
+use crate::{query::{AsFilter, AsQuery, Filter, Query}, Archetype, Component, DynTypeId, World};
+
+use super::StaticFetcher;
 
 /// A filter query that fetches when the entity has the component `C`.
 /// 
@@ -20,9 +22,8 @@ impl<C: Component> Clone for Has<C> {
 }
 
 impl<C: Component> Query for Has<C> {
-    type Item<'a> = ();
-    
-    type Fetch<'a> = ();
+    type Item<'a> = bool;
+    type Fetch<'a> = StaticFetcher<bool>;
 
     fn new() -> Self {
         Has {
@@ -35,10 +36,17 @@ impl<C: Component> Query for Has<C> {
     }
 
     unsafe fn fetch<'a>(&self, _world: &'a World, _: &'a Archetype, _: crate::Tick) -> Self::Fetch<'a> {
-        ()
+        // if fetch is called, it means that 'can_visit_archetype' returned true
+        StaticFetcher::new(true)
     }
 }
 
 impl<C: Component> AsQuery for Has<C> {
     type Query = Self;
 }
+
+impl<C: Component> Filter for Has<C> { }
+
+impl<C: Component> AsFilter for Has<C> {
+    type Filter = Self;
+}

crates/lyra-ecs/src/query/filter/mod.rs

@@ -0,0 +1,44 @@
+mod has;
+use std::marker::PhantomData;
+
+pub use has::*;
+
+mod or;
+pub use or::*;
+
+mod not;
+pub use not::*;
+
+mod changed;
+pub use changed::*;
+
+use super::Fetch;
+
+/// A fetcher that just returns a provided value
+pub struct StaticFetcher<T: Clone> {
+    value: T,
+}
+
+impl<'a, T: Clone> StaticFetcher<T> {
+    pub fn new(value: T) -> Self {
+        Self {
+            value
+        }
+    }
+}
+
+
+impl<'a, T> Fetch<'a> for StaticFetcher<T>
+where 
+    T: Clone + 'a,
+{
+    type Item = T;
+
+    fn dangling() -> Self {
+        unreachable!()
+    }
+
+    unsafe fn get_item(&mut self, _: crate::world::ArchetypeEntityId) -> Self::Item {
+        self.value.clone()
+    }
+}

crates/lyra-ecs/src/query/filter/not.rs

@@ -1,4 +1,6 @@
-use crate::{query::{AsQuery, Query}, Archetype, World};
+use crate::{query::{AsFilter, AsQuery, Filter, Query}, Archetype, World};
+
+use super::StaticFetcher;
 
 /// A filter query that fetches the inverse of `Q`.
 /// 
@@ -20,9 +22,8 @@ pub struct Not<Q: Query> {
 }
 
 impl<Q: Query> Query for Not<Q> {
-    type Item<'a> = ();
-    
-    type Fetch<'a> = ();
+    type Item<'a> = bool;
+    type Fetch<'a> = StaticFetcher<bool>;
 
     fn new() -> Self {
         Not {
@@ -35,10 +36,17 @@ impl<Q: Query> Query for Not<Q> {
     }
 
     unsafe fn fetch<'a>(&self, _world: &'a World, _: &'a Archetype, _: crate::Tick) -> Self::Fetch<'a> {
-        ()
+        // if fetch is called, it means that 'can_visit_archetype' returned true
+        StaticFetcher::new(true)
     }
 }
 
 impl<Q: Query> AsQuery for Not<Q> {
     type Query = Self;
 }
+
+impl<Q: Query> Filter for Not<Q> { }
+
+impl<Q: Query> AsFilter for Not<Q> {
+    type Filter = Self;
+}

crates/lyra-game/Cargo.toml

@@ -10,6 +10,7 @@ lyra-ecs = { path = "../lyra-ecs", features = [ "math" ] }
 lyra-reflect = { path = "../lyra-reflect", features = [ "math" ] }
 lyra-math = { path = "../lyra-math" }
 lyra-scene = { path = "../lyra-scene" }
+lyra-gltf = { path = "../lyra-gltf" }
 wgsl_preprocessor = { path = "../wgsl-preprocessor" }
 
 winit = "0.30.5"

crates/lyra-game/src/lib.rs

@@ -29,5 +29,6 @@ pub use lyra_resource as assets;
 pub use lyra_ecs as ecs;
 pub use lyra_math as math;
 pub use lyra_reflect as reflect;
+pub use lyra_gltf as gltf;
 
 pub use plugin::DefaultPlugins;

crates/lyra-game/src/plugin.rs

@@ -1,4 +1,6 @@
+use lyra_ecs::query::ResMut;
 use lyra_ecs::CommandQueue;
+use lyra_gltf::GltfLoader;
 use lyra_resource::ResourceManager;
 
 use crate::game::App;
@@ -113,6 +115,7 @@ impl Plugin for DefaultPlugins {
         CommandQueuePlugin.setup(app);
         InputPlugin.setup(app);
         ResourceManagerPlugin.setup(app);
+        GltfPlugin.setup(app);
         WindowPlugin::default().setup(app);
         DeltaTimePlugin.setup(app);
     }
@@ -128,3 +131,13 @@ impl Plugin for CommandQueuePlugin {
         app.world.add_resource(CommandQueue::default());
     }
 }
+
+#[derive(Default)]
+pub struct GltfPlugin;
+
+impl Plugin for GltfPlugin {
+    fn setup(&mut self, app: &mut App) {
+        let man: ResMut<ResourceManager> = app.world.get_resource_or_default();
+        man.register_loader::<GltfLoader>();
+    }
+}

crates/lyra-game/src/render/graph/passes/mesh_prepare.rs

@@ -12,7 +12,8 @@ use lyra_ecs::{
     Entity, ResourceObject, World,
 };
 use lyra_game_derive::RenderGraphLabel;
-use lyra_resource::{gltf::Mesh, ResHandle};
+use lyra_resource::ResHandle;
+use lyra_gltf::Mesh;
 use lyra_scene::SceneGraph;
 use rustc_hash::FxHashMap;
 use tracing::{debug, instrument};
@@ -93,10 +94,10 @@ impl MeshPrepNode {
             if let Some(index_buffer) = buffers.buffer_indices.as_ref() {
                 let aligned_indices = match mesh.indices.as_ref().unwrap() {
                     // U16 indices need to be aligned to u32, for wpgu, which are 4-bytes in size.
-                    lyra_resource::gltf::MeshIndices::U16(v) => {
+                    lyra_gltf::MeshIndices::U16(v) => {
                         bytemuck::pod_align_to::<u16, u32>(v).1
                     }
-                    lyra_resource::gltf::MeshIndices::U32(v) => {
+                    lyra_gltf::MeshIndices::U32(v) => {
                         bytemuck::pod_align_to::<u32, u32>(v).1
                     }
                 };
@@ -137,10 +138,10 @@ impl MeshPrepNode {
         let indices = match mesh.indices.as_ref() {
             Some(indices) => {
                 let (idx_type, len, contents) = match indices {
-                    lyra_resource::gltf::MeshIndices::U16(v) => {
+                    lyra_gltf::MeshIndices::U16(v) => {
                         (wgpu::IndexFormat::Uint16, v.len(), bytemuck::cast_slice(v))
                     }
-                    lyra_resource::gltf::MeshIndices::U32(v) => {
+                    lyra_gltf::MeshIndices::U32(v) => {
                         (wgpu::IndexFormat::Uint32, v.len(), bytemuck::cast_slice(v))
                     }
                 };
@@ -518,7 +519,7 @@ impl GpuMaterial {
         device: &wgpu::Device,
         queue: &wgpu::Queue,
         layout: &Arc<wgpu::BindGroupLayout>,
-        mat: &lyra_resource::gltf::Material,
+        mat: &lyra_gltf::Material,
     ) -> Self {
         //let specular = mat.specular.as_ref().unwrap_or_default();
         //let specular_

crates/lyra-game/src/render/graph/passes/transform.rs

@@ -1,9 +1,8 @@
 use lyra_ecs::{
     query::{
-        filter::{Has, Not, Or},
-        Entities, TickOf,
+        filter::Or,
+        Entities,
     },
-    relation::{ChildOf, RelationOriginComponent},
     Component, Entity,
 };
 use lyra_game_derive::RenderGraphLabel;
@@ -64,7 +63,6 @@ fn update_transforms(
     buffers: &mut TransformBuffers,
     parent_transform: Transform,
 ) {
-    let current_tick = world.current_tick();
     let mut component_queue = vec![];
 
     let view = world.view_iter::<(
@@ -72,7 +70,7 @@ fn update_transforms(
         Or<&WorldTransform, &Transform>,
         Option<&mut InterpTransform>,
         Option<&TransformIndex>,
-        Option<(&ResHandle<SceneGraph>, TickOf<ResHandle<SceneGraph>>)>,
+        Option<&ResHandle<SceneGraph>>,
     )>();
 
     for (entity, transform, interp_tran, transform_index, scene_graph) in view {
@@ -141,20 +139,8 @@ fn update_transforms(
             glam::Mat3::from_quat(transform.rotation),
         );
 
-        if let Some((scene, scene_tick)) = scene_graph {
+        if let Some(scene) = scene_graph {
             if let Some(mut scene) = scene.data_mut() {
-                if *scene_tick + 1 >= *current_tick {
-                    // Must manually call the world transform update system for scenes
-                    // TODO: Separate gltf from lyra-resource so lyra-scene can depend on resource to
-                    // query for scenes in the system.
-                    let view = scene.world().view::<(
-                        Entities,
-                        &mut WorldTransform,
-                        &Transform,
-                        Not<Has<RelationOriginComponent<ChildOf>>>,
-                    )>();
-                    lyra_scene::system_update_world_transforms(scene.world(), view).unwrap();
-                }
 
                 update_transforms(
                     device,

crates/lyra-game/src/render/material.rs

@@ -21,7 +21,7 @@ fn texture_to_render(device: &wgpu::Device, queue: &wgpu::Queue, bg_layout: &Arc
 }
 
 impl MaterialSpecular {
-    pub fn from_resource(device: &wgpu::Device, queue: &wgpu::Queue, bg_layout: Arc<wgpu::BindGroupLayout>, value: &lyra_resource::gltf::Specular) -> Self {
+    pub fn from_resource(device: &wgpu::Device, queue: &wgpu::Queue, bg_layout: Arc<wgpu::BindGroupLayout>, value: &lyra_gltf::Specular) -> Self {
         let tex  = texture_to_render(device, queue, &bg_layout, &value.texture);
         let color_tex  = texture_to_render(device, queue, &bg_layout, &value.color_texture);
 
@@ -46,7 +46,7 @@ pub struct Material {
 }
 
 impl Material {
-    pub fn from_resource(device: &wgpu::Device, queue: &wgpu::Queue, bg_layout: Arc<wgpu::BindGroupLayout>, value: &lyra_resource::gltf::Material) -> Self {
+    pub fn from_resource(device: &wgpu::Device, queue: &wgpu::Queue, bg_layout: Arc<wgpu::BindGroupLayout>, value: &lyra_gltf::Material) -> Self {
         let diffuse_texture  = texture_to_render(device, queue, &bg_layout, &value.base_color_texture);
 
         let specular = value.specular.as_ref().map(|s| MaterialSpecular::from_resource(device, queue, bg_layout.clone(), s));