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

Fix mesh.wgsl error for meshes without normals (#6439)

Browse Source 
# Objective
Split `model` assignment out of `#ifdef VERTEX_NORMALS`.
Remove outdated code/comments talking about required mesh attributes. 

Co-authored-by: devil-ira <justthecooldude@gmail.com>
This commit is contained in:
ira 2022-11-03 12:38:47 +00:00
parent 701ed8c59f
commit 262b3fc40d
3 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
crates/bevy_pbr/src/render/mesh.wgsl
View File

@ -35,12 +35,16 @@ struct VertexOutput {
fn vertex(vertex: Vertex) -> VertexOutput { fn vertex(vertex: Vertex) -> VertexOutput {
var out: VertexOutput; var out: VertexOutput;
#ifdef VERTEX_NORMALS
#ifdef SKINNED #ifdef SKINNED
var model = skin_model(vertex.joint_indices, vertex.joint_weights); var model = skin_model(vertex.joint_indices, vertex.joint_weights);
out.world_normal = skin_normals(model, vertex.normal);
#else #else
var model = mesh.model; var model = mesh.model;
#endif
#ifdef VERTEX_NORMALS
#ifdef SKINNED
out.world_normal = skin_normals(model, vertex.normal);
#else
out.world_normal = mesh_normal_local_to_world(vertex.normal); out.world_normal = mesh_normal_local_to_world(vertex.normal);
#endif #endif
#endif #endif

9
examples/3d/lines.rs
View File

@ -95,12 +95,9 @@ pub struct LineList {
impl From<LineList> for Mesh { impl From<LineList> for Mesh {
fn from(line: LineList) -> Self { fn from(line: LineList) -> Self {
let mut vertices = vec![]; let mut vertices = vec![];
let mut normals = vec![];
for (start, end) in line.lines { for (start, end) in line.lines {
vertices.push(start.to_array()); vertices.push(start.to_array());
vertices.push(end.to_array()); vertices.push(end.to_array());
normals.push(Vec3::ZERO.to_array());
normals.push(Vec3::ZERO.to_array());
} }
// This tells wgpu that the positions are list of lines // This tells wgpu that the positions are list of lines
@ -108,8 +105,6 @@ impl From<LineList> for Mesh {
let mut mesh = Mesh::new(PrimitiveTopology::LineList); let mut mesh = Mesh::new(PrimitiveTopology::LineList);
mesh.insert_attribute(Mesh::ATTRIBUTE_POSITION, vertices); mesh.insert_attribute(Mesh::ATTRIBUTE_POSITION, vertices);
// Normals are currently required by bevy, but they aren't used by the [`LineMaterial`]
mesh.insert_attribute(Mesh::ATTRIBUTE_NORMAL, normals);
mesh mesh
} }
} }
@ -123,10 +118,8 @@ pub struct LineStrip {
impl From<LineStrip> for Mesh { impl From<LineStrip> for Mesh {
fn from(line: LineStrip) -> Self { fn from(line: LineStrip) -> Self {
let mut vertices = vec![]; let mut vertices = vec![];
let mut normals = vec![];
for pos in line.points { for pos in line.points {
vertices.push(pos.to_array()); vertices.push(pos.to_array());
normals.push(Vec3::ZERO.to_array());
} }
// This tells wgpu that the positions are a list of points // This tells wgpu that the positions are a list of points
@ -134,8 +127,6 @@ impl From<LineStrip> for Mesh {
let mut mesh = Mesh::new(PrimitiveTopology::LineStrip); let mut mesh = Mesh::new(PrimitiveTopology::LineStrip);
mesh.insert_attribute(Mesh::ATTRIBUTE_POSITION, vertices); mesh.insert_attribute(Mesh::ATTRIBUTE_POSITION, vertices);
// Normals are currently required by bevy, but they aren't used by the [`LineMaterial`]
mesh.insert_attribute(Mesh::ATTRIBUTE_NORMAL, normals);
mesh mesh
} }
} }

3
examples/animation/custom_skinned_mesh.rs
View File

@ -71,9 +71,6 @@ fn setup(
); );
// Set mesh vertex normals // Set mesh vertex normals
mesh.insert_attribute(Mesh::ATTRIBUTE_NORMAL, vec![[0.0, 0.0, 1.0]; 10]); mesh.insert_attribute(Mesh::ATTRIBUTE_NORMAL, vec![[0.0, 0.0, 1.0]; 10]);
// Set mesh vertex UVs. Although the mesh doesn't have any texture applied,
// UVs are still required by the render pipeline. So these UVs are zeroed out.
mesh.insert_attribute(Mesh::ATTRIBUTE_UV_0, vec![[0.0, 0.0]; 10]);
// Set mesh vertex joint indices for mesh skinning. // Set mesh vertex joint indices for mesh skinning.
// Each vertex gets 4 indices used to address the `JointTransforms` array in the vertex shader // Each vertex gets 4 indices used to address the `JointTransforms` array in the vertex shader
// as well as `SkinnedMeshJoint` array in the `SkinnedMesh` component. // as well as `SkinnedMeshJoint` array in the `SkinnedMesh` component.