jp9000
/
obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UI: Fix bug grabbing handles of group sub-items 

When a group's transform was scaled down, that scale would not apply to
grabbing the handles of sub-items, so the "handle radius" would
incorrectly be miscalculated (the handle radius calculation for the
sub-item would be scaled down by the parent's scaling, making it too
small to grab).  Instead of calculating relative to the current parent,
this fixes the issue by operating in screen space at all times.
master
jp9000 2018-08-16 04:44:40 -07:00
parent 2541be5b11
commit b5022385d1
1 changed files with 35 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
UI/window-basic-preview.cpp
View File

@ -113,16 +113,6 @@ static vec3 GetTransformedPos(float x, float y, const matrix4 &mat)
return result; return result;
} }
static vec3 GetTransformedPosScaled(float x, float y, const matrix4 &mat,
float scale)
{
vec3 result;
vec3_set(&result, x, y, 0.0f);
vec3_transform(&result, &result, &mat);
vec3_mulf(&result, &result, scale);
return result;
}
static inline vec2 GetOBSScreenSize() static inline vec2 GetOBSScreenSize()
{ {
obs_video_info ovi; obs_video_info ovi;
@ -265,8 +255,9 @@ bool OBSBasicPreview::SelectedAtPos(const vec2 &pos)
} }
struct HandleFindData { struct HandleFindData {
const vec2 &pos; const vec2 &pos;
const float scale; const float radius;
matrix4 parent_xform;
OBSSceneItem item; OBSSceneItem item;
ItemHandle handle = ItemHandle::None; ItemHandle handle = ItemHandle::None;
@ -276,39 +267,36 @@ struct HandleFindData {
HandleFindData& operator=(const HandleFindData &) = delete; HandleFindData& operator=(const HandleFindData &) = delete;
HandleFindData& operator=(HandleFindData &&) = delete; HandleFindData& operator=(HandleFindData &&) = delete;
inline HandleFindData(const vec2 &pos_, float scale_) inline HandleFindData(const vec2 &pos_, float scale)
: pos (pos_), : pos (pos_),
scale (scale_) radius (HANDLE_SEL_RADIUS / scale)
{} {
matrix4_identity(&parent_xform);
}
inline HandleFindData(const HandleFindData &hfd,
obs_sceneitem_t *parent)
: pos (hfd.pos),
radius (hfd.radius),
item (hfd.item),
handle (hfd.handle)
{
obs_sceneitem_get_draw_transform(parent, &parent_xform);
}
}; };
static bool FindHandleAtPos(obs_scene_t *scene, obs_sceneitem_t *item, static bool FindHandleAtPos(obs_scene_t *scene, obs_sceneitem_t *item,
void *param) void *param)
{ {
HandleFindData *data = reinterpret_cast<HandleFindData*>(param); HandleFindData &data = *reinterpret_cast<HandleFindData*>(param);
if (!obs_sceneitem_selected(item)) { if (!obs_sceneitem_selected(item)) {
if (obs_sceneitem_is_group(item)) { if (obs_sceneitem_is_group(item)) {
matrix4 transform; HandleFindData newData(data, item);
vec3 new_pos3;
vec3_set(&new_pos3, data->pos.x, data->pos.y, 0.0f);
vec3_divf(&new_pos3, &new_pos3, data->scale);
obs_sceneitem_get_draw_transform(item, &transform);
matrix4_inv(&transform, &transform);
vec3_transform(&new_pos3, &new_pos3, &transform);
vec2 new_pos;
vec2_set(&new_pos, new_pos3.x, new_pos3.y);
HandleFindData findData(new_pos, 1.0f);
findData.item = data->item;
findData.handle = data->handle;
obs_sceneitem_group_enum_items(item, FindHandleAtPos, obs_sceneitem_group_enum_items(item, FindHandleAtPos,
&findData); &newData);
data.item = newData.item;
data->item = findData.item; data.handle = newData.handle;
data->handle = findData.handle;
} }
return true; return true;
@ -316,23 +304,23 @@ static bool FindHandleAtPos(obs_scene_t *scene, obs_sceneitem_t *item,
matrix4 transform; matrix4 transform;
vec3 pos3; vec3 pos3;
float closestHandle = HANDLE_SEL_RADIUS; float closestHandle = data.radius;
vec3_set(&pos3, data->pos.x, data->pos.y, 0.0f); vec3_set(&pos3, data.pos.x, data.pos.y, 0.0f);
obs_sceneitem_get_box_transform(item, &transform); obs_sceneitem_get_box_transform(item, &transform);
auto TestHandle = [&] (float x, float y, ItemHandle handle) auto TestHandle = [&] (float x, float y, ItemHandle handle)
{ {
vec3 handlePos = GetTransformedPosScaled(x, y, transform, vec3 handlePos = GetTransformedPos(x, y, transform);
data->scale); vec3_transform(&handlePos, &handlePos, &data.parent_xform);
float dist = vec3_dist(&handlePos, &pos3); float dist = vec3_dist(&handlePos, &pos3);
if (dist < HANDLE_SEL_RADIUS) { if (dist < data.radius) {
if (dist < closestHandle) { if (dist < closestHandle) {
closestHandle = dist; closestHandle = dist;
data->handle = handle; data.handle = handle;
data->item = item; data.item = item;
} }
} }
}; };
@ -381,7 +369,10 @@ void OBSBasicPreview::GetStretchHandleData(const vec2 &pos)
if (!scene) if (!scene)
return; return;
HandleFindData data(pos, main->previewScale / main->devicePixelRatio()); float scale = main->previewScale / main->devicePixelRatio();
vec2 scaled_pos = pos;
vec2_divf(&scaled_pos, &scaled_pos, scale);
HandleFindData data(scaled_pos, scale);
obs_scene_enum_items(scene, FindHandleAtPos, &data); obs_scene_enum_items(scene, FindHandleAtPos, &data);
stretchItem = std::move(data.item); stretchItem = std::move(data.item);