forestia/bevy
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix mesh_picking not working due to mixing vertex and triangle indices. (#18533)

Browse Source 
# Objective

- #18495 

## Solution

- The code in the PR #18232 accidentally used a vertex index as a
triangle index, causing the wrong triangle to be used for normal
computation and if the triangle went out of bounds, it would skip the
ray-hit.
- Don't do that.

## Testing

- Run `cargo run --example mesh_picking`
This commit is contained in:
IQuick 143 2025-03-25 19:27:35 +01:00 committed by GitHub
parent 70c68417f0
commit db923d6319
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
crates/bevy_picking/src/mesh_picking/ray_cast/intersections.rs
View File

@ -83,9 +83,10 @@ pub fn ray_mesh_intersection<I: TryInto<usize> + Clone + Copy>(
indices indices
.chunks_exact(3) .chunks_exact(3)
.enumerate()
.fold( .fold(
(f32::MAX, None), (f32::MAX, None),
|(closest_distance, closest_hit), triangle| { |(closest_distance, closest_hit), (tri_idx, triangle)| {
let [Ok(a), Ok(b), Ok(c)] = [ let [Ok(a), Ok(b), Ok(c)] = [
triangle[0].try_into(), triangle[0].try_into(),
triangle[1].try_into(), triangle[1].try_into(),
@ -104,7 +105,7 @@ pub fn ray_mesh_intersection<I: TryInto<usize> + Clone + Copy>(
match ray_triangle_intersection(&ray, &tri_vertices, backface_culling) { match ray_triangle_intersection(&ray, &tri_vertices, backface_culling) {
Some(hit) if hit.distance >= 0. && hit.distance < closest_distance => { Some(hit) if hit.distance >= 0. && hit.distance < closest_distance => {
(hit.distance, Some((a, hit))) (hit.distance, Some((tri_idx, hit)))
} }
_ => (closest_distance, closest_hit), _ => (closest_distance, closest_hit),
} }