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

sweeping node graph changes for new rendering pipeline

Browse Source 
The new rendering pipeline strives to simplify the nodes themselves as much
as possible and move much of the logic to an external rendering engine. This
change removes all of the responsibilities that no longer belong to the
nodes themselves and will soon be folded into the renderer.
This commit is contained in:
itsmattkc
2019-11-02 01:39:37 +11:00
parent c14125e640
commit 16ac2fc0e1
35 changed files with 397 additions and 347 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/node/input/media/audio/audio.cpp
+3 -3
View File
@@ -26,9 +26,9 @@ QString AudioInput::Description()
return tr("Import an audio footage stream.");
}
QVariant AudioInput::Value(NodeOutput *output, const rational &in, const rational &out)
QVariant AudioInput::Value(NodeOutput *)
{
if (output == samples_output_) {
/*if (output == samples_output_) {
// Make sure decoder is set up
if (!SetupDecoder()) {
return 0;
@@ -41,7 +41,7 @@ QVariant AudioInput::Value(NodeOutput *output, const rational &in, const rationa
samples.resize(frame_->audio_params().samples_to_bytes(frame_->sample_count()));
memcpy(samples.data(), frame_->data(), static_cast<size_t>(samples.size()));
return samples;
}
}*/
return 0;
}
app/node/input/media/audio/audio.h
+1 -1
View File
@@ -14,7 +14,7 @@ public:
virtual QString Description() override;
protected:
virtual QVariant Value(NodeOutput* output, const rational& in, const rational& out) override;
virtual QVariant Value(NodeOutput* output) override;
private:
NodeOutput* samples_output_;
app/node/input/media/media.cpp
+2 -2
View File
@@ -37,12 +37,12 @@ void MediaInput::Release()
StreamPtr MediaInput::footage()
{
return footage_input_->get_value(0).value<StreamPtr>();
return footage_input_->get_value_at_time(0).value<StreamPtr>();
}
void MediaInput::SetFootage(StreamPtr f)
{
footage_input_->set_value(QVariant::fromValue(f));
footage_input_->set_value_at_time(0, QVariant::fromValue(f));
}
bool MediaInput::SetupDecoder()
app/node/input/media/video/video.cpp
-1
View File
@@ -15,7 +15,6 @@ VideoInput::VideoInput()
AddParameter(matrix_input_);
texture_output_ = new NodeOutput("tex_out");
texture_output_->SetValueCachingEnabled(false);
AddParameter(texture_output_);
}