From f85e0dd5eaf13a6fb3883521c8f3be0813aeaf60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Mockers?= <francois.mockers@vleue.com>
Date: Wed, 25 Dec 2024 11:15:57 +0100
Subject: [PATCH 1/5] correctly set `slot` when not bindless

---
 crates/bevy_pbr/src/render/pbr_fragment.wgsl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/crates/bevy_pbr/src/render/pbr_fragment.wgsl b/crates/bevy_pbr/src/render/pbr_fragment.wgsl
index 1df7ef404f7b8..7d991a9769330 100644
--- a/crates/bevy_pbr/src/render/pbr_fragment.wgsl
+++ b/crates/bevy_pbr/src/render/pbr_fragment.wgsl
@@ -80,6 +80,7 @@ fn pbr_input_from_standard_material(
     let base_color = pbr_bindings::material[slot].base_color;
     let deferred_lighting_pass_id = pbr_bindings::material[slot].deferred_lighting_pass_id;
 #else   // BINDLESS
+    let slot = mesh[in.instance_index].material_and_lightmap_bind_group_slot & 0xffffu;
     let flags = pbr_bindings::material.flags;
     let base_color = pbr_bindings::material.base_color;
     let deferred_lighting_pass_id = pbr_bindings::material.deferred_lighting_pass_id;

From 3e297fec47d84520f63e639ba83f78356cf8d799 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Mockers?= <francois.mockers@vleue.com>
Date: Wed, 25 Dec 2024 11:16:10 +0100
Subject: [PATCH 2/5] also use `slot` for `VERTEX_UVS_B`

---
 crates/bevy_pbr/src/render/pbr_fragment.wgsl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/bevy_pbr/src/render/pbr_fragment.wgsl b/crates/bevy_pbr/src/render/pbr_fragment.wgsl
index 7d991a9769330..a8a02b3f71a4e 100644
--- a/crates/bevy_pbr/src/render/pbr_fragment.wgsl
+++ b/crates/bevy_pbr/src/render/pbr_fragment.wgsl
@@ -172,7 +172,7 @@ fn pbr_input_from_standard_material(
             // parallax mapping algorithm easier to understand and reason
             // about.
             -Vt,
-            in.instance_index,
+            slot,
         );
 #else
         uv_b = uv;

From 25bdd7f82da9ba433956989ebbdd0cc24055bfff Mon Sep 17 00:00:00 2001
From: Rob Parrett <robparrett@gmail.com>
Date: Thu, 26 Dec 2024 10:22:19 -0700
Subject: [PATCH 3/5] Fix panic in `audio_control` example

---
 examples/audio/audio_control.rs | 27 +++++++++++++++++++++++----
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/examples/audio/audio_control.rs b/examples/audio/audio_control.rs
index 2091ac8011966..89600c69deadf 100644
--- a/examples/audio/audio_control.rs
+++ b/examples/audio/audio_control.rs
@@ -34,11 +34,22 @@ fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
 #[derive(Component)]
 struct MyMusic;
 
-fn update_speed(sink: Single<&AudioSink, With<MyMusic>>, time: Res<Time>) {
+fn update_speed(music_controller: Query<&AudioSink, With<MyMusic>>, time: Res<Time>) {
+    let Ok(sink) = music_controller.get_single() else {
+        return;
+    };
+
     sink.set_speed((ops::sin(time.elapsed_secs() / 5.0) + 1.0).max(0.1));
 }
 
-fn pause(keyboard_input: Res<ButtonInput<KeyCode>>, sink: Single<&AudioSink, With<MyMusic>>) {
+fn pause(
+    keyboard_input: Res<ButtonInput<KeyCode>>,
+    music_controller: Query<&AudioSink, With<MyMusic>>,
+) {
+    let Ok(sink) = music_controller.get_single() else {
+        return;
+    };
+
     if keyboard_input.just_pressed(KeyCode::Space) {
         sink.toggle_playback();
     }
@@ -46,8 +57,12 @@ fn pause(keyboard_input: Res<ButtonInput<KeyCode>>, sink: Single<&AudioSink, Wit
 
 fn mute(
     keyboard_input: Res<ButtonInput<KeyCode>>,
-    mut sink: Single<&mut AudioSink, With<MyMusic>>,
+    mut music_controller: Query<&mut AudioSink, With<MyMusic>>,
 ) {
+    let Ok(mut sink) = music_controller.get_single_mut() else {
+        return;
+    };
+
     if keyboard_input.just_pressed(KeyCode::KeyM) {
         sink.toggle_mute();
     }
@@ -55,8 +70,12 @@ fn mute(
 
 fn volume(
     keyboard_input: Res<ButtonInput<KeyCode>>,
-    mut sink: Single<&mut AudioSink, With<MyMusic>>,
+    mut music_controller: Query<&mut AudioSink, With<MyMusic>>,
 ) {
+    let Ok(mut sink) = music_controller.get_single_mut() else {
+        return;
+    };
+
     if keyboard_input.just_pressed(KeyCode::Equal) {
         let current_volume = sink.volume();
         sink.set_volume(current_volume + 0.1);

From 93a318b58abc2920b5313c591e69a9e1fc1a2dd2 Mon Sep 17 00:00:00 2001
From: Rob Parrett <robparrett@gmail.com>
Date: Thu, 26 Dec 2024 10:33:15 -0700
Subject: [PATCH 4/5] Fix panics in `scene_viewer` example

---
 examples/helpers/camera_controller.rs         |  6 ++--
 .../tools/scene_viewer/morph_viewer_plugin.rs | 32 ++++++++++++++++---
 2 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/examples/helpers/camera_controller.rs b/examples/helpers/camera_controller.rs
index 33463214c7f0c..4a3e696db1c2e 100644
--- a/examples/helpers/camera_controller.rs
+++ b/examples/helpers/camera_controller.rs
@@ -109,11 +109,13 @@ fn run_camera_controller(
     key_input: Res<ButtonInput<KeyCode>>,
     mut toggle_cursor_grab: Local<bool>,
     mut mouse_cursor_grab: Local<bool>,
-    query: Single<(&mut Transform, &mut CameraController), With<Camera>>,
+    mut query: Query<(&mut Transform, &mut CameraController), With<Camera>>,
 ) {
     let dt = time.delta_secs();
 
-    let (mut transform, mut controller) = query.into_inner();
+    let Ok((mut transform, mut controller)) = query.get_single_mut() else {
+        return;
+    };
 
     if !controller.initialized {
         let (yaw, pitch, _roll) = transform.rotation.to_euler(EulerRot::YXZ);
diff --git a/examples/tools/scene_viewer/morph_viewer_plugin.rs b/examples/tools/scene_viewer/morph_viewer_plugin.rs
index 2c82ff64061ab..63ace772c9171 100644
--- a/examples/tools/scene_viewer/morph_viewer_plugin.rs
+++ b/examples/tools/scene_viewer/morph_viewer_plugin.rs
@@ -12,6 +12,8 @@ use crate::scene_viewer_plugin::SceneHandle;
 use bevy::prelude::*;
 use std::fmt;
 
+const FONT_SIZE: f32 = 13.0;
+
 const WEIGHT_PER_SECOND: f32 = 0.8;
 const ALL_MODIFIERS: &[KeyCode] = &[KeyCode::ShiftLeft, KeyCode::ControlLeft, KeyCode::AltLeft];
 const AVAILABLE_KEYS: [MorphKey; 56] = [
@@ -177,14 +179,20 @@ impl MorphKey {
     }
 }
 fn update_text(
+    mut commands: Commands,
     controls: Option<ResMut<WeightsControl>>,
-    text: Single<Entity, With<Text>>,
+    texts: Query<Entity, With<Text>>,
     morphs: Query<&MorphWeights>,
     mut writer: TextUiWriter,
 ) {
     let Some(mut controls) = controls else {
         return;
     };
+
+    let Ok(text) = texts.get_single() else {
+        return;
+    };
+
     for (i, target) in controls.weights.iter_mut().enumerate() {
         let Ok(weights) = morphs.get(target.entity) else {
             continue;
@@ -196,7 +204,21 @@ fn update_text(
             target.weight = actual_weight;
         }
         let key_name = &AVAILABLE_KEYS[i].name;
-        *writer.text(*text, i + 3) = format!("[{key_name}] {target}\n");
+
+        if let Some(mut val) = writer.get_text(text, i + 3) {
+            *val = format!("[{key_name}] {target}\n");
+        } else {
+            let new_span = commands
+                .spawn((
+                    TextSpan::new(format!("[{key_name}] {target}\n")),
+                    TextFont {
+                        font_size: FONT_SIZE,
+                        ..default()
+                    },
+                ))
+                .id();
+            commands.entity(text).add_child(new_span);
+        }
     }
 }
 fn update_morphs(
@@ -254,7 +276,7 @@ fn detect_morphs(
     }
     detected.truncate(AVAILABLE_KEYS.len());
     let style = TextFont {
-        font_size: 13.0,
+        font_size: FONT_SIZE,
         ..default()
     };
     let mut spans = vec![
@@ -270,8 +292,8 @@ fn detect_morphs(
             Text::default(),
             Node {
                 position_type: PositionType::Absolute,
-                top: Val::Px(10.0),
-                left: Val::Px(10.0),
+                top: Val::Px(12.0),
+                left: Val::Px(12.0),
                 ..default()
             },
         ))

From 3b8a581447b18c4a02d4c13f0d9f9c488fd0c6a7 Mon Sep 17 00:00:00 2001
From: Rob Parrett <robparrett@gmail.com>
Date: Thu, 26 Dec 2024 11:45:21 -0700
Subject: [PATCH 5/5] Better fix for morph text panic

---
 .../tools/scene_viewer/morph_viewer_plugin.rs | 29 +++++--------------
 1 file changed, 8 insertions(+), 21 deletions(-)

diff --git a/examples/tools/scene_viewer/morph_viewer_plugin.rs b/examples/tools/scene_viewer/morph_viewer_plugin.rs
index 63ace772c9171..441e6881a61d6 100644
--- a/examples/tools/scene_viewer/morph_viewer_plugin.rs
+++ b/examples/tools/scene_viewer/morph_viewer_plugin.rs
@@ -124,8 +124,8 @@ impl fmt::Display for Target {
     }
 }
 impl Target {
-    fn text_span(&self, key: &str, style: TextFont) -> (String, TextFont) {
-        (format!("[{key}] {self}\n"), style)
+    fn text_span(&self, key: &str, style: TextFont) -> (TextSpan, TextFont) {
+        (TextSpan::new(format!("[{key}] {self}\n")), style)
     }
     fn new(
         entity_name: Option<&Name>,
@@ -179,7 +179,6 @@ impl MorphKey {
     }
 }
 fn update_text(
-    mut commands: Commands,
     controls: Option<ResMut<WeightsControl>>,
     texts: Query<Entity, With<Text>>,
     morphs: Query<&MorphWeights>,
@@ -205,20 +204,7 @@ fn update_text(
         }
         let key_name = &AVAILABLE_KEYS[i].name;
 
-        if let Some(mut val) = writer.get_text(text, i + 3) {
-            *val = format!("[{key_name}] {target}\n");
-        } else {
-            let new_span = commands
-                .spawn((
-                    TextSpan::new(format!("[{key_name}] {target}\n")),
-                    TextFont {
-                        font_size: FONT_SIZE,
-                        ..default()
-                    },
-                ))
-                .id();
-            commands.entity(text).add_child(new_span);
-        }
+        *writer.text(text, i + 3) = format!("[{key_name}] {target}\n");
     }
 }
 fn update_morphs(
@@ -280,8 +266,8 @@ fn detect_morphs(
         ..default()
     };
     let mut spans = vec![
-        ("Morph Target Controls\n".into(), style.clone()),
-        ("---------------\n".into(), style.clone()),
+        (TextSpan::new("Morph Target Controls\n"), style.clone()),
+        (TextSpan::new("---------------\n"), style.clone()),
     ];
     let target_to_text =
         |(i, target): (usize, &Target)| target.text_span(AVAILABLE_KEYS[i].name, style.clone());
@@ -298,8 +284,9 @@ fn detect_morphs(
             },
         ))
         .with_children(|p| {
-            p.spawn((TextSpan::new("Morph Target Controls\n"), style.clone()));
-            p.spawn((TextSpan::new("---------------\n"), style));
+            for span in spans {
+                p.spawn(span);
+            }
         });
 }