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

prepared gl improvements for merge

Browse Source
This commit is contained in:
itsmattkc
2020-02-14 02:35:10 +11:00
parent 6a47b05ab8
commit d66425c324
19 changed files with 11 additions and 1286 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/widget/viewer/viewer.cpp
+2 -2
View File
@@ -82,7 +82,7 @@ ViewerWidget::ViewerWidget(QWidget *parent) :
SetScale(48.0);
// Start background renderers
video_renderer_ = new OSLBackend(this);
video_renderer_ = new OpenGLBackend(this);
connect(video_renderer_, &VideoRenderBackend::CachedFrameReady, this, &ViewerWidget::RendererCachedFrame);
connect(video_renderer_, &VideoRenderBackend::CachedTimeReady, this, &ViewerWidget::RendererCachedTime);
connect(video_renderer_, &VideoRenderBackend::CachedTimeReady, ruler(), &TimeRuler::CacheTimeReady);
@@ -225,7 +225,7 @@ void ViewerWidget::UpdateTextureFromNode(const rational& time)
if (!GetConnectedNode()) {
SetTexture(nullptr);
} else {
//SetTexture(video_renderer_->GetCachedFrameAsTexture(time));
SetTexture(video_renderer_->GetCachedFrameAsTexture(time));
}
}