move mesh and texture to asset mod

ROADMAP.md

@@ -8,6 +8,7 @@
     * Consider reworking current RenderGraph to be more graph-like
     * Macro to produce vertex buffer attributes (and maybe descriptors) from structs
     * Dynamic / user defined shaders
+        * consider using shaderc-rs. but this introduces compile complexity and requires other C++ build systems
 * Physics
     * High level physics data types
     * Integrate with nphysics

examples/instancing.rs

@@ -1,5 +1,5 @@
 use bevy::{
-    asset::{Asset, AssetStorage, Handle},
+    asset::*,
     math::{Mat4, Vec3},
     render::*,
     Schedulable, *,

examples/parenting.rs

@@ -1,5 +1,5 @@
 use bevy::{
-    asset::{Asset, AssetStorage},
+    asset::*,
     math::{Mat4, Quat, Vec3},
     render::*,
     Parent, Schedulable, *,

examples/simple.rs

@@ -1,5 +1,5 @@
 use bevy::{
-    asset::{Asset, AssetStorage},
+    asset::*,
     math::{Mat4, Vec3},
     render::*,
     *,

examples/texture.rs

@@ -1,5 +1,5 @@
 use bevy::{
-    asset::{Asset, AssetStorage},
+    asset::*,
     math::{Mat4, Vec3},
     render::*,
     *,

examples/ui.rs

@@ -1,5 +1,5 @@
 use bevy::{
-    asset::{Asset, AssetStorage},
+    asset::*,
     math::{Mat4, Vec3},
     render::*,
     ui::*,

src/app/app_builder.rs

@@ -1,5 +1,5 @@
 use crate::{
-    asset::AssetStorage,
+    asset::*,
     legion::{
         prelude::{Schedule, World},
         schedule::Builder,

src/asset/mod.rs

@@ -1,6 +1,10 @@
 mod gltf;
+mod mesh;
+mod texture;
 
 pub use self::gltf::load_gltf;
+pub use mesh::*;
+pub use texture::*;
 
 use std::{collections::HashMap, marker::PhantomData};
 

src/render/material.rs

@@ -1,4 +1,4 @@
-use crate::{asset::Handle, math, render::Texture};
+use crate::{asset::{Handle, Texture}, math};
 use zerocopy::{AsBytes, FromBytes};
 
 pub enum Albedo {

src/render/mod.rs

@@ -1,7 +1,5 @@
 pub mod camera;
 pub mod instancing;
-pub mod mesh;
-pub mod texture;
 pub mod passes;
 pub mod render_resources;
 pub mod shader;
@@ -14,8 +12,6 @@ mod vertex;
 pub use camera::*;
 pub use light::*;
 pub use material::*;
-pub use mesh::*;
-pub use texture::*;
 pub use render_graph::*;
 pub use shader::*;
 

src/render/passes/forward/forward_pipeline.rs

@@ -1,4 +1,4 @@
-use crate::{asset::*, render::mesh::*, render::*};
+use crate::{asset::*, render::*};
 use legion::prelude::*;
 use wgpu::SwapChainOutput;
 

src/render/passes/forward_instanced/mod.rs

@@ -1,6 +1,5 @@
 use crate::{
     asset::*,
-    render::mesh::*,
     render::{instancing::InstanceBufferInfo, *},
     LocalToWorld,
 };

src/render/passes/forward_shadow/mod.rs

@@ -1,4 +1,4 @@
-use crate::{asset::*, render::mesh::*, render::passes::shadow, render::*};
+use crate::{asset::*, render::passes::shadow, render::*};
 use legion::prelude::*;
 use wgpu::SwapChainOutput;
 

src/render/passes/ui/mod.rs

@@ -1,7 +1,6 @@
 use crate::{
     asset::*,
     ecs, math,
-    render::mesh::*,
     render::{instancing::InstanceBufferInfo, *},
     ui::Node,
     Parent,