Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix mesh2d_manual example #15862

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+3 −4
Open

fix mesh2d_manual example #15862

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6c4476c
fix mesh2d_manual example
awtterpip Oct 12, 2024
32d96fd
Remove redundant comment
alice-i-cecile Oct 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions examples/2d/mesh2d_manual.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ impl SpecializedRenderPipeline for ColoredMesh2dPipeline {
// Position
VertexFormat::Float32x3,
// Color
VertexFormat::Uint32,
VertexFormat::Float32x4,
];

let vertex_layout =
Expand Down Expand Up @@ -246,7 +246,7 @@ const COLORED_MESH2D_SHADER: &str = r"
struct Vertex {
@builtin(instance_index) instance_index: u32,
@location(0) position: vec3<f32>,
@location(1) color: u32,
@location(1) color: vec4<f32>,
};

struct VertexOutput {
Expand All @@ -263,8 +263,7 @@ fn vertex(vertex: Vertex) -> VertexOutput {
// Project the world position of the mesh into screen position
let model = mesh2d_functions::get_world_from_local(vertex.instance_index);
out.clip_position = mesh2d_functions::mesh2d_position_local_to_clip(model, vec4<f32>(vertex.position, 1.0));
// Unpack the `u32` from the vertex buffer into the `vec4<f32>` used by the fragment shader
out.color = vec4<f32>((vec4<u32>(vertex.color) >> vec4<u32>(0u, 8u, 16u, 24u)) & vec4<u32>(255u)) / 255.0;
out.color = vertex.color;
return out;
}

Expand Down