rebased

Author: kurtkuehnert

crates/bevy_core_pipeline/src/core_2d/mod.rs

@@ -109,7 +109,7 @@ pub struct Transparent2d {
     pub sort_key: FloatOrd,
     pub entity: Entity,
     pub pipeline: CachedRenderPipelineId,
-    pub render_command: RenderCommandId,
+    pub render_command_id: RenderCommandId,
     /// Range in the vertex buffer of this item
     pub batch_range: Option<Range<u32>>,
 }
@@ -129,7 +129,7 @@ impl PhaseItem for Transparent2d {
 
     #[inline]
     fn render_command_id(&self) -> RenderCommandId {
-        self.render_command
+        self.render_command_id
     }
 
     #[inline]

crates/bevy_pbr/src/material.rs

@@ -190,7 +190,7 @@ where
 
         if let Ok(render_app) = app.get_sub_app_mut(RenderApp) {
             render_app
-                .init_resource::<DrawFunctions<Shadow>>()
+                .init_resource::<RenderCommands<Shadow>>()
                 .add_render_command::<Shadow, DrawPrepass<M>>()
                 .add_render_command::<Transparent3d, DrawMaterial<M>>()
                 .add_render_command::<Opaque3d, DrawMaterial<M>>()

crates/bevy_pbr/src/render/light.rs

@@ -10,15 +10,14 @@ use bevy_asset::Handle;
 use bevy_core_pipeline::core_3d::Transparent3d;
 use bevy_ecs::prelude::*;
 use bevy_math::{Mat4, UVec3, UVec4, Vec2, Vec3, Vec3Swizzles, Vec4, Vec4Swizzles};
+use bevy_render::render_phase::{RenderCommandId, RenderCommands};
 use bevy_render::{
     camera::Camera,
     color::Color,
     mesh::Mesh,
     render_asset::RenderAssets,
     render_graph::{Node, NodeRunError, RenderGraphContext, SlotInfo, SlotType},
-    render_phase::{
-        CachedRenderPipelinePhaseItem, DrawFunctionId, DrawFunctions, PhaseItem, RenderPhase,
-    },
+    render_phase::{CachedRenderPipelinePhaseItem, PhaseItem, RenderPhase},
     render_resource::*,
     renderer::{RenderContext, RenderDevice, RenderQueue},
     texture::*,
@@ -1632,7 +1631,7 @@ pub fn queue_shadows<M: Material>(
                         };
 
                         shadow_phase.add(Shadow {
-                            render_command: draw_shadow_mesh,
+                            render_command_id: draw_shadow_mesh,
                             pipeline: pipeline_id,
                             entity,
                             distance: 0.0, // TODO: sort back-to-front
@@ -1648,7 +1647,7 @@ pub struct Shadow {
     pub distance: f32,
     pub entity: Entity,
     pub pipeline: CachedRenderPipelineId,
-    pub render_command: RenderCommandId,
+    pub render_command_id: RenderCommandId,
 }
 
 impl PhaseItem for Shadow {
@@ -1666,7 +1665,7 @@ impl PhaseItem for Shadow {
 
     #[inline]
     fn render_command_id(&self) -> RenderCommandId {
-        self.render_command
+        self.render_command_id
     }
 
     #[inline]

crates/bevy_sprite/src/mesh2d/material.rs

@@ -399,7 +399,7 @@ pub fn queue_material2d_meshes<M: Material2d>(
                         let mesh_z = mesh2d_uniform.transform.w_axis.z;
                         transparent_phase.add(Transparent2d {
                             entity: *visible_entity,
-                            render_command: draw_transparent_pbr,
+                            render_command_id: draw_transparent_pbr,
                             pipeline: pipeline_id,
                             // NOTE: Back-to-front ordering for transparent with ascending sort means far should have the
                             // lowest sort key and getting closer should increase. As we have

crates/bevy_sprite/src/render/mod.rs

@@ -706,7 +706,7 @@ pub fn queue_sprites(
                     let item_end = colored_index;
 
                     transparent_phase.add(Transparent2d {
-                        render_command: draw_sprite_function,
+                        render_command_id: draw_sprite_function,
                         pipeline: colored_pipeline,
                         entity: current_batch_entity,
                         sort_key,
@@ -724,7 +724,7 @@ pub fn queue_sprites(
                     let item_end = index;
 
                     transparent_phase.add(Transparent2d {
-                        render_command: draw_sprite_function,
+                        render_command_id: draw_sprite_function,
                         pipeline,
                         entity: current_batch_entity,
                         sort_key,

crates/bevy_ui/src/render/mod.rs

@@ -618,7 +618,7 @@ pub fn queue_uinodes(
                         })
                     });
                 transparent_phase.add(TransparentUi {
-                    render_command: draw_ui_function,
+                    render_command_id: draw_ui_function,
                     pipeline,
                     entity,
                     sort_key: FloatOrd(batch.z),

crates/bevy_ui/src/render/render_pass.rs

@@ -95,7 +95,7 @@ pub struct TransparentUi {
     pub sort_key: FloatOrd,
     pub entity: Entity,
     pub pipeline: CachedRenderPipelineId,
-    pub render_command: RenderCommandId,
+    pub render_command_id: RenderCommandId,
 }
 
 impl PhaseItem for TransparentUi {
@@ -113,7 +113,7 @@ impl PhaseItem for TransparentUi {
 
     #[inline]
     fn render_command_id(&self) -> RenderCommandId {
-        self.render_command
+        self.render_command_id
     }
 }
 

examples/2d/mesh2d_manual.rs

@@ -349,7 +349,7 @@ pub fn queue_colored_mesh2d(
                 let mesh_z = mesh2d_uniform.transform.w_axis.z;
                 transparent_phase.add(Transparent2d {
                     entity: *visible_entity,
-                    render_command: draw_colored_mesh2d,
+                    render_command_id: draw_colored_mesh2d,
                     pipeline: pipeline_id,
                     // The 2d render items are sorted according to their z value before rendering,
                     // in order to get correct transparency