groups: improved functionality

Various improvements and fixes to groups

app/node/effect/opacity/opacityeffect.cpp

@@ -5,7 +5,10 @@
 
 namespace olive {
 
-#define super NodeGroup
+#define super Node
+
+const QString OpacityEffect::kTextureInput = QStringLiteral("tex_in");
+const QString OpacityEffect::kValueInput = QStringLiteral("opacity_in");
 
 OpacityEffect::OpacityEffect()
 {
@@ -15,24 +18,44 @@ OpacityEffect::OpacityEffect()
 
   SetNodePositionInContext(math, QPointF(0, 0));
 
-  tex_in_pass_ = AddInputPassthrough(NodeInput(math, MathNode::kParamAIn), InputFlags(kInputFlagNotKeyframable));
-  SetInputDataType(tex_in_pass_, NodeValue::kTexture);
+  AddInput(kTextureInput, NodeValue::kTexture, InputFlags(kInputFlagNotKeyframable));
 
-  value_in_pass_ = AddInputPassthrough(NodeInput(math, MathNode::kParamBIn));
-  SetInputProperty(value_in_pass_, QStringLiteral("view"), FloatSlider::kPercentage);
-  SetInputProperty(value_in_pass_, QStringLiteral("min"), 0.0);
-  SetInputProperty(value_in_pass_, QStringLiteral("max"), 1.0);
-  math->SetStandardValue(MathNode::kParamBIn, 1.0);
-
-  SetOutputPassthrough(math);
+  AddInput(kValueInput, NodeValue::kFloat, 1.0);
+  SetInputProperty(kValueInput, QStringLiteral("view"), FloatSlider::kPercentage);
+  SetInputProperty(kValueInput, QStringLiteral("min"), 0.0);
+  SetInputProperty(kValueInput, QStringLiteral("max"), 1.0);
 }
 
 void OpacityEffect::Retranslate()
 {
   super::Retranslate();
 
-  SetInputName(tex_in_pass_, tr("Texture"));
-  SetInputName(value_in_pass_, tr("Opacity"));
+  SetInputName(kTextureInput, tr("Texture"));
+  SetInputName(kValueInput, tr("Opacity"));
+}
+
+ShaderCode OpacityEffect::GetShaderCode(const QString &shader_id) const
+{
+  Q_UNUSED(shader_id)
+  return ShaderCode(FileFunctions::ReadFileAsString(":/shaders/opacity.frag"));
+}
+
+void OpacityEffect::Value(const NodeValueRow &value, const NodeGlobals &globals, NodeValueTable *table) const
+{
+  ShaderJob job;
+
+  job.InsertValue(value);
+
+  // If there's no texture, no need to run an operation
+  if (!job.GetValue(kTextureInput).data().isNull()) {
+    if (!qFuzzyCompare(job.GetValue(kValueInput).data().toDouble(), 1.0)) {
+      job.SetAlphaChannelRequired(GenerateJob::kAlphaForceOn);
+      table->Push(NodeValue::kShaderJob, QVariant::fromValue(job), this);
+    } else {
+      // 1.0 float is a no-op, so just push the texture
+      table->Push(job.GetValue(kTextureInput));
+    }
+  }
 }
 
 }

app/node/effect/opacity/opacityeffect.h

@@ -5,7 +5,7 @@
 
 namespace olive {
 
-class OpacityEffect : public NodeGroup
+class OpacityEffect : public Node
 {
 public:
   OpacityEffect();
@@ -21,7 +21,7 @@ public:
 
   virtual QString id() const override
   {
-    return QStringLiteral("org.olivevideoeditor.Olive.opacityeffect");
+    return QStringLiteral("org.olivevideoeditor.Olive.opacity");
   }
 
   virtual QVector<CategoryID> Category() const override
@@ -36,9 +36,11 @@ public:
 
   virtual void Retranslate() override;
 
-private:
-  QString tex_in_pass_;
-  QString value_in_pass_;
+  virtual ShaderCode GetShaderCode(const QString &shader_id) const override;
+  virtual void Value(const NodeValueRow& value, const NodeGlobals &globals, NodeValueTable *table) const override;
+
+  static const QString kTextureInput;
+  static const QString kValueInput;
 
 };
 

app/node/group/group.cpp

@@ -58,7 +58,7 @@ void NodeGroup::Retranslate()
   }
 }
 
-QString NodeGroup::AddInputPassthrough(const NodeInput &input, const InputFlags &flags, const QString &force_id)
+QString NodeGroup::AddInputPassthrough(const NodeInput &input, const QString &force_id)
 {
   Q_ASSERT(ContextContainsNode(input.node()));
 
@@ -92,7 +92,7 @@ QString NodeGroup::AddInputPassthrough(const NodeInput &input, const InputFlags
     Q_ASSERT(!already_exists);
   }
 
-  AddInput(id, input.GetDataType(), input.GetDefaultValue(), input.GetFlags() | flags);
+  AddInput(id, input.GetDataType(), input.GetDefaultValue(), input.GetFlags());
 
   input_passthroughs_.append({id, input});
 
@@ -168,7 +168,7 @@ bool NodeGroup::GetInner(NodeInput *input)
 void NodeGroupAddInputPassthrough::redo()
 {
   if (!group_->ContainsInputPassthrough(input_)) {
-    group_->AddInputPassthrough(input_, InputFlags(), force_id_);
+    group_->AddInputPassthrough(input_, force_id_);
     actually_added_ = true;
   } else {
     actually_added_ = false;

app/node/group/group.h

@@ -41,7 +41,7 @@ public:
 
   virtual void Retranslate() override;
 
-  QString AddInputPassthrough(const NodeInput &input, const InputFlags &flags = InputFlags(), const QString &force_id = QString());
+  QString AddInputPassthrough(const NodeInput &input, const QString &force_id = QString());
 
   void RemoveInputPassthrough(const NodeInput &input);
 

app/node/node.cpp

@@ -916,6 +916,17 @@ InputFlags Node::GetInputFlags(const QString &input) const
   }
 }
 
+void Node::SetInputFlags(const QString &input, const InputFlags &f)
+{
+  Input* i = GetInternalInputData(input);
+
+  if (i) {
+    i->flags = f;
+  } else {
+    ReportInvalidInput("set flags of", input);
+  }
+}
+
 void Node::Value(const NodeValueRow& value, const NodeGlobals &globals, NodeValueTable *table) const
 {
   // Do nothing

app/node/node.h

@@ -948,6 +948,7 @@ public:
   };
 
   InputFlags GetInputFlags(const QString& input) const;
+  void SetInputFlags(const QString &input, const InputFlags &f);
 
   static void SetValueAtTime(const NodeInput &input, const rational &time, const QVariant &value, int track, MultiUndoCommand *command, bool insert_on_all_tracks_if_no_key);
 

app/node/project/serializer/serializer220403.cpp

@@ -756,7 +756,9 @@ void ProjectSerializer220403::PostConnect(const XMLNodeData &xml_node_data) cons
     if (Node *input_node = xml_node_data.node_ptrs.value(l.input_node)) {
       NodeInput resolved(input_node, l.input_id, l.input_element);
 
-      l.group->AddInputPassthrough(resolved, l.custom_flags, l.passthrough_id);
+      l.group->AddInputPassthrough(resolved, l.passthrough_id);
+
+      l.group->SetInputFlags(l.passthrough_id, resolved.GetFlags() | l.custom_flags);
 
       if (!l.custom_name.isEmpty()) {
         l.group->SetInputName(l.passthrough_id, l.custom_name);