revert

bevyengine · Nov 5, 2020 · feaebed · feaebed
1 parent bf4b6fa
commit feaebed
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 12 deletions.
diff --git a/crates/bevy_render/src/lib.rs b/crates/bevy_render/src/lib.rs
@@ -95,7 +95,6 @@ impl Plugin for RenderPlugin {
 
         app.add_stage_after(bevy_asset::stage::ASSET_EVENTS, stage::RENDER_RESOURCE)
             .add_stage_after(stage::RENDER_RESOURCE, stage::RENDER_GRAPH_SYSTEMS)
-            // .disable_stage(stage::RENDER_RESOURCE)
             .add_stage_after(stage::RENDER_GRAPH_SYSTEMS, stage::DRAW)
             .add_stage_after(stage::DRAW, stage::RENDER)
             .add_stage_after(stage::RENDER, stage::POST_RENDER)
@@ -145,11 +144,11 @@ impl Plugin for RenderPlugin {
             )
             .add_system_to_stage(
                 stage::RENDER_RESOURCE,
-                Texture::texture_resource_system.system(),
+                mesh::mesh_resource_provider_system.system(),
             )
             .add_system_to_stage(
                 stage::RENDER_RESOURCE,
-                mesh::mesh_resource_provider_system.system(),
+                Texture::texture_resource_system.system(),
             )
             .add_system_to_stage(
                 stage::RENDER_GRAPH_SYSTEMS,
@@ -159,8 +158,8 @@ impl Plugin for RenderPlugin {
             .add_system_to_stage(
                 stage::POST_RENDER,
                 shader::clear_shader_defs_system.system(),
-            )
-            .add_system_to_stage(stage::POST_RENDER, flush_render_resource_context.system());
+            );
+            //.add_system_to_stage(stage::POST_RENDER, flush_render_resource_context.system());
 
         if app.resources().get::<Msaa>().is_none() {
             app.init_resource::<Msaa>();

diff --git a/crates/bevy_sprite/src/render/mod.rs b/crates/bevy_sprite/src/render/mod.rs
@@ -13,8 +13,6 @@ use bevy_render::{
 };
 use bevy_type_registry::TypeUuid;
 
-use bevy_transform::prelude::GlobalTransform;
-
 pub const SPRITE_PIPELINE_HANDLE: Handle<PipelineDescriptor> =
     Handle::weak_from_u64(PipelineDescriptor::TYPE_UUID, 2785347840338765446);
 
@@ -118,7 +116,6 @@ pub fn build_sprite_pipeline(shaders: &mut Assets<Shader>) -> PipelineDescriptor
 }
 
 pub mod node {
-    pub const TRANSFORM: &str = "transform";
     pub const COLOR_MATERIAL: &str = "color_material";
     pub const SPRITE: &str = "sprite";
     pub const SPRITE_SHEET: &str = "sprite_sheet";
@@ -131,10 +128,6 @@ pub trait SpriteRenderGraphBuilder {
 
 impl SpriteRenderGraphBuilder for RenderGraph {
     fn add_sprite_graph(&mut self, resources: &Resources) -> &mut Self {
-        self.add_system_node(
-            node::TRANSFORM,
-            RenderResourcesNode::<GlobalTransform>::new(true),
-        );
         self.add_system_node(
             node::COLOR_MATERIAL,
             AssetRenderResourcesNode::<ColorMaterial>::new(false),