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

[Merged by Bors] - Sprites - keep color as 4 f32 #4361

Closed
wants to merge 1 commit into from
Closed

[Merged by Bors] - Sprites - keep color as 4 f32 #4361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 3 additions & 6 deletions crates/bevy_sprite/src/render/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ impl SpecializedRenderPipeline for SpritePipeline {

if key.contains(SpritePipelineKey::COLORED) {
// color
formats.push(VertexFormat::Uint32);
formats.push(VertexFormat::Float32x4);
}

let vertex_layout =
Expand Down Expand Up @@ -283,7 +283,7 @@ struct SpriteVertex {
struct ColoredSpriteVertex {
pub position: [f32; 3],
pub uv: [f32; 2],
pub color: u32,
pub color: [f32; 4],
}

pub struct SpriteMeta {
Expand Down Expand Up @@ -498,14 +498,11 @@ pub fn queue_sprites(

// Store the vertex data and add the item to the render phase
if current_batch.colored {
// encode color as a single u32 to save space
let color = extracted_sprite.color.as_linear_rgba_u32();

for i in QUAD_INDICES.iter() {
sprite_meta.colored_vertices.push(ColoredSpriteVertex {
position: positions[*i],
uv: uvs[*i].into(),
color,
color: extracted_sprite.color.as_linear_rgba_f32(),
});
}
let item_start = colored_index;
Expand Down
4 changes: 2 additions & 2 deletions crates/bevy_sprite/src/render/sprite.wgsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@ fn vertex(
[[location(0)]] vertex_position: vec3<f32>,
[[location(1)]] vertex_uv: vec2<f32>,
#ifdef COLORED
[[location(2)]] vertex_color: u32,
[[location(2)]] vertex_color: vec4<f32>,
#endif
) -> VertexOutput {
var out: VertexOutput;
out.uv = vertex_uv;
out.position = view.view_proj * vec4<f32>(vertex_position, 1.0);
#ifdef COLORED
out.color = vec4<f32>((vec4<u32>(vertex_color) >> vec4<u32>(0u, 8u, 16u, 24u)) & vec4<u32>(255u)) / 255.0;
out.color = vertex_color;
#endif
return out;
}
Expand Down