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

Fix mesh tangent attribute matching in mesh transform operations (#17992)

Browse Source 
Fixes #17170

# Objective

Tangents are not currently transformed as described in #17170. I came
across this while working on #17989 and it seemed like low hanging
fruit.
This commit is contained in:
aloucks 2025-03-07 12:39:42 -05:00 committed by GitHub
parent cc69fdd0c6
commit edba54adac
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
crates/bevy_mesh/src/mesh.rs
View File

@ -909,13 +909,16 @@ impl Mesh {
}); });
} }
if let Some(VertexAttributeValues::Float32x3(tangents)) = if let Some(VertexAttributeValues::Float32x4(tangents)) =
self.attribute_mut(Mesh::ATTRIBUTE_TANGENT) self.attribute_mut(Mesh::ATTRIBUTE_TANGENT)
{ {
// Transform tangents, taking into account non-uniform scaling and rotation // Transform tangents, taking into account non-uniform scaling and rotation
tangents.iter_mut().for_each(|tangent| { tangents.iter_mut().for_each(|tangent| {
let handedness = tangent[3];
let scaled_tangent = Vec3::from_slice(tangent) * transform.scale; let scaled_tangent = Vec3::from_slice(tangent) * transform.scale;
*tangent = (transform.rotation * scaled_tangent.normalize_or_zero()).to_array(); *tangent = (transform.rotation * scaled_tangent.normalize_or_zero())
.extend(handedness)
.to_array();
}); });
} }
} }
@ -981,12 +984,15 @@ impl Mesh {
}); });
} }
if let Some(VertexAttributeValues::Float32x3(tangents)) = if let Some(VertexAttributeValues::Float32x4(tangents)) =
self.attribute_mut(Mesh::ATTRIBUTE_TANGENT) self.attribute_mut(Mesh::ATTRIBUTE_TANGENT)
{ {
// Transform tangents // Transform tangents
tangents.iter_mut().for_each(|tangent| { tangents.iter_mut().for_each(|tangent| {
*tangent = (rotation * Vec3::from_slice(tangent).normalize_or_zero()).to_array(); let handedness = tangent[3];
*tangent = (rotation * Vec3::from_slice(tangent).normalize_or_zero())
.extend(handedness)
.to_array();
}); });
} }
} }
@ -1033,13 +1039,17 @@ impl Mesh {
}); });
} }
if let Some(VertexAttributeValues::Float32x3(tangents)) = if let Some(VertexAttributeValues::Float32x4(tangents)) =
self.attribute_mut(Mesh::ATTRIBUTE_TANGENT) self.attribute_mut(Mesh::ATTRIBUTE_TANGENT)
{ {
// Transform tangents, taking into account non-uniform scaling // Transform tangents, taking into account non-uniform scaling
tangents.iter_mut().for_each(|tangent| { tangents.iter_mut().for_each(|tangent| {
let handedness = tangent[3];
let scaled_tangent = Vec3::from_slice(tangent) * scale; let scaled_tangent = Vec3::from_slice(tangent) * scale;
*tangent = scaled_tangent.normalize_or_zero().to_array(); *tangent = scaled_tangent
.normalize_or_zero()
.extend(handedness)
.to_array();
}); });
} }
} }