OBS/obs-studio
OBS/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-07-19 09:39:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

UI: Fix rotation handle find angle

Browse source 
The angle at which the rotation handle is drawn is independant from the
sceneitem's flip. As such, this changes `FindHandleAtPos` to use the rotation
angle of the item, free of its flip, instead of doing post-rotation
corrections. This fixes a bug where when the item was horizontally flipped,
the handle was not "found" at its drawn location.
This commit is contained in:
Penwywern 2023-07-07 03:22:09 +02:00 committed by Lain
parent b12ed3008b
commit 28a48c048d
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -390,24 +390,23 @@ static bool FindHandleAtPos(obs_scene_t * /* scene */, obs_sceneitem_t *item,
TestHandle(0.5f, 1.0f, ItemHandle::BottomCenter);
TestHandle(1.0f, 1.0f, ItemHandle::BottomRight);
vec2 scale;
obs_sceneitem_get_scale(item, &scale);
vec2 rotHandleOffset;
vec2_set(&rotHandleOffset, 0.0f,
HANDLE_RADIUS * data.radius * 1.5 - data.radius);
RotatePos(&rotHandleOffset, atan2(transform.x.y, transform.x.x));
float angle =
atan2(scale.x < 0.0f ? transform.x.y * -1.0f : transform.x.y,
scale.x < 0.0f ? transform.x.x * -1.0f : transform.x.x);
RotatePos(&rotHandleOffset, angle);
RotatePos(&rotHandleOffset, RAD(data.angleOffset));
vec2 scale;
obs_sceneitem_get_scale(item, &scale);
bool invert = scale.y < 0.0f;
vec3 handlePos =
GetTransformedPos(0.5f, invert ? 1.0f : 0.0f, transform);
vec3_transform(&handlePos, &handlePos, &data.parent_xform);
handlePos.x -= rotHandleOffset.x;
if (scale.x < 0.0f)
handlePos.y += rotHandleOffset.y;
else
handlePos.y -= rotHandleOffset.y;
handlePos.y -= rotHandleOffset.y;
float dist = vec3_dist(&handlePos, &pos3);
if (dist < data.radius) {