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

Fix draw callback for main/properties views

Browse source 
Drawing position wasn't being calculated correctly, viewport/ortho
should have been used instead.  It would cause items to render out of
position on the main viewport (though not on the actual output)
This commit is contained in:
jp9000 2014-04-22 11:24:05 -07:00
commit 9edde0b892
2 changed files with 30 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

21
obs/window-basic-main.cpp
View file

@ -406,11 +406,24 @@ void OBSBasic::ChannelChanged(void *data, calldata_t params)
void OBSBasic::RenderMain(void *data, uint32_t cx, uint32_t cy)
{
OBSBasic *window = static_cast<OBSBasic*>(data);
gs_matrix_push();
gs_matrix_scale3f(window->previewScale, window->previewScale, 1.0f);
gs_matrix_translate3f(-window->previewX, -window->previewY, 0.0f);
obs_video_info ovi;
int newCX, newCY;
obs_get_video_info(&ovi);
newCX = int(window->previewScale * float(ovi.base_width));
newCY = int(window->previewScale * float(ovi.base_height));
gs_viewport_push();
gs_projection_push();
gs_ortho(0.0f, float(ovi.base_width), 0.0f, float(ovi.base_height),
-100.0f, 100.0f);
gs_setviewport(window->previewX, window->previewY, newCX, newCY);
obs_render_main_view();
gs_matrix_pop();
gs_projection_pop();
gs_viewport_pop();
UNUSED_PARAMETER(cx);
UNUSED_PARAMETER(cy);