Merge pull request #3 from tychedelia/lights

Add render layers for lights

Author: catilac

crates/processing_render/src/lib.rs

@@ -705,21 +705,25 @@ 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| {
-        Ok(app
-            .world_mut()
-            .run_system_cached_with(light::create_directional, (x, y, z, color, illuminance))
-            .unwrap())
+        app.world_mut()
+            .run_system_cached_with(
+                light::create_directional,
+                (graphics_entity, x, y, z, color, illuminance),
+            )
+            .unwrap()
     })
 }
 
 pub fn light_create_point(
+    graphics_entity: Entity,
     x: f32,
     y: f32,
     z: f32,
@@ -729,17 +733,17 @@ pub fn light_create_point(
     radius: f32,
 ) -> error::Result<Entity> {
     app_mut(|app| {
-        Ok(app
-            .world_mut()
+        app.world_mut()
             .run_system_cached_with(
                 light::create_point,
-                (x, y, z, color, intensity, range, radius),
+                (graphics_entity, x, y, z, color, intensity, range, radius),
             )
-            .unwrap())
+            .unwrap()
     })
 }
 
 pub fn light_create_spot(
+    graphics_entity: Entity,
     x: f32,
     y: f32,
     z: f32,
@@ -751,11 +755,11 @@ pub fn light_create_spot(
     outer_angle: f32,
 ) -> error::Result<Entity> {
     app_mut(|app| {
-        Ok(app
-            .world_mut()
+        app.world_mut()
             .run_system_cached_with(
                 light::create_spot,
                 (
+                    graphics_entity,
                     x,
                     y,
                     z,
@@ -767,7 +771,7 @@ pub fn light_create_spot(
                     outer_angle,
                 ),
             )
-            .unwrap())
+            .unwrap()
     })
 }
 

crates/processing_render/src/light.rs

@@ -1,7 +1,9 @@
 //! A light in Processing
 //!
 
-use bevy::prelude::*;
+use bevy::{camera::visibility::RenderLayers, prelude::*};
+
+use crate::{error::ProcessingError, graphics::Graphics};
 
 pub struct LightPlugin;
 
@@ -10,26 +12,44 @@ impl Plugin for LightPlugin {
 }
 
 pub fn create_directional(
-    In((px, py, pz, color, illuminance)): In<(f32, f32, f32, Color, f32)>,
+    In((entity, px, py, pz, color, illuminance)): In<(Entity, f32, f32, f32, Color, f32)>,
     mut commands: Commands,
-) -> Entity {
-    commands
+    graphics: Query<&RenderLayers, With<Graphics>>,
+) -> Result<Entity, ProcessingError> {
+    let layer = graphics
+        .get(entity)
+        .map_err(|_| ProcessingError::GraphicsNotFound)?;
+    Ok(commands
         .spawn((
             DirectionalLight {
                 illuminance,
                 color,
                 ..default()
             },
             Transform::from_xyz(px, py, pz),
+            layer.clone(),
         ))
-        .id()
+        .id())
 }
 
 pub fn create_point(
-    In((px, py, pz, color, intensity, range, radius)): In<(f32, f32, f32, Color, f32, f32, f32)>,
+    In((entity, px, py, pz, color, intensity, range, radius)): In<(
+        Entity,
+        f32,
+        f32,
+        f32,
+        Color,
+        f32,
+        f32,
+        f32,
+    )>,
     mut commands: Commands,
-) -> Entity {
-    commands
+    graphics: Query<&RenderLayers, With<Graphics>>,
+) -> Result<Entity, ProcessingError> {
+    let layer = graphics
+        .get(entity)
+        .map_err(|_| ProcessingError::GraphicsNotFound)?;
+    Ok(commands
         .spawn((
             PointLight {
                 intensity,
@@ -39,12 +59,14 @@ pub fn create_point(
                 ..default()
             },
             Transform::from_xyz(px, py, pz),
+            layer.clone(),
         ))
-        .id()
+        .id())
 }
 
 pub fn create_spot(
-    In((px, py, pz, color, intensity, range, radius, inner_angle, outer_angle)): In<(
+    In((entity, px, py, pz, color, intensity, range, radius, inner_angle, outer_angle)): In<(
+        Entity,
         f32,
         f32,
         f32,
@@ -56,8 +78,12 @@ pub fn create_spot(
         f32,
     )>,
     mut commands: Commands,
-) -> Entity {
-    commands
+    graphics: Query<&RenderLayers, With<Graphics>>,
+) -> Result<Entity, ProcessingError> {
+    let layer = graphics
+        .get(entity)
+        .map_err(|_| ProcessingError::GraphicsNotFound)?;
+    Ok(commands
         .spawn((
             SpotLight {
                 color,
@@ -69,6 +95,7 @@ pub fn create_spot(
                 ..default()
             },
             Transform::from_xyz(px, py, pz),
+            layer.clone(),
         ))
-        .id()
+        .id())
 }

examples/lights.rs

@@ -32,12 +32,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(
+        graphics,
         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)?;