Some cleanup. Allow entity index == 0.

Signed-off-by: Torstein Grindvik <torstein.grindvik@nordicsemi.no>
bevyengine · Jan 12, 2023 · d1f675a · d1f675a
1 parent 323e1e4
commit d1f675a
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 62 deletions.
diff --git a/PR-TODO.md b/PR-TODO.md
diff --git a/crates/bevy_render/src/picking/mod.rs b/crates/bevy_render/src/picking/mod.rs
@@ -144,55 +144,19 @@ impl Picking {
                         as u16
                 };
 
-                // DEBUG: Upper bytes are marked, let's clear that
-                let mut upper_12: [u8; 2] = bytes[4..6].try_into().unwrap();
-                upper_12[1] &= 0b00001111;
-                // DEBUG END
-
-                // let u16_lower: u16 =
-                //     half::f16::from_le_bytes(bytes[0..2].try_into().unwrap()).to_f32() as u16;
                 let u16_lower_8 = f16_to_u16(bytes, 0);
                 let u16_mid_12 = f16_to_u16(bytes, 2);
-                // let u16_upper_12 = f16_to_u16(bytes, 4);
-                let u16_upper_12 = f16_to_u16(&upper_12, 0);
-
-                // let alpha_le = [0x00, 0x00, bytes[6], bytes[7]];
-                // let alpha = f32::from_le_bytes(alpha_le);
-
-                // let r_le = [bytes[0], bytes[1]];
-                // let g_le = [bytes[2], bytes[3]];
-                // let r = u16::from_le_bytes(r_le);
-                // let g1 = u16::from_le_bytes(g_le);
-                // let g2 = u16::from_be_bytes(g_le);
-
-                // bevy_log::info!("Alpha: {}, r: {}, g: {}", alpha, r, g);
-                // bevy_log::info!(
-                //     "Bytes: {:?}, r: {r}, g1: {g1}, g2: {g2}, alpha: {alpha}",
-                //     bytes
-                // );
-
-                // bevy_log::info!("Entity index: {entity_index}");
-
-                // None
-
-                // u32::from_le_bytes(
-                //     bytes
-                //         .try_into()
-                //         .expect("Should be able to make u32 (entity index) out of 4 bytes"),
-                // )
+                let u16_upper_12 = f16_to_u16(bytes, 4);
 
                 u16_lower_8 as u32 | ((u16_mid_12 as u32) << 8) | ((u16_upper_12 as u32) << 20)
             },
         );
 
-        if entity_index == 0 {
+        if entity_index == u32::MAX {
             None
         } else {
             Some(Entity::from_raw(entity_index))
         }
-
-        // Some(Entity::from_raw(entity_index))
-        // None
     }
 
     /// Get the depth at the given coordinate.
@@ -285,7 +249,11 @@ pub struct PickingTextures {
 
 impl PickingTextures {
     pub fn clear_color() -> wgpu::Color {
-        Color::BLACK.into()
+        // An entity index is u32. The picking buffer needs to have a value which indicates
+        // that there is no entity at the given pixel.
+        // It is more likely that a user sees an entity with index 0 than with index u32::MAX,
+        // so make u32::MAX the default value (i.e. no entity) value.
+        Color::rgba_u8(0xFF, 0xFF, 0xFF, 0xFF).into()
     }
 
     /// Retrieve this target's color attachment. This will use [`Self::sampled`] and resolve to [`Self::main`] if

diff --git a/crates/bevy_sprite/src/mesh2d/color_material.wgsl b/crates/bevy_sprite/src/mesh2d/color_material.wgsl
@@ -1,7 +1,9 @@
 #import bevy_sprite::mesh2d_types
 #import bevy_sprite::mesh2d_view_bindings
 
-// TODO: Fix this one
+#ifdef PICKING
+#import bevy_core_pipeline::picking
+#endif
 
 struct ColorMaterial {
     color: vec4<f32>,
@@ -27,7 +29,7 @@ struct FragmentInput {
 struct FragmentOutput {
     @location(0) color: vec4<f32>,
 #ifdef PICKING
-    @location(1) picking: u32,
+    @location(1) picking: vec4<f32>,
 #endif
 }
 
@@ -46,7 +48,7 @@ fn fragment(in: FragmentInput) -> FragmentOutput {
     out.color = output_color;
 
 #ifdef PICKING
-    out.picking = mesh.entity_index;
+    out.picking = vec4(entity_index_to_vec3_f32(mesh.entity_index), picking_alpha(output_color.a));
 #endif
 
     return out;

diff --git a/examples/3d/split_screen.rs b/examples/3d/split_screen.rs
@@ -25,11 +25,14 @@ fn setup(
     mut materials: ResMut<Assets<StandardMaterial>>,
 ) {
     // plane
-    commands.spawn(PbrBundle {
-        mesh: meshes.add(Mesh::from(shape::Plane { size: 100.0 })),
-        material: materials.add(Color::rgb(0.3, 0.5, 0.3).into()),
-        ..default()
-    });
+    dbg!(commands
+        .spawn(PbrBundle {
+            mesh: meshes.add(Mesh::from(shape::Plane { size: 100.0 })),
+            material: materials.add(Color::rgb(0.3, 0.5, 0.3).into()),
+            ..default()
+        })
+        .id()
+        .index());
 
     commands.spawn(SceneBundle {
         scene: asset_server.load("models/animated/Fox.glb#Scene0"),