add endGeometry function

Author: Nitish-bot

crates/processing_pyo3/src/graphics.rs

@@ -310,8 +310,14 @@ impl Graphics {
     }
 
     pub fn begin_geometry(&self) -> PyResult<()> {
-        geometry_begin(self.entity)
-            .map_err(|e| PyRuntimeError::new_err(format!("{e}")))
+        geometry_begin(self.entity).map_err(|e| PyRuntimeError::new_err(format!("{e}")))
+    }
+
+    pub fn end_geometry(&self) -> PyResult<Geometry> {
+        match geometry_end(self.entity) {
+            Ok(geometry) => Ok(Geometry { entity: geometry }),
+            Err(e) => Err(PyRuntimeError::new_err(format!("{e}"))),
+        }
     }
 }
 

crates/processing_pyo3/src/lib.rs

@@ -41,7 +41,8 @@ fn processing(m: &Bound<'_, PyModule>) -> PyResult<()> {
     m.add_function(wrap_pyfunction!(image, m)?)?;
     m.add_function(wrap_pyfunction!(draw_geometry, m)?)?;
     m.add_function(wrap_pyfunction!(begin_geometry, m)?)?;
-    
+    m.add_function(wrap_pyfunction!(end_geometry, m)?)?;
+
     Ok(())
 }
 
@@ -229,4 +230,10 @@ fn image(module: &Bound<'_, PyModule>, image_file: &str) -> PyResult<Image> {
 #[pyo3(pass_module)]
 fn begin_geometry(module: &Bound<'_, PyModule>) -> PyResult<()> {
     get_graphics(module)?.begin_geometry()
-}
+}
+
+#[pyfunction]
+#[pyo3(pass_module)]
+fn end_geometry(module: &Bound<'_, PyModule>) -> PyResult<Geometry> {
+    get_graphics(module)?.end_geometry()
+}

crates/processing_render/src/geometry/mod.rs

@@ -16,7 +16,10 @@ use bevy::{
     render::render_resource::PrimitiveTopology,
 };
 
-use crate::{error::{ProcessingError, Result}, render::RenderState};
+use crate::{
+    error::{ProcessingError, Result},
+    render::RenderState,
+};
 
 pub struct GeometryPlugin;
 
@@ -372,7 +375,7 @@ pub fn begin(
     mut state_query: Query<&mut RenderState>,
     mut meshes: ResMut<Assets<Mesh>>,
     builtins: Res<BuiltinAttributes>,
-) -> Result<()> {    
+) -> Result<()> {
     let layout_entity = commands
         .spawn(VertexLayout::with_attributes(vec![
             builtins.position,
@@ -387,11 +390,26 @@ pub fn begin(
         RenderAssetUsages::default(),
     );
     let handle = meshes.add(mesh);
-    
+
     let mut state = state_query
         .get_mut(graphics_entity)
         .map_err(|_| ProcessingError::GraphicsNotFound)?;
 
     state.running_geometry = Some(Geometry::new(handle, layout_entity));
     Ok(())
-}
+}
+
+pub fn end(
+    In(graphics_entity): In<Entity>,
+    mut commands: Commands,
+    mut state_query: Query<&mut RenderState>,
+) -> Result<Entity> {
+    let geometry = state_query
+        .get_mut(graphics_entity)
+        .map_err(|_| ProcessingError::GraphicsNotFound)?
+        .running_geometry
+        .take()
+        .ok_or(ProcessingError::GeometryNotFound)?;
+
+    Ok(commands.spawn(geometry).id())
+}

crates/processing_render/src/lib.rs

@@ -1074,9 +1074,16 @@ pub fn geometry_box(width: f32, height: f32, depth: f32) -> error::Result<Entity
 
 pub fn geometry_begin(graphics_entity: Entity) -> error::Result<()> {
     app_mut(|app| {
-        app
-            .world_mut()
+        app.world_mut()
             .run_system_cached_with(geometry::begin, graphics_entity)
             .unwrap()
     })
-}
+}
+
+pub fn geometry_end(graphics_entity: Entity) -> error::Result<Entity> {
+    app_mut(|app| {
+        app.world_mut()
+            .run_system_cached_with(geometry::end, graphics_entity)
+            .unwrap()
+    })
+}