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

conformed viewer node/panel affinity

Browse Source
This commit is contained in:
itsmattkc
2019-09-20 05:12:34 +10:00
parent 814ee14c0b
commit 389e723416
7 changed files with 103 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/node/output/viewer/viewer.cpp
+10 -47
View File
@@ -20,8 +20,7 @@
#include "viewer.h"
ViewerOutput::ViewerOutput() :
attached_viewer_(nullptr)
ViewerOutput::ViewerOutput()
{
texture_input_ = new NodeInput("tex_out");
texture_input_->add_data_input(NodeInput::kTexture);
@@ -48,13 +47,16 @@ QString ViewerOutput::Description()
return tr("Interface between a Viewer panel and the node system.");
}
const rational &ViewerOutput::Timebase()
{
return timebase_;
}
void ViewerOutput::SetTimebase(const rational &timebase)
{
timebase_ = timebase;
if (attached_viewer_ != nullptr) {
attached_viewer_->SetTimebase(timebase_);
}
emit TimebaseChanged(timebase_);
}
NodeInput *ViewerOutput::texture_input()
@@ -62,46 +64,20 @@ NodeInput *ViewerOutput::texture_input()
return texture_input_;
}
void ViewerOutput::AttachViewer(ViewerPanel *viewer)
RenderTexturePtr ViewerOutput::GetTexture(const rational &time)
{
// Disconnect old viewer if there's one attached
if (attached_viewer_ != nullptr) {
disconnect(attached_viewer_, SIGNAL(TimeChanged(const rational&)), this, SLOT(ViewerTimeChanged(const rational&)));
// Clear any existing texture
attached_viewer_->SetTexture(0);
}
// FIXME: Currently this attaches to ViewerPanels, but should it attached to Viewers instead?
attached_viewer_ = viewer;
if (attached_viewer_ != nullptr) {
connect(attached_viewer_, SIGNAL(TimeChanged(const rational&)), this, SLOT(ViewerTimeChanged(const rational&)));
SetTimebase(timebase_);
// Update the texture
ViewerTimeChanged(attached_viewer_->GetTime());
}
return texture_input_->get_value(time).value<RenderTexturePtr>();
}
void ViewerOutput::InvalidateCache(const rational &start_range, const rational &end_range, NodeInput *from)
{
Node::InvalidateCache(start_range, end_range, from);
if (attached_viewer_ != nullptr
&& (start_range == attached_viewer_->GetTime() || end_range == attached_viewer_->GetTime())) {
// Update any attached viewer
ForceUpdateViewer();
}
emit TextureChangedBetween(start_range, end_range);
SendInvalidateCache(start_range, end_range);
}
void ViewerOutput::ForceUpdateViewer()
{
ViewerTimeChanged(attached_viewer_->GetTime());
}
QVariant ViewerOutput::Value(NodeOutput *output, const rational &time)
{
Q_UNUSED(output)
@@ -109,16 +85,3 @@ QVariant ViewerOutput::Value(NodeOutput *output, const rational &time)
return 0;
}
void ViewerOutput::ViewerTimeChanged(const rational &t)
{
// Get the texture from whatever Node is currently connected (usually a Renderer of some kind)
RenderTexturePtr current_texture = texture_input_->get_value(t).value<RenderTexturePtr>();
// Send the texture to the Viewer
if (current_texture != nullptr) {
attached_viewer_->SetTexture(current_texture->texture());
} else {
attached_viewer_->SetTexture(0);
}
}
app/node/output/viewer/viewer.h
+7 -9
View File
@@ -22,7 +22,6 @@
#define VIEWER_H
#include "node/node.h"
#include "panel/viewer/viewer.h"
#include "render/rendertexture.h"
/**
@@ -41,29 +40,28 @@ public:
virtual QString Category() override;
virtual QString Description() override;
const rational& Timebase();
void SetTimebase(const rational& timebase);
NodeInput* texture_input();
void AttachViewer(ViewerPanel* viewer);
RenderTexturePtr GetTexture(const rational& time);
virtual void InvalidateCache(const rational &start_range, const rational &end_range, NodeInput *from = nullptr) override;
signals:
void TimebaseChanged(const rational&);
void TextureChangedBetween(const rational&, const rational&);
protected:
virtual QVariant Value(NodeOutput* output, const rational& time) override;
private:
void ForceUpdateViewer();
NodeInput* texture_input_;
ViewerPanel* attached_viewer_;
rational timebase_;
private slots:
void ViewerTimeChanged(const rational& t);
};
#endif // VIEWER_H