various: fix broken transition creation

It's now possible to create transitions! But they're still broken in
a multitude of other ways so plenty more work to do hahahahahahahahaha

app/node/block/transition/CMakeLists.txt

@@ -14,6 +14,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+add_subdirectory(crossdissolve)
+add_subdirectory(diptocolor)
+
 set(OLIVE_SOURCES
   ${OLIVE_SOURCES}
   node/block/transition/transition.h

app/node/block/transition/crossdissolve/CMakeLists.txt

@@ -0,0 +1,22 @@
+# Olive - Non-Linear Video Editor
+# Copyright (C) 2019 Olive Team
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+set(OLIVE_SOURCES
+  ${OLIVE_SOURCES}
+  node/block/transition/crossdissolve/crossdissolvetransition.h
+  node/block/transition/crossdissolve/crossdissolvetransition.cpp
+  PARENT_SCOPE
+)

app/node/block/transition/crossdissolve/crossdissolvetransition.cpp

@@ -0,0 +1,62 @@
+/***
+
+  Olive - Non-Linear Video Editor
+  Copyright (C) 2019 Olive Team
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+***/
+
+#include "crossdissolvetransition.h"
+
+OLIVE_NAMESPACE_ENTER
+
+CrossDissolveTransition::CrossDissolveTransition()
+{
+
+}
+
+Node *CrossDissolveTransition::copy() const
+{
+  return new CrossDissolveTransition();
+}
+
+QString CrossDissolveTransition::Name() const
+{
+  return tr("Cross Dissolve");
+}
+
+QString CrossDissolveTransition::id() const
+{
+  return QStringLiteral("org.olivevideoeditor.Olive.crossdissolve");
+}
+
+QList<Node::CategoryID> CrossDissolveTransition::Category() const
+{
+  return {kCategoryTransition};
+}
+
+QString CrossDissolveTransition::Description() const
+{
+  return tr("Smoothly transition between two clips.");
+}
+
+ShaderCode CrossDissolveTransition::GetShaderCode(const QString &shader_id) const
+{
+  Q_UNUSED(shader_id)
+
+  return ShaderCode(Node::ReadFileAsString(":/shaders/crossdissolve.frag"), QString());
+}
+
+OLIVE_NAMESPACE_EXIT

app/node/block/transition/crossdissolve/crossdissolvetransition.h

@@ -0,0 +1,48 @@
+/***
+
+  Olive - Non-Linear Video Editor
+  Copyright (C) 2019 Olive Team
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+***/
+
+#ifndef CROSSDISSOLVETRANSITION_H
+#define CROSSDISSOLVETRANSITION_H
+
+#include "node/block/transition/transition.h"
+
+OLIVE_NAMESPACE_ENTER
+
+class CrossDissolveTransition : public TransitionBlock
+{
+public:
+  CrossDissolveTransition();
+
+  virtual Node* copy() const override;
+
+  virtual QString Name() const override;
+  virtual QString id() const override;
+  virtual QList<CategoryID> Category() const override;
+  virtual QString Description() const override;
+
+  //virtual void Retranslate() override;
+
+  virtual ShaderCode GetShaderCode(const QString& shader_id) const override;
+
+};
+
+OLIVE_NAMESPACE_EXIT
+
+#endif // CROSSDISSOLVETRANSITION_H

app/node/block/transition/diptocolor/CMakeLists.txt

@@ -0,0 +1,22 @@
+# Olive - Non-Linear Video Editor
+# Copyright (C) 2019 Olive Team
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+set(OLIVE_SOURCES
+  ${OLIVE_SOURCES}
+  node/block/transition/diptocolor/diptocolortransition.h
+  node/block/transition/diptocolor/diptocolortransition.cpp
+  PARENT_SCOPE
+)

app/node/block/transition/diptocolor/diptocolortransition.cpp

@@ -0,0 +1,68 @@
+/***
+
+  Olive - Non-Linear Video Editor
+  Copyright (C) 2019 Olive Team
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+***/
+
+#include "diptocolortransition.h"
+
+OLIVE_NAMESPACE_ENTER
+
+DipToColorTransition::DipToColorTransition()
+{
+  color_input_ = new NodeInput(QStringLiteral("color_in"), NodeParam::kColor, QVariant::fromValue(Color(0, 0, 0)));
+  AddInput(color_input_);
+}
+
+Node *DipToColorTransition::copy() const
+{
+  return new DipToColorTransition();
+}
+
+QString DipToColorTransition::Name() const
+{
+  return tr("Dip To Color");
+}
+
+QString DipToColorTransition::id() const
+{
+  return QStringLiteral("org.olivevideoeditor.Olive.diptocolor");
+}
+
+QList<Node::CategoryID> DipToColorTransition::Category() const
+{
+  return {kCategoryTransition};
+}
+
+QString DipToColorTransition::Description() const
+{
+  return tr("Transition between clips by dipping to a color.");
+}
+
+ShaderCode DipToColorTransition::GetShaderCode(const QString &shader_id) const
+{
+  Q_UNUSED(shader_id)
+
+  return ShaderCode(Node::ReadFileAsString(":/shaders/diptoblack.frag"), QString());
+}
+
+void DipToColorTransition::ShaderJobEvent(NodeValueDatabase &value, ShaderJob &job) const
+{
+  job.InsertValue(color_input_, value);
+}
+
+OLIVE_NAMESPACE_EXIT

app/node/block/transition/diptocolor/diptocolortransition.h

@@ -0,0 +1,52 @@
+/***
+
+  Olive - Non-Linear Video Editor
+  Copyright (C) 2019 Olive Team
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+***/
+
+#ifndef DIPTOCOLORTRANSITION_H
+#define DIPTOCOLORTRANSITION_H
+
+#include "node/block/transition/transition.h"
+
+OLIVE_NAMESPACE_ENTER
+
+class DipToColorTransition : public TransitionBlock
+{
+public:
+  DipToColorTransition();
+
+  virtual Node* copy() const override;
+
+  virtual QString Name() const override;
+  virtual QString id() const override;
+  virtual QList<CategoryID> Category() const override;
+  virtual QString Description() const override;
+
+  virtual ShaderCode GetShaderCode(const QString& shader_id) const override;
+
+protected:
+  virtual void ShaderJobEvent(NodeValueDatabase &value, ShaderJob& job) const override;
+
+private:
+  NodeInput* color_input_;
+
+};
+
+OLIVE_NAMESPACE_EXIT
+
+#endif // DIPTOCOLORTRANSITION_H

app/node/block/transition/transition.cpp

@@ -131,6 +131,8 @@ double TransitionBlock::GetInProgress(const rational &time) const
 
 void TransitionBlock::Hash(QCryptographicHash &hash, const rational &time) const
 {
+  Node::Hash(hash, time);
+
   double all_prog = GetTotalProgress(time);
   double in_prog = GetInProgress(time);
   double out_prog = GetOutProgress(time);
@@ -138,14 +140,6 @@ void TransitionBlock::Hash(QCryptographicHash &hash, const rational &time) const
   hash.addData(reinterpret_cast<const char*>(&all_prog), sizeof(double));
   hash.addData(reinterpret_cast<const char*>(&in_prog), sizeof(double));
   hash.addData(reinterpret_cast<const char*>(&out_prog), sizeof(double));
-
-  if (out_block_input_->is_connected()) {
-    out_block_input_->get_connected_node()->Hash(hash, time);
-  }
-
-  if (in_block_input_->is_connected()) {
-    in_block_input_->get_connected_node()->Hash(hash, time);
-  }
 }
 
 double TransitionBlock::GetInternalTransitionTime(const rational &time) const
@@ -177,4 +171,25 @@ void TransitionBlock::BlockDisconnected(NodeEdgePtr edge)
   }
 }
 
+NodeValueTable TransitionBlock::Value(NodeValueDatabase &value) const
+{
+  ShaderJob job;
+
+  job.InsertValue(out_block_input(), value);
+  job.InsertValue(in_block_input(), value);
+  job.SetAlphaChannelRequired(true);
+
+  ShaderJobEvent(value, job);
+
+  NodeValueTable table = value.Merge();
+  table.Push(NodeParam::kShaderJob, QVariant::fromValue(job), this);
+  return table;
+}
+
+void TransitionBlock::ShaderJobEvent(NodeValueDatabase &value, ShaderJob &job) const
+{
+  Q_UNUSED(value)
+  Q_UNUSED(job)
+}
+
 OLIVE_NAMESPACE_EXIT

app/node/block/transition/transition.h

@@ -49,6 +49,11 @@ public:
 
   virtual void Hash(QCryptographicHash& hash, const rational &time) const override;
 
+  virtual NodeValueTable Value(NodeValueDatabase &value) const override;
+
+protected:
+  virtual void ShaderJobEvent(NodeValueDatabase &value, ShaderJob& job) const;
+
 private:
   double GetInternalTransitionTime(const rational& time) const;