nodes: revert to single output

app/node/math/math/math.cpp

@@ -88,10 +88,8 @@ ShaderCode MathNode::GetShaderCode(const QString &shader_id) const
   return GetShaderCodeInternal(shader_id, kParamAIn, kParamBIn);
 }
 
-void MathNode::Value(const QString &output, const NodeValueRow &value, const NodeGlobals &globals, NodeValueTable *table) const
+void MathNode::Value(const NodeValueRow &value, const NodeGlobals &globals, NodeValueTable *table) const
 {
-  Q_UNUSED(output)
-
   // Auto-detect what values to operate with
   // FIXME: Very inefficient
   NodeValueTable at, bt;

app/node/math/math/math.h

@@ -54,7 +54,7 @@ public:
     SetStandardValue(kMethodIn, o);
   }
 
-  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 ProcessSamples(const NodeValueRow &values, const SampleBufferPtr input, SampleBufferPtr output, int index) const override;
 

app/node/math/merge/merge.cpp

@@ -73,10 +73,8 @@ ShaderCode MergeNode::GetShaderCode(const QString &shader_id) const
   return ShaderCode(FileFunctions::ReadFileAsString(":/shaders/alphaover.frag"));
 }
 
-void MergeNode::Value(const QString &output, const NodeValueRow &value, const NodeGlobals &globals, NodeValueTable *table) const
+void MergeNode::Value(const NodeValueRow &value, const NodeGlobals &globals, NodeValueTable *table) const
 {
-  Q_UNUSED(output)
-
   ShaderJob job;
   job.InsertValue(value);
 
@@ -102,12 +100,12 @@ void MergeNode::Value(const QString &output, const NodeValueRow &value, const No
   }
 }
 
-void MergeNode::Hash(const QString &output, QCryptographicHash &hash, const NodeGlobals &globals, const VideoParams &video_params) const
+void MergeNode::Hash(const ValueHint &output, QCryptographicHash &hash, const NodeGlobals &globals, const VideoParams &video_params) const
 {
   NodeTraverser traverser;
   traverser.SetCacheVideoParams(video_params);
 
-  NodeValueDatabase db = traverser.GenerateDatabase(this, output, globals.time());
+  NodeValueDatabase db = traverser.GenerateDatabase(this, globals.time());
 
   TexturePtr base_tex = db[kBaseIn].Get(NodeValue::kTexture).value<TexturePtr>();
   TexturePtr blend_tex = db[kBlendIn].Get(NodeValue::kTexture).value<TexturePtr>();
@@ -118,17 +116,17 @@ void MergeNode::Hash(const QString &output, QCryptographicHash &hash, const Node
 
     if (!passthrough_base && !passthrough_blend) {
       // This merge will actually do something so we add a fingerprint
-      HashAddNodeSignature(hash, output);
+      HashAddNodeSignature(hash);
     }
 
     if (!passthrough_base) {
-      NodeOutput blend_output = GetConnectedOutput(kBlendIn);
-      blend_output.node()->Hash(blend_output.output(), hash, globals, video_params);
+      Node *blend_output = GetConnectedOutput(kBlendIn);
+      blend_output->Hash(GetValueHintForInput(kBlendIn, -1), hash, globals, video_params);
     }
 
     if (!passthrough_blend) {
-      NodeOutput base_output = GetConnectedOutput(kBaseIn);
-      base_output.node()->Hash(base_output.output(), hash, globals, video_params);
+      Node *base_output = GetConnectedOutput(kBaseIn);
+      base_output->Hash(GetValueHintForInput(kBaseIn, -1), hash, globals, video_params);
     }
 
     Q_ASSERT(!passthrough_base || !passthrough_blend);

app/node/math/merge/merge.h

@@ -43,12 +43,12 @@ public:
   virtual void Retranslate() override;
 
   virtual ShaderCode GetShaderCode(const QString &shader_id) 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;
 
   static const QString kBaseIn;
   static const QString kBlendIn;
 
-  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;
 
 private:
   NodeInput* base_in_;

app/node/math/trigonometry/trigonometry.cpp

@@ -76,10 +76,8 @@ void TrigonometryNode::Retranslate()
   SetInputName(kMethodIn, tr("Method"));
 }
 
-void TrigonometryNode::Value(const QString &output, const NodeValueRow &value, const NodeGlobals &globals, NodeValueTable *table) const
+void TrigonometryNode::Value(const NodeValueRow &value, const NodeGlobals &globals, NodeValueTable *table) const
 {
-  Q_UNUSED(output)
-
   double x = value[kXIn].data().toFloat();
 
   switch (static_cast<Operation>(GetStandardValue(kMethodIn).toInt())) {

app/node/math/trigonometry/trigonometry.h

@@ -42,7 +42,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;
 
   static const QString kMethodIn;
   static const QString kXIn;