diff options
author | 2020-05-28 22:57:30 +0200 | |
---|---|---|
committer | 2020-05-28 22:57:30 +0200 | |
commit | e11b5c614f5bf73c137b8b4f24f56047617527eb (patch) | |
tree | b336325649c5861db2faaff190fc0fe39717e8ad | |
parent | 6de0a2c37129b735dac3c6aec461f18a0c1bcbc8 (diff) | |
download | iced-e11b5c614f5bf73c137b8b4f24f56047617527eb.tar.gz iced-e11b5c614f5bf73c137b8b4f24f56047617527eb.tar.bz2 iced-e11b5c614f5bf73c137b8b4f24f56047617527eb.zip |
Revert "Target physical pixels for quads in `iced_glow`"
This reverts commit 45511a442f707e93fe6e568d2100756b63af7362.
Diffstat (limited to '')
-rw-r--r-- | examples/tour/src/main.rs | 4 | ||||
-rw-r--r-- | glow/src/shader/quad.vert | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/examples/tour/src/main.rs b/examples/tour/src/main.rs index ffadb14f..c9678b9d 100644 --- a/examples/tour/src/main.rs +++ b/examples/tour/src/main.rs @@ -764,7 +764,7 @@ mod style { Button::Secondary => Color::from_rgb(0.5, 0.5, 0.5), })), border_radius: 12, - shadow_offset: Vector::new(0.0, 1.0), + shadow_offset: Vector::new(1.0, 1.0), text_color: Color::from_rgb8(0xEE, 0xEE, 0xEE), ..button::Style::default() } @@ -773,7 +773,7 @@ mod style { fn hovered(&self) -> button::Style { button::Style { text_color: Color::WHITE, - shadow_offset: Vector::new(0.0, 2.0), + shadow_offset: Vector::new(1.0, 2.0), ..self.active() } } diff --git a/glow/src/shader/quad.vert b/glow/src/shader/quad.vert index ce816550..d37b5c8d 100644 --- a/glow/src/shader/quad.vert +++ b/glow/src/shader/quad.vert @@ -26,14 +26,14 @@ const vec2 positions[4] = vec2[]( void main() { vec2 q_Pos = positions[gl_VertexID]; - vec2 p_Pos = floor(i_Pos * u_Scale); - vec2 p_Scale = floor(i_Scale * u_Scale); + vec2 p_Pos = i_Pos * u_Scale; + vec2 p_Scale = i_Scale * u_Scale; mat4 i_Transform = mat4( - vec4(p_Scale.x, 0.0, 0.0, 0.0), - vec4(0.0, p_Scale.y, 0.0, 0.0), + vec4(p_Scale.x + 1.0, 0.0, 0.0, 0.0), + vec4(0.0, p_Scale.y + 1.0, 0.0, 0.0), vec4(0.0, 0.0, 1.0, 0.0), - vec4(p_Pos, 0.0, 1.0) + vec4(p_Pos - vec2(0.5, 0.5), 0.0, 1.0) ); v_Color = i_Color; @@ -41,7 +41,7 @@ void main() { v_Pos = p_Pos; v_Scale = p_Scale; v_BorderRadius = i_BorderRadius * u_Scale; - v_BorderWidth = floor(i_BorderWidth * u_Scale); + v_BorderWidth = i_BorderWidth * u_Scale; gl_Position = u_Transform * i_Transform * vec4(q_Pos, 0.0, 1.0); } |