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

[Merged by Bors] - UI - keep color as 4 f32 #4494

Closed
wants to merge 2 commits into from
Closed

[Merged by Bors] - UI - keep color as 4 f32 #4494

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
74a28f6
UI - keep color as 4 f32
ImDanTheDev Apr 16, 2022
0206046
Removed old comment
ImDanTheDev Apr 16, 2022
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: 2 additions & 5 deletions crates/bevy_ui/src/render/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ pub fn extract_text_uinodes(
struct UiVertex {
pub position: [f32; 3],
pub uv: [f32; 2],
pub color: u32,
pub color: [f32; 4],
}

pub struct UiMeta {
Expand Down Expand Up @@ -360,14 +360,11 @@ pub fn prepare_uinodes(
]
.map(|pos| pos / atlas_extent);

// encode color as a single u32 to save space
let color = extracted_uinode.color.as_linear_rgba_u32();

for i in QUAD_INDICES {
ui_meta.vertices.push(UiVertex {
position: positions_clipped[i].into(),
uv: uvs[i].into(),
color,
color: extracted_uinode.color.as_linear_rgba_f32(),
});
}

Expand Down
2 changes: 1 addition & 1 deletion crates/bevy_ui/src/render/pipeline.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ impl SpecializedRenderPipeline for UiPipeline {
// uv
VertexFormat::Float32x2,
// color
VertexFormat::Uint32,
VertexFormat::Float32x4,
],
);
let shader_defs = Vec::new();
Expand Down
4 changes: 2 additions & 2 deletions crates/bevy_ui/src/render/ui.wgsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ struct VertexOutput {
fn vertex(
[[location(0)]] vertex_position: vec3<f32>,
[[location(1)]] vertex_uv: vec2<f32>,
[[location(2)]] vertex_color: u32,
[[location(2)]] vertex_color: vec4<f32>,
) -> VertexOutput {
var out: VertexOutput;
out.uv = vertex_uv;
out.position = view.view_proj * vec4<f32>(vertex_position, 1.0);
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