move uniforms around

src/app/app_builder.rs

@@ -6,7 +6,6 @@ use crate::{
     plugin::load_plugin,
     render::{
         passes::*,
-        render_graph_2,
         render_graph_2::{
             passes::*, pipelines::*, renderers::wgpu_renderer::WgpuRenderer, resource_providers::*,
             StandardMaterial,

src/render/render_graph_2/mod.rs

@@ -12,7 +12,7 @@ mod resource;
 pub mod resource_name;
 pub mod resource_provider;
 pub mod resource_providers;
-mod standard_material;
+mod uniforms;
 mod uniform;
 mod renderable;
 
@@ -24,6 +24,6 @@ pub use render_graph::*;
 pub use renderer::*;
 pub use resource::*;
 pub use resource_provider::*;
-pub use standard_material::*;
+pub use uniforms::*;
 pub use uniform::*;
 pub use renderable::*;

src/render/render_graph_2/uniforms/local_to_world.rs

@@ -1,19 +1,12 @@
 use crate::{
-    math::Vec4,
     render::render_graph_2::{
-        uniform::{AsUniforms, GetBytes, UniformInfo},
+        uniform::{AsUniforms, UniformInfo},
         BindType, UniformPropertyType,
     },
 };
 
-use bevy_derive::Uniforms;
 use zerocopy::AsBytes;
 
-#[derive(Uniforms)]
-pub struct StandardMaterial {
-    pub albedo: Vec4,
-}
-
 const LOCAL_TO_WORLD_UNIFORM_INFO: &[UniformInfo] = &[UniformInfo {
     name: "Object",
     bind_type: BindType::Uniform {
@@ -47,4 +40,4 @@ impl AsUniforms for bevy_transform::prelude::LocalToWorld {
             _ => None,
         }
     }
-}
+}

src/render/render_graph_2/uniforms/mod.rs

@@ -0,0 +1,5 @@
+mod standard_material;
+mod local_to_world;
+
+pub use standard_material::*;
+pub use local_to_world::*;

src/render/render_graph_2/uniforms/standard_material.rs

@@ -0,0 +1,14 @@
+use crate::{
+    math::Vec4,
+    render::render_graph_2::{
+        uniform::{AsUniforms, GetBytes, UniformInfo},
+        BindType, UniformPropertyType,
+    },
+};
+
+use bevy_derive::Uniforms;
+
+#[derive(Uniforms)]
+pub struct StandardMaterial {
+    pub albedo: Vec4,
+}