Refactor light helpers to use correct naming.

Author: tychedelia

crates/processing_pyo3/examples/camera_controllers.py

@@ -8,7 +8,7 @@ def setup():
     mode_3d()
     orbit_camera()                                                                                                                       
 
-    dir_light = create_directional_light((1.0, 0.98, 0.95), 1500.0)                                                                        
+    dir_light = directional_light((1.0, 0.98, 0.95), 1500.0)                                                                        
     dir_light.position(300.0, 400.0, 300.0)
     dir_light.look_at(0.0, 0.0, 0.0)                                                                                                     
 

crates/processing_pyo3/examples/lights.py

@@ -7,19 +7,19 @@ def setup():
     mode_3d()
 
     # Directional Light
-    dir_light = create_directional_light((0.5, 0.24, 1.0), 1500.0)
+    dir_light = directional_light((0.5, 0.24, 1.0), 1500.0)
 
     # Point Lights
-    point_light_a = create_point_light((1.0, 0.5, 0.25), 1000000.0, 200.0, 0.5)
+    point_light_a = point_light((1.0, 0.5, 0.25), 1000000.0, 200.0, 0.5)
     point_light_a.position(-25.0, 5.0, 51.0)
     point_light_a.look_at(0.0, 0.0, 0.0)
 
-    point_light_b = create_point_light((0.0, 0.5, 0.75), 2000000.0, 200.0, 0.25)
+    point_light_b = point_light((0.0, 0.5, 0.75), 2000000.0, 200.0, 0.25)
     point_light_b.position(0.0, 5.0, 50.5)
     point_light_b.look_at(0.0, 0.0, 0.0)
 
     # Spot Light
-    spot_light = create_spot_light((0.25, 0.8, 0.19), 15.0 * 1000000.0, 200.0, 0.84, 0.0, 0.7854)
+    spot_light = spot_light((0.25, 0.8, 0.19), 15.0 * 1000000.0, 200.0, 0.84, 0.0, 0.7854)
     spot_light.position(40.0, 0.0, 70.0)
     spot_light.look_at(0.0, 0.0, 0.0)
 

crates/processing_pyo3/examples/materials.py

@@ -7,8 +7,8 @@ def setup():
     size(800, 600)
     mode_3d()
 
-    dir_light = create_directional_light((1.0, 0.98, 0.95), 1500.0)
-    point_light = create_point_light((1.0, 1.0, 1.0), 100000.0, 800.0, 0.0)
+    dir_light = directional_light((1.0, 0.98, 0.95), 1500.0)
+    point_light = point_light((1.0, 1.0, 1.0), 100000.0, 800.0, 0.0)
     point_light.position(200.0, 200.0, 400.0)
 
     mat = Material()

crates/processing_pyo3/src/lib.rs

@@ -1370,46 +1370,74 @@ mod mewnala {
         graphics.create_image(width, height)
     }
 
+    fn apply_light_transform(
+        light: &Light,
+        position: Option<super::math::Vec3Like>,
+        look_at: Option<super::math::Vec3Like>,
+    ) -> PyResult<()> {
+        if let Some(p) = position {
+            ::processing::prelude::transform_set_position(light.entity, p.into_vec3())
+                .map_err(|e| PyRuntimeError::new_err(format!("{e}")))?;
+        }
+        if let Some(la) = look_at {
+            ::processing::prelude::transform_look_at(light.entity, la.into_vec3())
+                .map_err(|e| PyRuntimeError::new_err(format!("{e}")))?;
+        }
+        Ok(())
+    }
+
     #[pyfunction]
-    #[pyo3(pass_module)]
-    fn create_directional_light(
+    #[pyo3(pass_module, signature = (color, illuminance, *, position=None, look_at=None))]
+    fn directional_light(
         module: &Bound<'_, PyModule>,
         color: super::color::ColorLike,
         illuminance: f32,
+        position: Option<super::math::Vec3Like>,
+        look_at: Option<super::math::Vec3Like>,
     ) -> PyResult<Light> {
         let graphics =
             get_graphics(module)?.ok_or_else(|| PyRuntimeError::new_err("call size() first"))?;
-        graphics.light_directional(color, illuminance)
+        let light = graphics.light_directional(color, illuminance)?;
+        apply_light_transform(&light, position, look_at)?;
+        Ok(light)
     }
 
     #[pyfunction]
-    #[pyo3(pass_module)]
-    fn create_point_light(
+    #[pyo3(pass_module, signature = (color, intensity, range, radius, *, position=None, look_at=None))]
+    fn point_light(
         module: &Bound<'_, PyModule>,
         color: super::color::ColorLike,
         intensity: f32,
         range: f32,
         radius: f32,
+        position: Option<super::math::Vec3Like>,
+        look_at: Option<super::math::Vec3Like>,
     ) -> PyResult<Light> {
         let graphics =
             get_graphics(module)?.ok_or_else(|| PyRuntimeError::new_err("call size() first"))?;
-        graphics.light_point(color, intensity, range, radius)
+        let light = graphics.light_point(color, intensity, range, radius)?;
+        apply_light_transform(&light, position, look_at)?;
+        Ok(light)
     }
 
     #[pyfunction]
-    #[pyo3(pass_module)]
-    fn create_spot_light(
+    #[pyo3(pass_module, signature = (color, intensity, range, radius, inner_angle, outer_angle, *, position=None, look_at=None))]
+    fn spot_light(
         module: &Bound<'_, PyModule>,
         color: super::color::ColorLike,
         intensity: f32,
         range: f32,
         radius: f32,
         inner_angle: f32,
         outer_angle: f32,
+        position: Option<super::math::Vec3Like>,
+        look_at: Option<super::math::Vec3Like>,
     ) -> PyResult<Light> {
         let graphics =
             get_graphics(module)?.ok_or_else(|| PyRuntimeError::new_err("call size() first"))?;
-        graphics.light_spot(color, intensity, range, radius, inner_angle, outer_angle)
+        let light = graphics.light_spot(color, intensity, range, radius, inner_angle, outer_angle)?;
+        apply_light_transform(&light, position, look_at)?;
+        Ok(light)
     }
 
     #[pyfunction(name = "sphere")]