oak-team/oak-editor
1
0
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/input/time/timeinput.cpp
+2 -4
View File
@@ -51,10 +51,8 @@ QString TimeInput::Description() const
return tr("Generates the time (in seconds) at this frame.");
}
void TimeInput::Value(const QString &output, const NodeValueRow &value, const NodeGlobals &globals, NodeValueTable *table) const
void TimeInput::Value(const NodeValueRow &value, const NodeGlobals &globals, NodeValueTable *table) const
{
Q_UNUSED(output)
table->Push(NodeValue::kFloat,
globals.time().in().toDouble(),
this,
@@ -62,7 +60,7 @@ void TimeInput::Value(const QString &output, const NodeValueRow &value, const No
QStringLiteral("time"));
}
void TimeInput::Hash(const QString &output, QCryptographicHash &hash, const NodeGlobals &globals, const VideoParams &video_params) const
void TimeInput::Hash(const ValueHint &output, QCryptographicHash &hash, const NodeGlobals &globals, const VideoParams &video_params) const
{
Node::Hash(output, hash, globals, video_params);
app/node/input/time/timeinput.h
+2 -2
View File
@@ -40,9 +40,9 @@ public:
virtual QVector<CategoryID> Category() const override;
virtual QString Description() const override;
virtual void Value(const QString& output, const NodeValueRow& value, const NodeGlobals &globals, NodeValueTable *table) const override;
virtual void Value(const NodeValueRow& value, const NodeGlobals &globals, NodeValueTable *table) 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;
};
app/node/input/value/valuenode.cpp
+1 -2
View File
@@ -59,10 +59,9 @@ void ValueNode::Retranslate()
SetComboBoxStrings(kTypeInput, type_names);
}
void ValueNode::Value(const QString &output, const NodeValueRow &value, const NodeGlobals &globals, NodeValueTable *table) const
void ValueNode::Value(const NodeValueRow &value, const NodeGlobals &globals, NodeValueTable *table) const
{
Q_UNUSED(globals)
Q_UNUSED(output)
// Ensure value is pushed onto the table
table->Push(value[kValueInput]);
app/node/input/value/valuenode.h
+1 -1
View File
@@ -63,7 +63,7 @@ public:
virtual void Retranslate() override;
virtual void Value(const QString &output, const NodeValueRow& value, const NodeGlobals &globals, NodeValueTable *table) const override;
virtual void Value(const NodeValueRow& value, const NodeGlobals &globals, NodeValueTable *table) const override;
protected:
virtual void InputValueChangedEvent(const QString &input, int element) override;