Mesh -> Geometry

Author: catilac

crates/processing_pyo3/examples/animated_mesh.py

@@ -1,24 +1,24 @@
 from processing import *
 from math import sin, cos
 
-mesh = None
+geometry = None
 grid_size = 20 
 spacing = 10.0
 offset = (grid_size * spacing) / 2.0;
 time = 0.0
 
 def setup():
-    global mesh
+    global geometry
     size(800, 600)
     mode_3d()
-    mesh = Mesh()
+    geometry = Geometry()
     for z in range(grid_size):
         for x in range(grid_size):
             px = x * spacing - offset
             pz = z * spacing - offset
-            mesh.color(x/grid_size, 0.5, z/grid_size, 1.0)
-            mesh.normal(0.0, 1.0, 0.0)
-            mesh.vertex(px, 0.0, pz)
+            geometry.color(x/grid_size, 0.5, z/grid_size, 1.0)
+            geometry.normal(0.0, 1.0, 0.0)
+            geometry.vertex(px, 0.0, pz)
 
     for z in range(grid_size-1):
         for x in range(grid_size-1):
@@ -27,17 +27,17 @@ def setup():
             bl = (z + 1) * grid_size + x
             br = bl + 1
 
-            mesh.index(tl)
-            mesh.index(bl)
-            mesh.index(tr)
+            geometry.index(tl)
+            geometry.index(bl)
+            geometry.index(tr)
 
-            mesh.index(tr)
-            mesh.index(bl)
-            mesh.index(br)
+            geometry.index(tr)
+            geometry.index(bl)
+            geometry.index(br)
 
 
 def draw():
-    global mesh
+    global geometry
     global grid_size
     global offset
     global spacing
@@ -53,9 +53,9 @@ def draw():
             px = x * spacing - offset
             pz = z * spacing - offset
             wave = sin(px * 0.1 + time) * cos(pz * 0.1 + time) * 20.0
-            mesh.set_vertex(idx, px, wave, pz)
+            geometry.set_vertex(idx, px, wave, pz)
 
-    draw_mesh(mesh)
+    draw_geometry(geometry)
 
     time += 0.05
 

crates/processing_pyo3/src/graphics.rs

@@ -36,7 +36,7 @@ impl Drop for Image {
 }
 
 #[pyclass(unsendable)]
-pub struct Mesh {
+pub struct Geometry {
     entity: Entity,
 }
 
@@ -62,7 +62,7 @@ impl Topology {
 }
 
 #[pymethods]
-impl Mesh {
+impl Geometry {
     #[new]
     #[pyo3(signature = (**kwargs))]
     pub fn new(kwargs: Option<&Bound<'_, PyDict>>) -> PyResult<Self> {
@@ -244,8 +244,8 @@ impl Graphics {
             .map_err(|e| PyRuntimeError::new_err(format!("{e}")))
     }
 
-    pub fn draw_mesh(&self, mesh: &Mesh) -> PyResult<()> {
-        graphics_record_command(self.entity, DrawCommand::Geometry(mesh.entity))
+    pub fn draw_geometry(&self, geometry: &Geometry) -> PyResult<()> {
+        graphics_record_command(self.entity, DrawCommand::Geometry(geometry.entity))
             .map_err(|e| PyRuntimeError::new_err(format!("{e}")))
     }
 

crates/processing_pyo3/src/lib.rs

@@ -11,7 +11,7 @@
 mod glfw;
 mod graphics;
 
-use graphics::{Graphics, Image, Mesh, Topology, get_graphics, get_graphics_mut};
+use graphics::{Graphics, Image, Geometry, Topology, get_graphics, get_graphics_mut};
 use pyo3::{exceptions::PyRuntimeError, prelude::*, types::PyTuple};
 
 use std::env;
@@ -20,7 +20,7 @@ use std::env;
 fn processing(m: &Bound<'_, PyModule>) -> PyResult<()> {
     m.add_class::<Graphics>()?;
     m.add_class::<Image>()?;
-    m.add_class::<Mesh>()?;
+    m.add_class::<Geometry>()?;
     m.add_class::<Topology>()?;
     m.add_function(wrap_pyfunction!(size, m)?)?;
     m.add_function(wrap_pyfunction!(run, m)?)?;
@@ -39,7 +39,7 @@ fn processing(m: &Bound<'_, PyModule>) -> PyResult<()> {
     m.add_function(wrap_pyfunction!(stroke_weight, m)?)?;
     m.add_function(wrap_pyfunction!(rect, m)?)?;
     m.add_function(wrap_pyfunction!(image, m)?)?;
-    m.add_function(wrap_pyfunction!(draw_mesh, m)?)?;
+    m.add_function(wrap_pyfunction!(draw_geometry, m)?)?;
 
     Ok(())
 }
@@ -156,9 +156,9 @@ fn draw_box(module: &Bound<'_, PyModule>, x: f32, y: f32, z: f32) -> PyResult<()
 }
 
 #[pyfunction]
-#[pyo3(pass_module, signature = (mesh))]
-fn draw_mesh(module: &Bound<'_, PyModule>, mesh: &Bound<'_, Mesh>) -> PyResult<()> {
-    get_graphics(module)?.draw_mesh(&*mesh.extract::<PyRef<Mesh>>()?)
+#[pyo3(pass_module, signature = (geometry))]
+fn draw_geometry(module: &Bound<'_, PyModule>, geometry: &Bound<'_, Geometry>) -> PyResult<()> {
+    get_graphics(module)?.draw_geometry(&*geometry.extract::<PyRef<Geometry>>()?)
 }
 
 #[pyfunction]