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

renderer: always hash along edges

Browse Source
This commit is contained in:
itsmattkc
2021-09-19 23:11:20 -07:00
parent 67c7c71ca2
commit 7ba5dca4ab
30 changed files with 76 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/node/math/merge/merge.cpp
+3 -3
View File
@@ -100,7 +100,7 @@ void MergeNode::Value(const NodeValueRow &value, const NodeGlobals &globals, Nod
}
}
void MergeNode::Hash(const ValueHint &output, QCryptographicHash &hash, const NodeGlobals &globals, const VideoParams &video_params) const
void MergeNode::Hash(QCryptographicHash &hash, const NodeGlobals &globals, const VideoParams &video_params) const
{
NodeTraverser traverser;
traverser.SetCacheVideoParams(video_params);
@@ -121,12 +121,12 @@ void MergeNode::Hash(const ValueHint &output, QCryptographicHash &hash, const No
if (!passthrough_base) {
Node *blend_output = GetConnectedOutput(kBlendIn);
blend_output->Hash(GetValueHintForInput(kBlendIn, -1), hash, globals, video_params);
Node::Hash(blend_output, GetValueHintForInput(kBlendIn), hash, globals, video_params);
}
if (!passthrough_blend) {
Node *base_output = GetConnectedOutput(kBaseIn);
base_output->Hash(GetValueHintForInput(kBaseIn, -1), hash, globals, video_params);
Node::Hash(base_output, GetValueHintForInput(kBaseIn), hash, globals, video_params);
}
Q_ASSERT(!passthrough_base || !passthrough_blend);
app/node/math/merge/merge.h
+2 -1
View File
@@ -48,7 +48,8 @@ public:
static const QString kBaseIn;
static const QString kBlendIn;
virtual void Hash(const ValueHint& output, QCryptographicHash &hash, const NodeGlobals &globals, const VideoParams& video_params) const override;
protected:
virtual void Hash(QCryptographicHash &hash, const NodeGlobals &globals, const VideoParams& video_params) const override;
private:
NodeInput* base_in_;