From cf4013b22bf93fcb5357fd8ca5f61418c4b1c8b6 Mon Sep 17 00:00:00 2001
From: James Gayfer <10660608+jgayfer@users.noreply.github.com>
Date: Sun, 27 Oct 2024 20:44:05 -0700
Subject: [PATCH] Initial 0.15 support

More work needed to move things over to required components and to ensure
extraction is done correctly, but gets us to the point where bevy_light_2d
is usable with bevy 0.15.
---
 Cargo.toml            |  4 +--
 examples/basic.rs     |  2 +-
 examples/dungeon.rs   | 50 ++++++++++++++++++-------------------
 examples/multiple.rs  | 11 +++------
 examples/occlusion.rs |  8 +++---
 src/light.rs          |  6 ++++-
 src/occluder.rs       |  6 ++++-
 src/render/extract.rs | 57 ++++++++++++++++++++++++++++---------------
 8 files changed, 82 insertions(+), 62 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 80e236a..c6cc4e6 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,7 +11,7 @@ readme = "README.md"
 exclude = ["assets/*", "static/*"]
 
 [dependencies]
-bevy = { version = "0.14", default-features = false, features = [
+bevy = { version = "0.15.0-rc.2", default-features = false, features = [
     "bevy_render",
     "bevy_core_pipeline",
     "bevy_winit",
@@ -20,7 +20,7 @@ bevy = { version = "0.14", default-features = false, features = [
 smallvec = "1.13"
 
 [dev-dependencies]
-bevy = { version = "0.14", default-features = false, features = [
+bevy = { version = "0.15.0-rc.2", default-features = false, features = [
     "bevy_render",
     "bevy_core_pipeline",
     "bevy_winit",
diff --git a/examples/basic.rs b/examples/basic.rs
index 1829db6..df9fb63 100644
--- a/examples/basic.rs
+++ b/examples/basic.rs
@@ -9,7 +9,7 @@ fn main() {
 }
 
 fn setup(mut commands: Commands) {
-    commands.spawn(Camera2dBundle::default());
+    commands.spawn(Camera2d);
 
     commands.spawn(PointLight2dBundle {
         point_light: PointLight2d {
diff --git a/examples/dungeon.rs b/examples/dungeon.rs
index 48166da..5b43211 100644
--- a/examples/dungeon.rs
+++ b/examples/dungeon.rs
@@ -38,10 +38,11 @@ struct Candle;
 struct AnimationTimer(Timer);
 
 fn setup_camera(mut commands: Commands) {
-    let mut camera = Camera2dBundle::default();
-    camera.projection.scale = 0.25;
+    let mut projection = OrthographicProjection::default_2d();
+    projection.scale = 0.25;
     commands.spawn((
-        camera,
+        Camera2d,
+        projection,
         AmbientLight2d {
             brightness: 0.1,
             ..default()
@@ -55,12 +56,14 @@ fn set_clear_color(mut clear_color: ResMut<ClearColor>) {
 
 fn animate_candles(
     time: Res<Time>,
-    mut query: Query<(&mut AnimationTimer, &mut TextureAtlas), With<Candle>>,
+    mut query: Query<(&mut AnimationTimer, &mut Sprite), With<Candle>>,
 ) {
-    for (mut timer, mut atlas) in &mut query {
+    for (mut timer, mut sprite) in &mut query {
         timer.tick(time.delta());
         if timer.just_finished() {
-            atlas.index = (atlas.index + 1) % 4;
+            if let Some(ref mut texture_atlas) = sprite.texture_atlas {
+                texture_atlas.index = (texture_atlas.index + 1) % 4;
+            }
         }
     }
 }
@@ -84,15 +87,14 @@ fn spawn_candles(mut commands: Commands, spritesheet: Res<CandleSpritesheet>) {
         .spawn((
             Candle,
             AnimationTimer(Timer::from_seconds(0.2, TimerMode::Repeating)),
-            SpriteBundle {
-                transform: Transform::from_xyz(0., 2., ENTITY_INDEX),
-                texture: spritesheet.texture.clone(),
-                ..default()
-            },
-            TextureAtlas {
-                layout: spritesheet.layout.clone(),
-                ..default()
-            },
+            Sprite::from_atlas_image(
+                spritesheet.texture.clone(),
+                TextureAtlas {
+                    layout: spritesheet.layout.clone(),
+                    index: 0,
+                },
+            ),
+            Transform::from_xyz(0., 2., ENTITY_INDEX),
         ))
         .add_child(light);
 }
@@ -166,18 +168,14 @@ fn spawn_from_atlas(
     texture: Handle<Image>,
 ) {
     commands.spawn((
-        SpriteBundle {
-            transform: Transform {
-                translation,
-                ..default()
-            },
+        Sprite::from_atlas_image(
             texture,
-            ..default()
-        },
-        TextureAtlas {
-            index: sprite_index,
-            layout: atlas_handle,
-        },
+            TextureAtlas {
+                index: sprite_index,
+                layout: atlas_handle,
+            },
+        ),
+        Transform::from_translation(translation),
     ));
 }
 
diff --git a/examples/multiple.rs b/examples/multiple.rs
index 2d6893e..e9ec9f5 100644
--- a/examples/multiple.rs
+++ b/examples/multiple.rs
@@ -10,19 +10,16 @@ fn main() {
 
 fn setup(mut commands: Commands) {
     commands.spawn((
-        Camera2dBundle::default(),
+        Camera2d,
         AmbientLight2d {
             brightness: 0.1,
             ..default()
         },
     ));
 
-    commands.spawn(SpriteBundle {
-        sprite: Sprite {
-            custom_size: Some(Vec2::splat(150.)),
-            color: Color::WHITE,
-            ..default()
-        },
+    commands.spawn(Sprite {
+        custom_size: Some(Vec2::splat(150.)),
+        color: Color::WHITE,
         ..default()
     });
 
diff --git a/examples/occlusion.rs b/examples/occlusion.rs
index e41dcf5..6ed9bb2 100644
--- a/examples/occlusion.rs
+++ b/examples/occlusion.rs
@@ -23,7 +23,7 @@ struct YellowLight;
 struct BlueLight;
 
 fn setup(mut commands: Commands) {
-    commands.spawn(Camera2dBundle::default());
+    commands.spawn(Camera2d);
 
     commands.spawn((
         PointLight2dBundle {
@@ -118,10 +118,10 @@ fn move_lights(
     time: Res<Time>,
 ) {
     for mut light_transform in &mut yellow_query {
-        light_transform.translation.x = time.elapsed_seconds().sin() * 500.
+        light_transform.translation.x = time.elapsed_secs().sin() * 500.
     }
     for mut light_transform in &mut blue_query {
-        light_transform.translation.x = time.elapsed_seconds().cos() * 500.
+        light_transform.translation.x = time.elapsed_secs().cos() * 500.
     }
 }
 
@@ -177,7 +177,7 @@ fn control_camera_zoom(
     }
 
     for mut camera in cameras.iter_mut() {
-        camera.scale = (camera.scale - projection_delta * time.delta_seconds())
+        camera.scale = (camera.scale - projection_delta * time.delta_secs())
             .clamp(MIN_CAMERA_SCALE, MAX_CAMERA_SCALE);
     }
 }
diff --git a/src/light.rs b/src/light.rs
index be764ea..2c3aefb 100644
--- a/src/light.rs
+++ b/src/light.rs
@@ -4,7 +4,10 @@ use bevy::{
     color::Color,
     ecs::{bundle::Bundle, component::Component},
     reflect::Reflect,
-    render::view::{InheritedVisibility, ViewVisibility, Visibility},
+    render::{
+        sync_world::SyncToRenderWorld,
+        view::{InheritedVisibility, ViewVisibility, Visibility},
+    },
     transform::components::{GlobalTransform, Transform},
 };
 
@@ -21,6 +24,7 @@ use bevy::{
 /// [A better point light attenutation function](https://lisyarus.github.io/blog/posts/point-light-attenuation.html#section-the-solution)
 /// by [lisyarus](https://lisyarus.github.io/blog/).
 #[derive(Component, Clone, Reflect)]
+#[require(SyncToRenderWorld)]
 pub struct PointLight2d {
     /// The light's color tint.
     pub color: Color,
diff --git a/src/occluder.rs b/src/occluder.rs
index 8a06637..c34bb46 100644
--- a/src/occluder.rs
+++ b/src/occluder.rs
@@ -3,7 +3,10 @@
 use bevy::{
     ecs::{bundle::Bundle, component::Component},
     math::Vec2,
-    render::view::{InheritedVisibility, ViewVisibility, Visibility},
+    render::{
+        sync_world::SyncToRenderWorld,
+        view::{InheritedVisibility, ViewVisibility, Visibility},
+    },
     transform::components::{GlobalTransform, Transform},
 };
 
@@ -11,6 +14,7 @@ use bevy::{
 ///
 /// This is commonly used as a component within [`LightOcluder2dBundle`].
 #[derive(Default, Component)]
+#[require(SyncToRenderWorld)]
 pub struct LightOccluder2d {
     /// The shape of the light occluder.
     pub shape: LightOccluder2dShape,
diff --git a/src/render/extract.rs b/src/render/extract.rs
index 30deb74..308ab13 100644
--- a/src/render/extract.rs
+++ b/src/render/extract.rs
@@ -1,6 +1,6 @@
 use bevy::{
     prelude::*,
-    render::{render_resource::ShaderType, Extract},
+    render::{render_resource::ShaderType, sync_world::RenderEntity, Extract},
 };
 
 use crate::{
@@ -31,30 +31,45 @@ pub struct ExtractedAmbientLight2d {
 
 pub fn extract_point_lights(
     mut commands: Commands,
-    point_light_query: Extract<Query<(Entity, &PointLight2d, &GlobalTransform, &ViewVisibility)>>,
+    point_light_query: Extract<
+        Query<(
+            &RenderEntity,
+            &PointLight2d,
+            &GlobalTransform,
+            &ViewVisibility,
+        )>,
+    >,
 ) {
-    for (entity, point_light, global_transform, view_visibility) in &point_light_query {
+    for (render_entity, point_light, global_transform, view_visibility) in &point_light_query {
         if !view_visibility.get() {
             continue;
         }
-        commands.get_or_spawn(entity).insert(ExtractedPointLight2d {
-            color: point_light.color.to_linear(),
-            transform: global_transform.translation().xy(),
-            radius: point_light.radius,
-            intensity: point_light.intensity,
-            falloff: point_light.falloff,
-            cast_shadows: if point_light.cast_shadows { 1 } else { 0 },
-        });
+        commands
+            .entity(render_entity.id())
+            .insert(ExtractedPointLight2d {
+                color: point_light.color.to_linear(),
+                transform: global_transform.translation().xy(),
+                radius: point_light.radius,
+                intensity: point_light.intensity,
+                falloff: point_light.falloff,
+                cast_shadows: if point_light.cast_shadows { 1 } else { 0 },
+            });
     }
 }
 
 pub fn extract_light_occluders(
     mut commands: Commands,
     light_occluders_query: Extract<
-        Query<(Entity, &LightOccluder2d, &GlobalTransform, &ViewVisibility)>,
+        Query<(
+            &RenderEntity,
+            &LightOccluder2d,
+            &GlobalTransform,
+            &ViewVisibility,
+        )>,
     >,
 ) {
-    for (entity, light_occluder, global_transform, view_visibility) in &light_occluders_query {
+    for (render_entity, light_occluder, global_transform, view_visibility) in &light_occluders_query
+    {
         if !view_visibility.get() {
             continue;
         }
@@ -66,18 +81,20 @@ pub fn extract_light_occluders(
             },
         };
 
-        commands.get_or_spawn(entity).insert(extracted_occluder);
+        commands
+            .entity(render_entity.id())
+            .insert(extracted_occluder);
     }
 }
 
 pub fn extract_ambient_lights(
     mut commands: Commands,
-    ambient_light_query: Extract<Query<(Entity, &AmbientLight2d)>>,
-    camera_query: Extract<Query<Entity, (With<Camera2d>, Without<AmbientLight2d>)>>,
+    ambient_light_query: Extract<Query<(&RenderEntity, &AmbientLight2d)>>,
+    camera_query: Extract<Query<&RenderEntity, (With<Camera2d>, Without<AmbientLight2d>)>>,
 ) {
-    for (entity, ambient_light) in &ambient_light_query {
+    for (render_entity, ambient_light) in &ambient_light_query {
         commands
-            .get_or_spawn(entity)
+            .entity(render_entity.id())
             .insert(ExtractedAmbientLight2d {
                 color: ambient_light.color.to_linear() * ambient_light.brightness,
             });
@@ -85,9 +102,9 @@ pub fn extract_ambient_lights(
 
     // Our lighting pass only runs on views with an ambient light component,
     // so let's add a no-op ambient light to any 2d cameras don't have one.
-    for entity in &camera_query {
+    for render_entity in &camera_query {
         commands
-            .get_or_spawn(entity)
+            .entity(render_entity.id())
             .insert(ExtractedAmbientLight2d {
                 color: Color::WHITE.into(),
             });