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

nodes: revert to single output

Browse Source
This commit is contained in:
itsmattkc
2021-09-07 22:01:36 -07:00
parent 9843fd47f0
commit b07bccb7dc
89 changed files with 511 additions and 616 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/node/time/timeremap/timeremap.cpp
+4 -9
View File
@@ -34,6 +34,7 @@ TimeRemapNode::TimeRemapNode()
AddInput(kTimeInput, NodeValue::kRational, QVariant::fromValue(rational(0)), InputFlags(kInputFlagNotConnectable));
SetInputProperty(kTimeInput, QStringLiteral("view"), RationalSlider::kTime);
SetInputProperty(kTimeInput, QStringLiteral("viewlock"), true);
IgnoreHashingFrom(kTimeInput);
AddInput(kInputInput, NodeValue::kNone, InputFlags(kInputFlagNotKeyframable));
}
@@ -92,22 +93,16 @@ void TimeRemapNode::Retranslate()
SetInputName(kInputInput, QStringLiteral("Input"));
}
QVector<QString> TimeRemapNode::inputs_for_output(const QString &output) const
{
Q_UNUSED(output)
return {kInputInput};
}
void TimeRemapNode::Hash(const QString &output, QCryptographicHash &hash, const NodeGlobals &globals, const VideoParams &video_params) const
void TimeRemapNode::Hash(const ValueHint &output, QCryptographicHash &hash, const NodeGlobals &globals, const VideoParams &video_params) const
{
// Don't hash anything of our own, just pass-through to the connected node at the remapped tmie
Q_UNUSED(output)
if (IsInputConnected(kInputInput)) {
NodeOutput out = GetConnectedOutput(kInputInput);
Node *out = GetConnectedOutput(kInputInput);
NodeGlobals new_globals = globals;
new_globals.set_time(TimeRange(GetRemappedTime(globals.time().in()), GetRemappedTime(globals.time().out())));
out.node()->Hash(out.output(), hash, new_globals, video_params);
out->Hash(GetValueHintForInput(kInputInput, -1), hash, new_globals, video_params);
}
}
app/node/time/timeremap/timeremap.h
+1 -3
View File
@@ -45,9 +45,7 @@ public:
virtual void Retranslate() override;
virtual QVector<QString> inputs_for_output(const QString &output) const override;
virtual void Hash(const QString &output, QCryptographicHash &hash, const NodeGlobals &globals, const VideoParams& video_params) const override;
virtual void Hash(const ValueHint &output, QCryptographicHash &hash, const NodeGlobals &globals, const VideoParams& video_params) const override;
static const QString kTimeInput;
static const QString kInputInput;