griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix #123016: inconsistent VSE timeline strip pixel grid rounding

Browse Source 
Previous commit that made VSE strip controls not be blurry (91fa37fecb)
applied "snap to pixel grid" in a wrong place - the rectangle corners
should be snapped, not the center and half-size of it.

Pull Request: https://projects.blender.org/blender/blender/pulls/123065
This commit is contained in:
Aras Pranckevicius
2024-06-11 18:12:32 +02:00
committed by Aras Pranckevicius
parent 188b6fd3d0
commit c38951d0f5
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
source/blender/gpu/shaders/gpu_shader_sequencer_strips_frag.glsl
View File

@@ -40,16 +40,18 @@ void main()
vec2 co = co_interp;
SeqStripDrawData strip = strip_data[strip_id];
vec2 size = vec2(strip.right_handle - strip.left_handle, strip.top - strip.bottom) * 0.5;
vec2 center = vec2(strip.right_handle + strip.left_handle, strip.top + strip.bottom) * 0.5;
/* Transform strip rectangle into pixel coordinates, so that
* rounded corners have proper aspect ratio and can be expressed in pixels.
* Make sure strip right side does not include the last pixel.
* Also snap to pixel grid coordinates, so that outline/border is clear
* non-fractional pixel sizes. */
vec2 view_to_pixel = vec2(context_data.inv_pixelx, context_data.inv_pixely);
size = round(size * view_to_pixel);
center = round(center * view_to_pixel);
vec2 pos1 = round(vec2(strip.left_handle, strip.bottom) * view_to_pixel);
vec2 pos2 = round(vec2(strip.right_handle, strip.top) * view_to_pixel);
pos2.x -= 1.0;
vec2 size = (pos2 - pos1) * 0.5;
vec2 center = (pos1 + pos2) * 0.5;
vec2 pos = round(co * view_to_pixel);
float radius = context_data.round_radius;
@@ -128,10 +130,11 @@ void main()
/* Handles. */
if ((strip.flags & GPU_SEQ_FLAG_HANDLES) != 0) {
if (co.x >= strip.left_handle && co.x < strip.left_handle + strip.handle_width) {
float handle_width = strip.handle_width * view_to_pixel.x;
if (pos.x >= pos1.x && pos.x < pos1.x + handle_width) {
col = blend_color(col, unpackUnorm4x8(strip.col_handle_left));
}
if (co.x > strip.right_handle - strip.handle_width && co.x <= strip.right_handle) {
if (pos.x > pos2.x - handle_width && pos.x <= pos2.x) {
col = blend_color(col, unpackUnorm4x8(strip.col_handle_right));
}
}