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

merged all drawing functions into a single shader processing function

Browse Source
This commit is contained in:
itsmattkc
2020-11-10 15:50:13 +11:00
parent 1d61f89920
commit 0429e70fe0
46 changed files with 570 additions and 398 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/widget/scope/scopebase/scopebase.cpp
+6 -3
View File
@@ -50,7 +50,11 @@ void ScopeBase::showEvent(QShowEvent* e)
void ScopeBase::DrawScope(Renderer::TexturePtr managed_tex, QVariant pipeline)
{
renderer()->Blit(managed_tex.get(), pipeline, Renderer::ShaderUniformMap());
ShaderJob job;
job.InsertValue(QStringLiteral("ove_maintex"), ShaderValue(QVariant::fromValue(managed_tex), NodeParam::kTexture));
renderer()->Blit(pipeline, job, VideoParams(width(), height(), PixelFormat::PIX_FMT_RGBA16F));
}
void ScopeBase::UploadTextureFromBuffer()
@@ -98,9 +102,8 @@ void ScopeBase::OnPaint()
if (buffer_) {
// Convert reference frame to display space
renderer()->BlitColorManaged(color_service(), texture_.get(), managed_tex_.get());
renderer()->BlitColorManaged(color_service(), texture_, managed_tex_.get());
renderer()->SetViewport(width(), height());
DrawScope(managed_tex_, pipeline_);
}
}