UI: Add option to draw safe areas in preview
This commit is contained in:
parent
1b29bfc884
commit
afd58a78e5
7 changed files with 165 additions and 92 deletions
|
|
@ -70,58 +70,9 @@ OBSProjector::OBSProjector(QWidget *widget, obs_source_t *source_, int monitor,
|
|||
&OBSProjector::ScreenRemoved);
|
||||
|
||||
if (type == ProjectorType::Multiview) {
|
||||
obs_enter_graphics();
|
||||
|
||||
// All essential action should be placed inside this area
|
||||
gs_render_start(true);
|
||||
gs_vertex2f(actionSafePercentage, actionSafePercentage);
|
||||
gs_vertex2f(actionSafePercentage, 1 - actionSafePercentage);
|
||||
gs_vertex2f(1 - actionSafePercentage, 1 - actionSafePercentage);
|
||||
gs_vertex2f(1 - actionSafePercentage, actionSafePercentage);
|
||||
gs_vertex2f(actionSafePercentage, actionSafePercentage);
|
||||
actionSafeMargin = gs_render_save();
|
||||
|
||||
// All graphics should be placed inside this area
|
||||
gs_render_start(true);
|
||||
gs_vertex2f(graphicsSafePercentage, graphicsSafePercentage);
|
||||
gs_vertex2f(graphicsSafePercentage, 1 - graphicsSafePercentage);
|
||||
gs_vertex2f(1 - graphicsSafePercentage,
|
||||
1 - graphicsSafePercentage);
|
||||
gs_vertex2f(1 - graphicsSafePercentage, graphicsSafePercentage);
|
||||
gs_vertex2f(graphicsSafePercentage, graphicsSafePercentage);
|
||||
graphicsSafeMargin = gs_render_save();
|
||||
|
||||
// 4:3 safe area for widescreen
|
||||
gs_render_start(true);
|
||||
gs_vertex2f(fourByThreeSafePercentage, graphicsSafePercentage);
|
||||
gs_vertex2f(1 - fourByThreeSafePercentage,
|
||||
graphicsSafePercentage);
|
||||
gs_vertex2f(1 - fourByThreeSafePercentage,
|
||||
1 - graphicsSafePercentage);
|
||||
gs_vertex2f(fourByThreeSafePercentage,
|
||||
1 - graphicsSafePercentage);
|
||||
gs_vertex2f(fourByThreeSafePercentage, graphicsSafePercentage);
|
||||
fourByThreeSafeMargin = gs_render_save();
|
||||
|
||||
gs_render_start(true);
|
||||
gs_vertex2f(0.0f, 0.5f);
|
||||
gs_vertex2f(lineLength, 0.5f);
|
||||
leftLine = gs_render_save();
|
||||
|
||||
gs_render_start(true);
|
||||
gs_vertex2f(0.5f, 0.0f);
|
||||
gs_vertex2f(0.5f, lineLength);
|
||||
topLine = gs_render_save();
|
||||
|
||||
gs_render_start(true);
|
||||
gs_vertex2f(1.0f, 0.5f);
|
||||
gs_vertex2f(1 - lineLength, 0.5f);
|
||||
rightLine = gs_render_save();
|
||||
obs_leave_graphics();
|
||||
|
||||
solid = obs_get_base_effect(OBS_EFFECT_SOLID);
|
||||
color = gs_effect_get_param_by_name(solid, "color");
|
||||
|
||||
InitSafeAreas(&actionSafeMargin, &graphicsSafeMargin,
|
||||
&fourByThreeSafeMargin, &leftLine, &topLine,
|
||||
&rightLine);
|
||||
UpdateMultiview();
|
||||
|
||||
multiviewProjectors.push_back(this);
|
||||
|
|
@ -297,31 +248,13 @@ void OBSProjector::OBSRenderMultiview(void *data, uint32_t cx, uint32_t cy)
|
|||
OBSSource programSrc = main->GetProgramSource();
|
||||
bool studioMode = main->IsPreviewProgramMode();
|
||||
|
||||
auto renderVB = [&](gs_vertbuffer_t *vb, int cx, int cy,
|
||||
uint32_t colorVal) {
|
||||
if (!vb)
|
||||
return;
|
||||
|
||||
matrix4 transform;
|
||||
matrix4_identity(&transform);
|
||||
transform.x.x = cx;
|
||||
transform.y.y = cy;
|
||||
|
||||
gs_load_vertexbuffer(vb);
|
||||
|
||||
gs_matrix_push();
|
||||
gs_matrix_mul(&transform);
|
||||
|
||||
gs_effect_set_color(window->color, colorVal);
|
||||
while (gs_effect_loop(window->solid, "Solid"))
|
||||
gs_draw(GS_LINESTRIP, 0, 0);
|
||||
|
||||
gs_matrix_pop();
|
||||
};
|
||||
|
||||
auto drawBox = [&](float cx, float cy, uint32_t colorVal) {
|
||||
gs_effect_set_color(window->color, colorVal);
|
||||
while (gs_effect_loop(window->solid, "Solid"))
|
||||
gs_effect_t *solid = obs_get_base_effect(OBS_EFFECT_SOLID);
|
||||
gs_eparam_t *color =
|
||||
gs_effect_get_param_by_name(solid, "color");
|
||||
|
||||
gs_effect_set_color(color, colorVal);
|
||||
while (gs_effect_loop(solid, "Solid"))
|
||||
gs_draw_sprite(nullptr, 0, (uint32_t)cx, (uint32_t)cy);
|
||||
};
|
||||
|
||||
|
|
@ -549,17 +482,17 @@ void OBSProjector::OBSRenderMultiview(void *data, uint32_t cx, uint32_t cy)
|
|||
obs_source_video_render(previewSrc);
|
||||
else
|
||||
obs_render_main_texture();
|
||||
|
||||
if (drawSafeArea) {
|
||||
renderVB(window->actionSafeMargin, targetCX, targetCY,
|
||||
outerColor);
|
||||
renderVB(window->graphicsSafeMargin, targetCX, targetCY,
|
||||
outerColor);
|
||||
renderVB(window->fourByThreeSafeMargin, targetCX, targetCY,
|
||||
outerColor);
|
||||
renderVB(window->leftLine, targetCX, targetCY, outerColor);
|
||||
renderVB(window->topLine, targetCX, targetCY, outerColor);
|
||||
renderVB(window->rightLine, targetCX, targetCY, outerColor);
|
||||
RenderSafeAreas(window->actionSafeMargin, targetCX, targetCY);
|
||||
RenderSafeAreas(window->graphicsSafeMargin, targetCX, targetCY);
|
||||
RenderSafeAreas(window->fourByThreeSafeMargin, targetCX,
|
||||
targetCY);
|
||||
RenderSafeAreas(window->leftLine, targetCX, targetCY);
|
||||
RenderSafeAreas(window->topLine, targetCX, targetCY);
|
||||
RenderSafeAreas(window->rightLine, targetCX, targetCY);
|
||||
}
|
||||
|
||||
endRegion();
|
||||
gs_matrix_pop();
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue