Skip to content

Commit

Permalink
Sprites - keep color as 4 f32 (#4361)
Browse files Browse the repository at this point in the history
# Objective

- Fix #4356

## Solution

- Do not reduce the color of sprites to 4 u8
  • Loading branch information
mockersf committed Mar 30, 2022
1 parent 5095481 commit f6bc9a0
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 8 deletions.
9 changes: 3 additions & 6 deletions crates/bevy_sprite/src/render/mod.rs
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
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

0 comments on commit f6bc9a0

Please sign in to comment.