diff options
| author |  Robert Krahn <robert.krahn@gmail.com> | 2022-11-03 00:35:01 +0100 |
|---|---|---|
| committer | Robert Krahn <robert.krahn@gmail.com> | 2022-11-03 22:48:26 +0100 |
| commit | c0596179bd8582e4f4b5289cdeee8de4fa3de464 (patch) | |
| tree | b1ed80cf49aa846ba7a93cc97128c3ec6eadd123 /glow/src/quad | |
| parent | d222b5c8b0befab665c20ba0112b28199df0ae44 (diff) | |
| download | iced-c0596179bd8582e4f4b5289cdeee8de4fa3de464.tar.gz iced-c0596179bd8582e4f4b5289cdeee8de4fa3de464.tar.bz2 iced-c0596179bd8582e4f4b5289cdeee8de4fa3de464.zip | |
non uniform border radius for quads
Diffstat (limited to 'glow/src/quad')
| -rw-r--r-- | glow/src/quad/compatibility.rs | 10 | ||||
| -rw-r--r-- | glow/src/quad/core.rs | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/glow/src/quad/compatibility.rs b/glow/src/quad/compatibility.rs index 28a5ea7c..5734c159 100644 --- a/glow/src/quad/compatibility.rs +++ b/glow/src/quad/compatibility.rs @@ -254,7 +254,7 @@ unsafe fn create_buffers( gl.enable_vertex_attrib_array(4); gl.vertex_attrib_pointer_f32( 4, - 1, + 4, glow::FLOAT, false, stride, @@ -268,7 +268,7 @@ unsafe fn create_buffers( glow::FLOAT, false, stride, - 4 * (2 + 2 + 4 + 4 + 1), + 4 * (2 + 2 + 4 + 4 + 4), ); gl.enable_vertex_attrib_array(6); @@ -278,7 +278,7 @@ unsafe fn create_buffers( glow::FLOAT, false, stride, - 4 * (2 + 2 + 4 + 4 + 1 + 1), + 4 * (2 + 2 + 4 + 4 + 4 + 1), ); gl.bind_vertex_array(None); @@ -307,7 +307,7 @@ pub struct Vertex { pub border_color: [f32; 4], /// The border radius of the [`Vertex`]. - pub border_radius: f32, + pub border_radius: [f32; 4], /// The border width of the [`Vertex`]. pub border_width: f32, @@ -325,7 +325,7 @@ impl Vertex { size: quad.size, color: quad.color, border_color: quad.color, - border_radius: quad.border_radius, + border_radius: [quad.border_radius[0]; 4], border_width: quad.border_width, q_position: [0.0, 0.0], }; diff --git a/glow/src/quad/core.rs b/glow/src/quad/core.rs index 16bec385..89036530 100644 --- a/glow/src/quad/core.rs +++ b/glow/src/quad/core.rs @@ -218,7 +218,7 @@ unsafe fn create_instance_buffer( gl.enable_vertex_attrib_array(4); gl.vertex_attrib_pointer_f32( 4, - 1, + 4, glow::FLOAT, false, stride, @@ -233,7 +233,7 @@ unsafe fn create_instance_buffer( glow::FLOAT, false, stride, - 4 * (2 + 2 + 4 + 4 + 1), + 4 * (2 + 2 + 4 + 4 + 4), ); gl.vertex_attrib_divisor(5, 1); |