diff --git a/libobs/obs-scene.c b/libobs/obs-scene.c index f2feaa01a..c335ed001 100644 --- a/libobs/obs-scene.c +++ b/libobs/obs-scene.c @@ -228,11 +228,14 @@ static void update_item_transform(struct obs_scene_item *item) uint32_t height = obs_source_getheight(item->source); uint32_t cx = width; uint32_t cy = height; - struct vec2 base_origin = {0.0f, 0.0f}; - struct vec2 origin = {0.0f, 0.0f}; + struct vec2 base_origin; + struct vec2 origin; struct vec2 scale = item->scale; struct calldata params = {0}; + vec2_zero(&base_origin); + vec2_zero(&origin); + /* ----------------------- */ if (item->bounds_type != OBS_BOUNDS_NONE) { diff --git a/obs/window-basic-main.cpp b/obs/window-basic-main.cpp index 75b072ba9..cab17394d 100644 --- a/obs/window-basic-main.cpp +++ b/obs/window-basic-main.cpp @@ -1791,19 +1791,23 @@ static bool MultiplySelectedItemScale(obs_scene_t scene, obs_sceneitem_t item, obs_sceneitem_setscale(item, &scale); SetItemTL(item, tl); + + UNUSED_PARAMETER(scene); return true; } void OBSBasic::on_actionFlipHorizontal_triggered() { - vec2 scale = {-1.0f, 1.0f}; + vec2 scale; + vec2_set(&scale, -1.0f, 1.0f); obs_scene_enum_items(GetCurrentScene(), MultiplySelectedItemScale, &scale); } void OBSBasic::on_actionFlipVertical_triggered() { - vec2 scale = {1.0f, -1.0f}; + vec2 scale; + vec2_set(&scale, 1.0f, -1.0f); obs_scene_enum_items(GetCurrentScene(), MultiplySelectedItemScale, &scale); } diff --git a/obs/window-basic-preview.cpp b/obs/window-basic-preview.cpp index ea680db22..58183be00 100644 --- a/obs/window-basic-preview.cpp +++ b/obs/window-basic-preview.cpp @@ -23,10 +23,10 @@ OBSBasicPreview::OBSBasicPreview(QWidget *parent, Qt::WindowFlags flags) vec2 OBSBasicPreview::GetMouseEventPos(QMouseEvent *event) { OBSBasic *main = reinterpret_cast(App()->GetMainWindow()); - vec2 pos = { + vec2 pos; + vec2_set(&pos, (float(event->x()) - main->previewX) / main->previewScale, - (float(event->y()) - main->previewY) / main->previewScale - }; + (float(event->y()) - main->previewY) / main->previewScale); return pos; } @@ -47,7 +47,9 @@ static bool FindItemAtPos(obs_scene_t scene, obs_sceneitem_t item, void *param) SceneFindData *data = reinterpret_cast(param); matrix4 transform; vec3 transformedPos; - vec3 pos3 = {data->pos.x, data->pos.y, 0.0f}; + vec3 pos3; + + vec3_set(&pos3, data->pos.x, data->pos.y, 0.0f); obs_sceneitem_get_box_transform(item, &transform); @@ -91,7 +93,8 @@ static vec3 GetTransformedPosScaled(float x, float y, const matrix4 &mat, static inline vec2 GetOBSScreenSize() { obs_video_info ovi; - vec2 size = {0.0f, 0.0f}; + vec2 size; + vec2_zero(&size); if (obs_get_video_info(&ovi)) { size.x = float(ovi.base_width); @@ -145,7 +148,9 @@ static bool CheckItemSelected(obs_scene_t scene, obs_sceneitem_t item, SceneFindData *data = reinterpret_cast(param); matrix4 transform; vec3 transformedPos; - vec3 pos3 = {data->pos.x, data->pos.y, 0.0f}; + vec3 pos3; + + vec3_set(&pos3, data->pos.x, data->pos.y, 0.0f); obs_sceneitem_get_box_transform(item, &transform); @@ -198,9 +203,11 @@ static bool FindHandleAtPos(obs_scene_t scene, obs_sceneitem_t item, HandleFindData *data = reinterpret_cast(param); matrix4 transform; - vec3 pos3 = {data->pos.x, data->pos.y, 0.0f}; + vec3 pos3; float closestHandle = HANDLE_SEL_RADIUS; + vec3_set(&pos3, data->pos.x, data->pos.y, 0.0f); + obs_sceneitem_get_box_transform(item, &transform); auto TestHandle = [&] (float x, float y, ItemHandle handle) @@ -581,12 +588,14 @@ void OBSBasicPreview::StretchItem(const vec2 &pos) SnapStretchingToScreen(tl, br); obs_source_t source = obs_sceneitem_getsource(stretchItem); - vec2 baseSize = { - float(obs_source_getwidth(source)), - float(obs_source_getheight(source)) - }; - vec2 size = {br.x - tl.x, br.y - tl.y}; + vec2 baseSize; + vec2_set(&baseSize, + float(obs_source_getwidth(source)), + float(obs_source_getheight(source))); + + vec2 size; + vec2_set(&size,br. x - tl.x, br.y - tl.y); if (boundsType != OBS_BOUNDS_NONE) { if (boundsType == OBS_BOUNDS_STRETCH && !shiftDown) @@ -608,11 +617,9 @@ void OBSBasicPreview::StretchItem(const vec2 &pos) pos3 = CalculateStretchPos(tl, br); vec3_transform(&pos3, &pos3, &itemToScreen); - vec2 newPos = {pos3.x, pos3.y}; - - newPos.x = std::round(newPos.x); - newPos.y = std::round(newPos.y); + vec2 newPos; + vec2_set(&newPos, std::round(pos3.x), std::round(pos3.y)); obs_sceneitem_setpos(stretchItem, &newPos); } @@ -659,7 +666,6 @@ bool OBSBasicPreview::DrawSelectedItem(obs_scene_t scene, obs_sceneitem_t item, if (!obs_sceneitem_selected(item)) return true; - OBSBasicPreview *preview = reinterpret_cast(param); OBSBasic *main = reinterpret_cast(App()->GetMainWindow()); gs_load_vertexbuffer(main->circle); @@ -689,6 +695,7 @@ bool OBSBasicPreview::DrawSelectedItem(obs_scene_t scene, obs_sceneitem_t item, gs_matrix_pop(); UNUSED_PARAMETER(scene); + UNUSED_PARAMETER(param); return true; } diff --git a/obs/window-basic-transform.cpp b/obs/window-basic-transform.cpp index 013f66d30..998d2fe2a 100644 --- a/obs/window-basic-transform.cpp +++ b/obs/window-basic-transform.cpp @@ -14,6 +14,7 @@ static OBSSceneItem FindASelectedItem(OBSScene scene) return false; } + UNUSED_PARAMETER(scene); return true; };