remove positional arguments in favor of using transform_set_position

Author: catilac

crates/processing_render/src/lib.rs

@@ -778,27 +778,21 @@ pub fn image_destroy(entity: Entity) -> error::Result<()> {
 
 pub fn light_create_directional(
     graphics_entity: Entity,
-    x: f32,
-    y: f32,
-    z: f32,
     color: Color,
     illuminance: f32,
 ) -> error::Result<Entity> {
     app_mut(|app| {
         app.world_mut()
             .run_system_cached_with(
                 light::create_directional,
-                (graphics_entity, x, y, z, color, illuminance),
+                (graphics_entity, color, illuminance),
             )
             .unwrap()
     })
 }
 
 pub fn light_create_point(
     graphics_entity: Entity,
-    x: f32,
-    y: f32,
-    z: f32,
     color: Color,
     intensity: f32,
     range: f32,
@@ -808,17 +802,14 @@ pub fn light_create_point(
         app.world_mut()
             .run_system_cached_with(
                 light::create_point,
-                (graphics_entity, x, y, z, color, intensity, range, radius),
+                (graphics_entity, color, intensity, range, radius),
             )
             .unwrap()
     })
 }
 
 pub fn light_create_spot(
     graphics_entity: Entity,
-    x: f32,
-    y: f32,
-    z: f32,
     color: Color,
     intensity: f32,
     range: f32,
@@ -832,9 +823,6 @@ pub fn light_create_spot(
                 light::create_spot,
                 (
                     graphics_entity,
-                    x,
-                    y,
-                    z,
                     color,
                     intensity,
                     range,

crates/processing_render/src/light.rs

@@ -12,7 +12,7 @@ impl Plugin for LightPlugin {
 }
 
 pub fn create_directional(
-    In((entity, px, py, pz, color, illuminance)): In<(Entity, f32, f32, f32, Color, f32)>,
+    In((entity, color, illuminance)): In<(Entity, Color, f32)>,
     mut commands: Commands,
     graphics: Query<&RenderLayers, With<Graphics>>,
 ) -> Result<Entity, ProcessingError> {
@@ -26,23 +26,13 @@ pub fn create_directional(
                 color,
                 ..default()
             },
-            Transform::from_xyz(px, py, pz),
             layer.clone(),
         ))
         .id())
 }
 
 pub fn create_point(
-    In((entity, px, py, pz, color, intensity, range, radius)): In<(
-        Entity,
-        f32,
-        f32,
-        f32,
-        Color,
-        f32,
-        f32,
-        f32,
-    )>,
+    In((entity, color, intensity, range, radius)): In<(Entity, Color, f32, f32, f32)>,
     mut commands: Commands,
     graphics: Query<&RenderLayers, With<Graphics>>,
 ) -> Result<Entity, ProcessingError> {
@@ -58,18 +48,14 @@ pub fn create_point(
                 radius,
                 ..default()
             },
-            Transform::from_xyz(px, py, pz),
             layer.clone(),
         ))
         .id())
 }
 
 pub fn create_spot(
-    In((entity, px, py, pz, color, intensity, range, radius, inner_angle, outer_angle)): In<(
+    In((entity, color, intensity, range, radius, inner_angle, outer_angle)): In<(
         Entity,
-        f32,
-        f32,
-        f32,
         Color,
         f32,
         f32,
@@ -94,7 +80,6 @@ pub fn create_spot(
                 outer_angle,
                 ..default()
             },
-            Transform::from_xyz(px, py, pz),
             layer.clone(),
         ))
         .id())

examples/lights.rs

@@ -31,21 +31,12 @@ fn sketch() -> error::Result<()> {
 
     // We will only declare lights in `setup`
     // rather than calling some sort of `light()` method inside of `draw`
-    let dir_light = light_create_directional(
-        graphics,
-        0.0,
-        0.0,
-        0.0,
-        bevy::color::Color::srgb(0.35, 0.25, 0.5),
-        1000.0,
-    )?;
+    let dir_light =
+        light_create_directional(graphics, bevy::color::Color::srgb(0.35, 0.25, 0.5), 1000.0)?;
     transform_set_position(dir_light, 10.0, 10.0, 0.0)?;
 
     let point_light = light_create_point(
         graphics,
-        100.0,
-        100.0,
-        10.0,
         bevy::color::Color::srgb(1.0, 0.5, 0.25),
         1_000_000.0,
         20.0,
@@ -56,9 +47,6 @@ fn sketch() -> error::Result<()> {
 
     let spot_light = light_create_spot(
         graphics,
-        -15.0,
-        -15.0,
-        0.0,
         bevy::color::Color::srgb(0.25, 0.5, 0.88),
         1_000_000.0,
         25.0,