Use bevy::color::Color as an argument to lighting methods

Author: catilac

crates/processing_render/src/lib.rs

@@ -780,19 +780,13 @@ pub fn light_create_directional(
     x: f32,
     y: f32,
     z: f32,
-    r: f32,
-    g: f32,
-    b: f32,
-    a: f32,
+    color: Color,
     illuminance: f32,
 ) -> error::Result<Entity> {
     app_mut(|app| {
         Ok(app
             .world_mut()
-            .run_system_cached_with(
-                light::create_directional,
-                (x, y, z, r, g, b, a, illuminance),
-            )
+            .run_system_cached_with(light::create_directional, (x, y, z, color, illuminance))
             .unwrap())
     })
 }
@@ -801,10 +795,7 @@ pub fn light_create_point(
     x: f32,
     y: f32,
     z: f32,
-    r: f32,
-    g: f32,
-    b: f32,
-    a: f32,
+    color: Color,
     intensity: f32,
     range: f32,
     radius: f32,
@@ -814,7 +805,7 @@ pub fn light_create_point(
             .world_mut()
             .run_system_cached_with(
                 light::create_point,
-                (x, y, z, r, g, b, a, intensity, range, radius),
+                (x, y, z, color, intensity, range, radius),
             )
             .unwrap())
     })
@@ -824,10 +815,7 @@ pub fn light_create_spot(
     x: f32,
     y: f32,
     z: f32,
-    r: f32,
-    g: f32,
-    b: f32,
-    a: f32,
+    color: Color,
     intensity: f32,
     range: f32,
     radius: f32,
@@ -843,10 +831,7 @@ pub fn light_create_spot(
                     x,
                     y,
                     z,
-                    r,
-                    g,
-                    b,
-                    a,
+                    color,
                     intensity,
                     range,
                     radius,

crates/processing_render/src/light.rs

@@ -10,14 +10,14 @@ impl Plugin for LightPlugin {
 }
 
 pub fn create_directional(
-    In((px, py, pz, r, g, b, a, illuminance)): In<(f32, f32, f32, f32, f32, f32, f32, f32)>,
+    In((px, py, pz, color, illuminance)): In<(f32, f32, f32, Color, f32)>,
     mut commands: Commands,
 ) -> Entity {
     commands
         .spawn((
             DirectionalLight {
                 illuminance,
-                color: Color::srgba(r, g, b, a),
+                color,
                 ..default()
             },
             Transform::from_xyz(px, py, pz),
@@ -26,25 +26,14 @@ pub fn create_directional(
 }
 
 pub fn create_point(
-    In((px, py, pz, r, g, b, a, intensity, range, radius)): In<(
-        f32,
-        f32,
-        f32,
-        f32,
-        f32,
-        f32,
-        f32,
-        f32,
-        f32,
-        f32,
-    )>,
+    In((px, py, pz, color, intensity, range, radius)): In<(f32, f32, f32, Color, f32, f32, f32)>,
     mut commands: Commands,
 ) -> Entity {
     commands
         .spawn((
             PointLight {
                 intensity,
-                color: Color::srgba(r, g, b, a),
+                color,
                 range,
                 radius,
                 ..default()
@@ -55,14 +44,11 @@ pub fn create_point(
 }
 
 pub fn create_spot(
-    In((px, py, pz, r, g, b, a, intensity, range, radius, inner_angle, outer_angle)): In<(
-        f32,
-        f32,
-        f32,
-        f32,
+    In((px, py, pz, color, intensity, range, radius, inner_angle, outer_angle)): In<(
         f32,
         f32,
         f32,
+        Color,
         f32,
         f32,
         f32,
@@ -74,7 +60,7 @@ pub fn create_spot(
     commands
         .spawn((
             SpotLight {
-                color: Color::srgba(r, g, b, a),
+                color,
                 intensity,
                 range,
                 radius,

examples/lights.rs

@@ -31,7 +31,13 @@ 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(0.0, 0.0, 0.0, 0.5, 0.43, 1.0, 1.0, 1000.0);
+    let _dir_light = light_create_directional(
+        0.0,
+        0.0,
+        0.0,
+        bevy::color::Color::srgb(1.0, 0.0, 0.0),
+        1000.0,
+    );
 
     graphics_mode_3d(graphics)?;
     graphics_camera_position(graphics, 100.0, 100.0, 300.0)?;