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

UI: Fix rotation handle when source is flipped

Browse source 
The rotation handle and cursor would be drawn at the wrong spot
if the source was flipped.
This commit is contained in:
cg2121 2023-03-28 08:34:30 -05:00 committed by Jim
parent 30682e999e
commit 7475261542
1 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -395,10 +395,18 @@ static bool FindHandleAtPos(obs_scene_t *scene, obs_sceneitem_t *item,
RotatePos(&rotHandleOffset, atan2(transform.x.y, transform.x.x));
RotatePos(&rotHandleOffset, RAD(data.angleOffset));
vec3 handlePos = GetTransformedPos(0.5f, 0.0f, transform);
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;
handlePos.y -= rotHandleOffset.y;
if (scale.x < 0.0f)
handlePos.y += rotHandleOffset.y;
else
handlePos.y -= rotHandleOffset.y;
float dist = vec3_dist(&handlePos, &pos3);
if (dist < data.radius) {
@ -1740,10 +1748,10 @@ static void DrawSquareAtPos(float x, float y, float pixelRatio)
}
static void DrawRotationHandle(gs_vertbuffer_t *circle, float rot,
float pixelRatio)
float pixelRatio, bool invert)
{
struct vec3 pos;
vec3_set(&pos, 0.5f, 0.0f, 0.0f);
vec3_set(&pos, 0.5f, invert ? 1.0f : 0.0f, 0.0f);
struct matrix4 matrix;
gs_matrix_get(&matrix);
@ -2113,8 +2121,9 @@ bool OBSBasicPreview::DrawSelectedItem(obs_scene_t *scene,
prev->circleFill = gs_render_save();
}
bool invert = info.scale.y < 0.0f;
DrawRotationHandle(prev->circleFill, info.rot + prev->groupRot,
pixelRatio);
pixelRatio, invert);
}
gs_matrix_pop();