Revert CommandBuffer<T> abstraction

Author: catilac

Cargo.lock

@@ -26,7 +26,6 @@ processing = { path = "." }
 processing_pyo3 = { path = "crates/processing_pyo3" }
 processing_render = { path = "crates/processing_render" }
 processing_midi = { path = "crates/processing_midi" }
-processing_utils = { path = "crates/processing_utils" }
 
 [dependencies]
 bevy = { workspace = true }

Cargo.toml

@@ -13,7 +13,6 @@ x11 = ["bevy/x11"]
 
 [dependencies]
 bevy = { workspace = true }
-processing_utils = { workspace = true }
 lyon = "1.0"
 raw-window-handle = "0.6"
 thiserror = "2"

crates/processing_render/Cargo.toml

@@ -29,12 +29,13 @@ use crate::{
     Flush,
     error::{ProcessingError, Result},
     image::{Image, bytes_to_pixels, create_readback_buffer, pixel_size, pixels_to_bytes},
-    render::{RenderState, command::DrawCommand},
+    render::{
+        RenderState,
+        command::{CommandBuffer, DrawCommand},
+    },
     surface::Surface,
 };
 
-use processing_utils::CommandBuffer;
-
 pub struct GraphicsPlugin;
 
 impl Plugin for GraphicsPlugin {
@@ -241,7 +242,7 @@ pub fn create(
             }),
             Transform::from_xyz(0.0, 0.0, 999.9),
             render_layer,
-            CommandBuffer::<DrawCommand>::new(),
+            CommandBuffer::new(),
             RenderState::default(),
             SurfaceSize(width, height),
             Graphics {
@@ -471,7 +472,7 @@ pub fn end_draw(app: &mut App, entity: Entity) -> Result<()> {
 
 pub fn record_command(
     In((graphics_entity, cmd)): In<(Entity, DrawCommand)>,
-    mut graphics_query: Query<&mut CommandBuffer<DrawCommand>>,
+    mut graphics_query: Query<&mut CommandBuffer>,
 ) -> Result<()> {
     let mut command_buffer = graphics_query
         .get_mut(graphics_entity)

crates/processing_render/src/graphics.rs

@@ -53,3 +53,24 @@ pub enum DrawCommand {
         stacks: u32,
     },
 }
+
+#[derive(Debug, Default, Component)]
+pub struct CommandBuffer {
+    pub commands: Vec<DrawCommand>,
+}
+
+impl CommandBuffer {
+    pub fn new() -> Self {
+        Self {
+            commands: Vec::new(),
+        }
+    }
+
+    pub fn push(&mut self, cmd: DrawCommand) {
+        self.commands.push(cmd);
+    }
+
+    pub fn clear(&mut self) {
+        self.commands.clear();
+    }
+}

crates/processing_render/src/render/command.rs

@@ -10,7 +10,7 @@ use bevy::{
     math::{Affine3A, Mat4, Vec4},
     prelude::*,
 };
-use command::DrawCommand;
+use command::{CommandBuffer, DrawCommand};
 use material::MaterialKey;
 use primitive::{TessellationMode, box_mesh, empty_mesh, sphere_mesh};
 use transform::TransformStack;
@@ -22,8 +22,6 @@ use crate::{
     render::{material::UntypedMaterial, primitive::rect},
 };
 
-use processing_utils::CommandBuffer;
-
 #[derive(Component)]
 #[relationship(relationship_target = TransientMeshes)]
 pub struct BelongsToGraphics(pub Entity);
@@ -115,7 +113,7 @@ pub fn flush_draw_commands(
     mut graphics: Query<
         (
             Entity,
-            &mut CommandBuffer<DrawCommand>,
+            &mut CommandBuffer,
             &mut RenderState,
             &RenderLayers,
             &Projection,