diff --git a/crates/bevy_render/src/render_resource/batching/asset_batcher.rs b/crates/bevy_render/src/batch/asset_batcher.rs similarity index 100% rename from crates/bevy_render/src/render_resource/batching/asset_batcher.rs rename to crates/bevy_render/src/batch/asset_batcher.rs diff --git a/crates/bevy_render/src/render_resource/batching/asset_batcher2.rs b/crates/bevy_render/src/batch/asset_batcher2.rs similarity index 100% rename from crates/bevy_render/src/render_resource/batching/asset_batcher2.rs rename to crates/bevy_render/src/batch/asset_batcher2.rs diff --git a/crates/bevy_render/src/render_resource/batching/batch.rs b/crates/bevy_render/src/batch/batch.rs similarity index 100% rename from crates/bevy_render/src/render_resource/batching/batch.rs rename to crates/bevy_render/src/batch/batch.rs diff --git a/crates/bevy_render/src/render_resource/batching/mod.rs b/crates/bevy_render/src/batch/mod.rs similarity index 100% rename from crates/bevy_render/src/render_resource/batching/mod.rs rename to crates/bevy_render/src/batch/mod.rs diff --git a/crates/bevy_render/src/draw_target/draw_targets/assigned_batches_draw_target.rs b/crates/bevy_render/src/draw_target/draw_targets/assigned_batches_draw_target.rs index 97f8c9d65e..b5e2ea97db 100644 --- a/crates/bevy_render/src/draw_target/draw_targets/assigned_batches_draw_target.rs +++ b/crates/bevy_render/src/draw_target/draw_targets/assigned_batches_draw_target.rs @@ -2,9 +2,9 @@ use crate::{ draw_target::DrawTarget, pass::RenderPass, pipeline::PipelineDescriptor, - render_resource::{resource_name, AssetBatchers, RenderResourceAssignments}, + render_resource::{resource_name, RenderResourceAssignments}, renderer::RenderContext, - Renderable, + Renderable, batch::AssetBatchers, }; use bevy_asset::Handle; use legion::prelude::*; diff --git a/crates/bevy_render/src/lib.rs b/crates/bevy_render/src/lib.rs index 1673b7f1ca..0f287010f7 100644 --- a/crates/bevy_render/src/lib.rs +++ b/crates/bevy_render/src/lib.rs @@ -1,4 +1,5 @@ #![feature(min_specialization)] +pub mod batch; mod camera; pub mod entity; pub mod mesh; @@ -30,13 +31,14 @@ use self::{ PipelineAssignments, PipelineCompiler, PipelineDescriptor, VertexBufferDescriptors, }, render_resource::{ - entity_render_resource_assignments_system, AssetBatchers, EntityRenderResourceAssignments, + entity_render_resource_assignments_system, EntityRenderResourceAssignments, RenderResourceAssignments, }, shader::Shader, texture::Texture, }; +use batch::AssetBatchers; use bevy_app::{stage, AppBuilder, AppPlugin}; use bevy_asset::AssetStorage; use mesh::mesh_resource_provider_system; diff --git a/crates/bevy_render/src/mesh.rs b/crates/bevy_render/src/mesh.rs index 3bb5396654..fa446eb049 100644 --- a/crates/bevy_render/src/mesh.rs +++ b/crates/bevy_render/src/mesh.rs @@ -3,10 +3,10 @@ use crate::{ state_descriptors::{IndexFormat, PrimitiveTopology}, VertexBufferDescriptor, VertexBufferDescriptors, VertexFormat, }, - render_resource::{AssetBatchers, BufferInfo, BufferUsage, RenderResourceAssignments}, + render_resource::{BufferInfo, BufferUsage, RenderResourceAssignments}, renderer::{GlobalRenderResourceContext, RenderResourceContext}, shader::AsUniforms, - Renderable, Vertex, + Renderable, Vertex, batch::AssetBatchers, }; use bevy_asset::{AssetStorage, Handle}; use glam::*; diff --git a/crates/bevy_render/src/render_resource/mod.rs b/crates/bevy_render/src/render_resource/mod.rs index b560ec823b..7046750c31 100644 --- a/crates/bevy_render/src/render_resource/mod.rs +++ b/crates/bevy_render/src/render_resource/mod.rs @@ -1,4 +1,3 @@ -mod batching; mod buffer; mod entity_render_resource_assignments; mod render_resource; @@ -6,7 +5,6 @@ mod render_resource_assignments; mod resource_info; pub mod resource_name; -pub use batching::*; pub use buffer::*; pub use entity_render_resource_assignments::*; pub use render_resource::*; diff --git a/crates/bevy_render/src/shader/uniform.rs b/crates/bevy_render/src/shader/uniform.rs index 8803e19e6a..f23d36e5da 100644 --- a/crates/bevy_render/src/shader/uniform.rs +++ b/crates/bevy_render/src/shader/uniform.rs @@ -1,9 +1,8 @@ use crate::{ color::ColorSource, pipeline::{BindType, VertexBufferDescriptor}, - render_resource::AssetBatchers, texture::Texture, - Renderable, + Renderable, batch::AssetBatchers, }; use bevy_asset::{AssetStorage, Handle}; diff --git a/src/prelude.rs b/src/prelude.rs index a1d18dcaec..09d2d088f9 100644 --- a/src/prelude.rs +++ b/src/prelude.rs @@ -24,7 +24,8 @@ pub use crate::render::{ }, RenderGraph, }, - render_resource::{resource_name, AssetBatchers}, + render_resource::resource_name, + batch::AssetBatchers, shader::{Shader, ShaderDefSuffixProvider, ShaderStage, ShaderStages}, texture::{Texture, TextureType}, ActiveCamera, ActiveCamera2d, Camera, CameraType, Color, ColorSource, Renderable,