oak-team/oak-editor
3
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed viewport issues

Browse Source
This commit is contained in:
itsmattkc
2019-10-23 01:12:15 +11:00
parent 0c04e59a48
commit c38b4dca99
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/node/input/media/media.cpp
+4 -4
View File
@@ -220,8 +220,8 @@ QVariant MediaInput::Value(NodeOutput *output, const rational &in, const rationa
RenderTexturePtr output_texture = std::make_shared<RenderTexture>(); RenderTexturePtr output_texture = std::make_shared<RenderTexture>();
output_texture->Create(renderer->context(), output_texture->Create(renderer->context(),
renderer->params().width(), renderer->params().effective_width(),
renderer->params().height(), renderer->params().effective_height(),
renderer->params().format(), renderer->params().format(),
RenderTexture::kDoubleBuffer); RenderTexture::kDoubleBuffer);
@@ -259,8 +259,8 @@ QVariant MediaInput::Value(NodeOutput *output, const rational &in, const rationa
QMatrix4x4 transform; QMatrix4x4 transform;
// Scale texture to a square for incoming matrix transformation // Scale texture to a square for incoming matrix transformation
transform.scale(2.0f / static_cast<float>(renderer->params().width() * renderer->params().divider()), transform.scale(2.0f / static_cast<float>(renderer->params().width()),
2.0f / static_cast<float>(renderer->params().height() * renderer->params().divider())); 2.0f / static_cast<float>(renderer->params().height()));
// Multiply by input transformation // Multiply by input transformation
transform *= matrix_input_->get_value(in).value<QMatrix4x4>(); transform *= matrix_input_->get_value(in).value<QMatrix4x4>();
app/render/renderinstance.cpp
+1 -1
View File
@@ -74,7 +74,7 @@ bool RenderInstance::Start()
buffer_.Create(ctx_); buffer_.Create(ctx_);
// Set viewport to the compositing dimensions // Set viewport to the compositing dimensions
ctx_->functions()->glViewport(0, 0, params_.width(), params_.height()); ctx_->functions()->glViewport(0, 0, params_.effective_width(), params_.effective_height());
ctx_->functions()->glEnable(GL_BLEND); ctx_->functions()->glEnable(GL_BLEND);
// Set up default pipeline // Set up default pipeline