4aiman/obs-studio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

UI: Fix spacing helpers when rotated and flipped

Browse source 
If the scene item was rotated greater than 45 degrees, and flipped
vertically or horizontally, the spacing helpers would be drawn
incorrectly. This fixes the issue by checking the scale before
the rotation, instead of after.
This commit is contained in:
cg2121 2023-03-04 00:57:58 -06:00 • committed by Jim
commit a3defd4f58
1 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

34
UI/window-basic-preview.cpp
View file

@ -2506,6 +2506,23 @@ void OBSBasicPreview::DrawSpacingHelpers()
groupOti.pos.x, groupOti.pos.y, 0.0f);
}
// Switch top/bottom or right/left if scale is negative
if (oti.scale.x < 0.0f) {
vec3 l = left;
vec3 r = right;
vec3_copy(&left, &r);
vec3_copy(&right, &l);
}
if (oti.scale.y < 0.0f) {
vec3 t = top;
vec3 b = bottom;
vec3_copy(&top, &b);
vec3_copy(&bottom, &t);
}
if (rot >= HELPER_ROT_BREAKPONT) {
for (float i = HELPER_ROT_BREAKPONT; i <= 360.0f; i += 90.0f) {
if (rot < i)
@ -2539,23 +2556,6 @@ void OBSBasicPreview::DrawSpacingHelpers()
}
}
// Switch top/bottom or right/left if scale is negative
if (oti.scale.x < 0.0f) {
vec3 l = left;
vec3 r = right;
vec3_copy(&left, &r);
vec3_copy(&right, &l);
}
if (oti.scale.y < 0.0f) {
vec3 t = top;
vec3 b = bottom;
vec3_copy(&top, &b);
vec3_copy(&bottom, &t);
}
// Get sides of box transform
left = GetTransformedPos(left.x, left.y, boxTransform);
right = GetTransformedPos(right.x, right.y, boxTransform);