From 56e79d522585243c3e43eae568ec37f74a6022ee Mon Sep 17 00:00:00 2001
From: Carter Anderson <mcanders1@gmail.com>
Date: Sat, 14 Mar 2020 12:56:37 -0700
Subject: [PATCH] reorganize texture and mesh

---
 bevy_derive/src/lib.rs                        |  2 +-
 examples/ui_bench.rs                          | 57 +++++++++++++++++++
 src/app/app_builder.rs                        | 10 ++--
 src/asset/mod.rs                              |  4 --
 src/core/bytes.rs                             |  5 +-
 src/prelude.rs                                |  4 +-
 src/render/color.rs                           |  8 +--
 .../assigned_meshes_draw_target.rs            |  3 +-
 .../draw_targets/meshes_draw_target.rs        |  3 +-
 .../draw_targets/ui_draw_target.rs            |  3 +-
 src/{asset => render}/mesh.rs                 |  0
 src/render/mod.rs                             |  3 +-
 src/render/render_resource/render_resource.rs |  5 +-
 .../mesh_resource_provider.rs                 |  3 +-
 .../ui_resource_provider.rs                   |  3 +-
 .../uniform_resource_provider.rs              |  4 +-
 src/render/shader/uniform.rs                  |  8 ++-
 src/render/shader/uniforms/local_to_world.rs  |  7 ++-
 src/render/texture/mod.rs                     |  2 +
 src/render/texture/sampler_descriptor.rs      |  3 +-
 src/{asset => render/texture}/texture.rs      |  0
 src/render/texture/texture_descriptor.rs      |  4 +-
 22 files changed, 104 insertions(+), 37 deletions(-)
 create mode 100644 examples/ui_bench.rs
 rename src/{asset => render}/mesh.rs (100%)
 rename src/{asset => render/texture}/texture.rs (100%)

diff --git a/bevy_derive/src/lib.rs b/bevy_derive/src/lib.rs
index d492e7d635..ee4681baa6 100644
--- a/bevy_derive/src/lib.rs
+++ b/bevy_derive/src/lib.rs
@@ -167,7 +167,7 @@ pub fn derive_uniforms(input: TokenStream) -> TokenStream {
                 }
             }
 
-            fn get_uniform_texture(&self, name: &str) -> Option<bevy::asset::Handle<bevy::asset::Texture>> {
+            fn get_uniform_texture(&self, name: &str) -> Option<bevy::asset::Handle<bevy::render::texture::Texture>> {
                 use bevy::render::shader::GetTexture;
                 match name {
                     #(#texture_and_sampler_name_strings => self.#texture_and_sampler_name_idents.get_texture(),)*
diff --git a/examples/ui_bench.rs b/examples/ui_bench.rs
new file mode 100644
index 0000000000..5129c4e40a
--- /dev/null
+++ b/examples/ui_bench.rs
@@ -0,0 +1,57 @@
+use bevy::prelude::*;
+
+fn main() {
+    AppBuilder::new()
+        .add_defaults()
+        .setup_world(setup)
+        .add_system(build_move_system())
+        .add_system(bevy::diagnostics::build_fps_printer_system())
+        .run();
+}
+
+fn build_move_system() -> Box<dyn Schedulable> {
+    SystemBuilder::new("Move")
+        .read_resource::<Time>()
+        .with_query(<Write<Node>>::query())
+        .build(move |_, world, time, query| {
+            for (i, mut node) in query.iter_mut(world).enumerate() {
+                if node.color.r > 0.2 {
+                    node.position += Vec2::new(0.1 * time.delta_seconds, 0.0);
+                    // println!("{}", node.position.x());
+                }
+            }
+        })
+}
+
+fn setup(world: &mut World, _resources: &mut Resources) {
+    let mut builder = world.build().add_entity(Camera2dEntity {
+        camera: Camera::new(CameraType::Orthographic {
+            left: 0.0,
+            right: 0.0,
+            bottom: 0.0,
+            top: 0.0,
+            near: 0.0,
+            far: 1.0,
+        }),
+        active_camera_2d: ActiveCamera2d,
+    });
+
+    let mut prev = Vec2::default();
+    let count = 1000;
+    for i in 0..count {
+        // 2d camera
+        let cur = Vec2::new(1.0, 1.0) * 1.0 + prev;
+        builder = builder.add_entity(UiEntity {
+            node: Node::new(
+                math::vec2(75.0, 75.0) + cur,
+                Anchors::new(0.5, 0.5, 0.5, 0.5),
+                Margins::new(0.0, 100.0, 0.0, 100.0),
+                Color::rgb(0.0 + i as f32 / count as f32, 0.1, 0.1),
+            ),
+        });
+
+        prev = cur;
+    }
+
+    builder.build();
+}
diff --git a/src/app/app_builder.rs b/src/app/app_builder.rs
index 7b31d52216..d8c429b6d2 100644
--- a/src/app/app_builder.rs
+++ b/src/app/app_builder.rs
@@ -6,8 +6,8 @@ use crate::{
     plugin::load_plugin,
     prelude::StandardMaterial,
     render::{
-        draw_target::draw_targets::*, pass::passes::*, pipeline::pipelines::*,
-        render_resource::resource_providers::*, renderer::Renderer, *,
+        draw_target::draw_targets::*, mesh::Mesh, pass::passes::*, pipeline::pipelines::*,
+        render_resource::resource_providers::*, renderer::Renderer, texture::Texture, *,
     },
     ui,
 };
@@ -186,7 +186,9 @@ impl AppBuilder {
 
     #[cfg(feature = "wgpu")]
     pub fn add_wgpu_renderer(mut self) -> Self {
-        self.renderer = Some(Box::new(renderer::renderers::wgpu_renderer::WgpuRenderer::new()));
+        self.renderer = Some(Box::new(
+            renderer::renderers::wgpu_renderer::WgpuRenderer::new(),
+        ));
         self
     }
 
@@ -202,8 +204,6 @@ impl AppBuilder {
             .add_wgpu_renderer()
     }
 
-
-
     pub fn load_plugin(mut self, path: &str) -> Self {
         let (_lib, plugin) = load_plugin(path);
         self = plugin.build(self);
diff --git a/src/asset/mod.rs b/src/asset/mod.rs
index 0d02277dbd..ce01779d71 100644
--- a/src/asset/mod.rs
+++ b/src/asset/mod.rs
@@ -1,14 +1,10 @@
 mod gltf;
-mod mesh;
-mod texture;
 
 pub use self::gltf::load_gltf;
-pub use mesh::*;
 use std::{
     fmt::Debug,
     hash::{Hash, Hasher},
 };
-pub use texture::*;
 
 use std::{collections::HashMap, marker::PhantomData};
 
diff --git a/src/core/bytes.rs b/src/core/bytes.rs
index 784f6765aa..1e94fe61b5 100644
--- a/src/core/bytes.rs
+++ b/src/core/bytes.rs
@@ -1,7 +1,4 @@
-use crate::{
-    asset::{Handle, Texture},
-    math::Vec4,
-};
+use crate::{asset::Handle, math::Vec4, render::texture::Texture};
 use zerocopy::AsBytes;
 
 pub trait GetBytes {
diff --git a/src/prelude.rs b/src/prelude.rs
index 9bc33e34ba..17509d66a9 100644
--- a/src/prelude.rs
+++ b/src/prelude.rs
@@ -1,13 +1,15 @@
 pub use crate::{
     app::{App, AppBuilder},
-    asset::{Asset, AssetStorage, Handle, Mesh, MeshType, Texture, TextureType},
+    asset::{Asset, AssetStorage, Handle},
     core::Time,
     ecs,
     ecs::{default_archetypes::*, EntityArchetype, WorldBuilder, WorldBuilderSource},
     render::{
+        mesh::{Mesh, MeshType},
         pipeline::PipelineDescriptor,
         render_resource::{resource_name, resource_providers::UniformResourceProvider},
         shader::{uniforms::StandardMaterial, Shader, ShaderDefSuffixProvider, ShaderStage},
+        texture::{Texture, TextureType},
         ActiveCamera, ActiveCamera2d, Camera, CameraType, Color, ColorSource, Instanced, Light,
         Renderable,
     },
diff --git a/src/render/color.rs b/src/render/color.rs
index e3be1cc9d9..6aee91f715 100644
--- a/src/render/color.rs
+++ b/src/render/color.rs
@@ -1,9 +1,5 @@
-use crate::{
-    asset::{Handle, Texture},
-    core::GetBytes,
-    math::Vec4,
-    render::shader::ShaderDefSuffixProvider,
-};
+use super::texture::Texture;
+use crate::{asset::Handle, core::GetBytes, math::Vec4, render::shader::ShaderDefSuffixProvider};
 use std::ops::Add;
 use zerocopy::AsBytes;
 
diff --git a/src/render/draw_target/draw_targets/assigned_meshes_draw_target.rs b/src/render/draw_target/draw_targets/assigned_meshes_draw_target.rs
index a3bc462a57..56480e86d9 100644
--- a/src/render/draw_target/draw_targets/assigned_meshes_draw_target.rs
+++ b/src/render/draw_target/draw_targets/assigned_meshes_draw_target.rs
@@ -1,8 +1,9 @@
 use crate::{
-    asset::{AssetStorage, Handle, Mesh},
+    asset::{AssetStorage, Handle},
     legion::prelude::*,
     render::{
         draw_target::DrawTarget,
+        mesh::Mesh,
         pipeline::PipelineDescriptor,
         render_resource::{resource_name, ResourceInfo},
         renderer::{RenderPass, Renderer},
diff --git a/src/render/draw_target/draw_targets/meshes_draw_target.rs b/src/render/draw_target/draw_targets/meshes_draw_target.rs
index bae7947159..407f40559b 100644
--- a/src/render/draw_target/draw_targets/meshes_draw_target.rs
+++ b/src/render/draw_target/draw_targets/meshes_draw_target.rs
@@ -1,8 +1,9 @@
 use crate::{
-    asset::{Handle, Mesh},
+    asset::Handle,
     legion::prelude::*,
     render::{
         draw_target::DrawTarget,
+        mesh::Mesh,
         pipeline::PipelineDescriptor,
         render_resource::{resource_name, ResourceInfo},
         renderer::RenderPass,
diff --git a/src/render/draw_target/draw_targets/ui_draw_target.rs b/src/render/draw_target/draw_targets/ui_draw_target.rs
index cbbb460361..3fd838c12a 100644
--- a/src/render/draw_target/draw_targets/ui_draw_target.rs
+++ b/src/render/draw_target/draw_targets/ui_draw_target.rs
@@ -1,8 +1,9 @@
 use crate::{
-    asset::{AssetStorage, Handle, Mesh},
+    asset::{AssetStorage, Handle},
     legion::prelude::*,
     render::{
         draw_target::DrawTarget,
+        mesh::Mesh,
         pipeline::PipelineDescriptor,
         render_resource::{resource_name, BufferUsage, RenderResource, ResourceInfo},
         renderer::{RenderPass, Renderer},
diff --git a/src/asset/mesh.rs b/src/render/mesh.rs
similarity index 100%
rename from src/asset/mesh.rs
rename to src/render/mesh.rs
diff --git a/src/render/mod.rs b/src/render/mod.rs
index 84ea612a67..ef7fb39b02 100644
--- a/src/render/mod.rs
+++ b/src/render/mod.rs
@@ -1,4 +1,5 @@
-pub mod camera;
+mod camera;
+pub mod mesh;
 pub mod render_graph;
 pub mod shader;
 
diff --git a/src/render/render_resource/render_resource.rs b/src/render/render_resource/render_resource.rs
index 6a3542cd04..c48f229e4d 100644
--- a/src/render/render_resource/render_resource.rs
+++ b/src/render/render_resource/render_resource.rs
@@ -1,4 +1,7 @@
-use crate::asset::{Handle, Mesh, Texture};
+use crate::{
+    asset::Handle,
+    render::{mesh::Mesh, texture::Texture},
+};
 use std::collections::HashMap;
 
 #[derive(Copy, Clone, Hash, Debug, Eq, PartialEq)]
diff --git a/src/render/render_resource/resource_providers/mesh_resource_provider.rs b/src/render/render_resource/resource_providers/mesh_resource_provider.rs
index 736ad9f2cf..8a99b06f4c 100644
--- a/src/render/render_resource/resource_providers/mesh_resource_provider.rs
+++ b/src/render/render_resource/resource_providers/mesh_resource_provider.rs
@@ -1,9 +1,10 @@
 use crate::{
-    asset::{AssetStorage, Handle, Mesh},
+    asset::{AssetStorage, Handle},
     prelude::Renderable,
     render::{
         render_resource::{BufferUsage, ResourceProvider},
         renderer::Renderer,
+        mesh::Mesh,
     },
 };
 use legion::{filter::*, prelude::*};
diff --git a/src/render/render_resource/resource_providers/ui_resource_provider.rs b/src/render/render_resource/resource_providers/ui_resource_provider.rs
index 203509f389..d061d339c3 100644
--- a/src/render/render_resource/resource_providers/ui_resource_provider.rs
+++ b/src/render/render_resource/resource_providers/ui_resource_provider.rs
@@ -1,8 +1,9 @@
 use crate::{
-    asset::{Asset, AssetStorage, Handle, Mesh, MeshType},
+    asset::{Asset, AssetStorage, Handle},
     ecs, math,
     prelude::Node,
     render::{
+        mesh::{Mesh, MeshType},
         render_resource::{resource_name, BufferUsage, RenderResource, ResourceProvider},
         renderer::Renderer,
     },
diff --git a/src/render/render_resource/resource_providers/uniform_resource_provider.rs b/src/render/render_resource/resource_providers/uniform_resource_provider.rs
index 58ef5741f6..899e04db87 100644
--- a/src/render/render_resource/resource_providers/uniform_resource_provider.rs
+++ b/src/render/render_resource/resource_providers/uniform_resource_provider.rs
@@ -1,11 +1,11 @@
 use crate::{
-    asset::{AssetStorage, Texture},
+    asset::AssetStorage,
     render::{
         pipeline::BindType,
         render_resource::{BufferUsage, RenderResource, ResourceProvider},
         renderer::Renderer,
         shader::{AsUniforms, DynamicUniformBufferInfo, UniformInfoIter},
-        texture::{SamplerDescriptor, TextureDescriptor},
+        texture::{SamplerDescriptor, Texture, TextureDescriptor},
         Renderable,
     },
 };
diff --git a/src/render/shader/uniform.rs b/src/render/shader/uniform.rs
index d974d708b4..4fa717d39e 100644
--- a/src/render/shader/uniform.rs
+++ b/src/render/shader/uniform.rs
@@ -1,7 +1,11 @@
 use crate::{
-    asset::{Handle, Texture},
+    asset::Handle,
     core::GetBytes,
-    render::{color::ColorSource, pipeline::BindType, texture::TextureViewDimension},
+    render::{
+        color::ColorSource,
+        pipeline::BindType,
+        texture::{Texture, TextureViewDimension},
+    },
 };
 use legion::prelude::Entity;
 use std::collections::HashMap;
diff --git a/src/render/shader/uniforms/local_to_world.rs b/src/render/shader/uniforms/local_to_world.rs
index 47022b215c..53c5c22c01 100644
--- a/src/render/shader/uniforms/local_to_world.rs
+++ b/src/render/shader/uniforms/local_to_world.rs
@@ -1,6 +1,9 @@
 use crate::{
-    asset::{Handle, Texture},
-    render::shader::{AsUniforms, FieldBindType, FieldUniformName},
+    asset::Handle,
+    render::{
+        shader::{AsUniforms, FieldBindType, FieldUniformName},
+        texture::Texture,
+    },
 };
 
 use zerocopy::AsBytes;
diff --git a/src/render/texture/mod.rs b/src/render/texture/mod.rs
index d8d1fdb4d2..5f904162cc 100644
--- a/src/render/texture/mod.rs
+++ b/src/render/texture/mod.rs
@@ -1,7 +1,9 @@
+mod texture;
 mod sampler_descriptor;
 mod texture_descriptor;
 mod texture_dimension;
 
+pub use texture::*;
 pub use sampler_descriptor::*;
 pub use texture_descriptor::*;
 pub use texture_dimension::*;
diff --git a/src/render/texture/sampler_descriptor.rs b/src/render/texture/sampler_descriptor.rs
index 0b524854fd..3a1b1cc190 100644
--- a/src/render/texture/sampler_descriptor.rs
+++ b/src/render/texture/sampler_descriptor.rs
@@ -1,4 +1,5 @@
-use crate::{asset::Texture, render::pipeline::state_descriptors::CompareFunction};
+use super::Texture;
+use crate::render::pipeline::state_descriptors::CompareFunction;
 
 #[derive(Copy, Clone)]
 pub struct SamplerDescriptor {
diff --git a/src/asset/texture.rs b/src/render/texture/texture.rs
similarity index 100%
rename from src/asset/texture.rs
rename to src/render/texture/texture.rs
diff --git a/src/render/texture/texture_descriptor.rs b/src/render/texture/texture_descriptor.rs
index efbb621303..ecf2c369db 100644
--- a/src/render/texture/texture_descriptor.rs
+++ b/src/render/texture/texture_descriptor.rs
@@ -1,5 +1,5 @@
-use super::{Extent3d, TextureDimension, TextureFormat};
-use crate::{asset::Texture, render::texture::TextureUsage};
+use super::{Extent3d, Texture, TextureDimension, TextureFormat};
+use crate::render::texture::TextureUsage;
 
 #[derive(Copy, Clone)]
 pub struct TextureDescriptor {