Merge branch 'master' into gizmos

app/node/generator/CMakeLists.txt

@@ -16,6 +16,7 @@
 
 add_subdirectory(matrix)
 add_subdirectory(polygon)
+add_subdirectory(solid)
 
 set(OLIVE_SOURCES
   ${OLIVE_SOURCES}

app/node/generator/matrix/matrix.cpp

@@ -69,9 +69,9 @@ QString MatrixGenerator::id() const
   return QStringLiteral("org.olivevideoeditor.Olive.transform");
 }
 
-QString MatrixGenerator::Category() const
+QList<Node::CategoryID> MatrixGenerator::Category() const
 {
-  return tr("Generator");
+  return {kCategoryGenerator, kCategoryMath};
 }
 
 QString MatrixGenerator::Description() const

app/node/generator/matrix/matrix.h

@@ -36,7 +36,7 @@ public:
   virtual QString Name() const override;
   virtual QString ShortName() const override;
   virtual QString id() const override;
-  virtual QString Category() const override;
+  virtual QList<CategoryID> Category() const override;
   virtual QString Description() const override;
 
   virtual void Retranslate() override;

app/node/generator/solid/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/generator/solid/solid.h
+  node/generator/solid/solid.cpp
+  PARENT_SCOPE
+)

app/node/generator/solid/solid.cpp

@@ -0,0 +1,76 @@
+/***
+
+  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 "solid.h"
+
+#include "render/color.h"
+
+OLIVE_NAMESPACE_ENTER
+
+SolidGenerator::SolidGenerator()
+{
+  // Default to a color that isn't black
+  color_input_ = new NodeInput("color_in",
+                               NodeInput::kColor,
+                               QVariant::fromValue(Color(1.0f, 0.0f, 0.0f, 1.0f)));
+  AddInput(color_input_);
+}
+
+Node *SolidGenerator::copy() const
+{
+  return new SolidGenerator();
+}
+
+QString SolidGenerator::Name() const
+{
+  return tr("Solid");
+}
+
+QString SolidGenerator::id() const
+{
+  return QStringLiteral("org.olivevideoeditor.Olive.solidgenerator");
+}
+
+QList<Node::CategoryID> SolidGenerator::Category() const
+{
+  return {kCategoryGenerator};
+}
+
+QString SolidGenerator::Description() const
+{
+  return tr("Generate a solid color.");
+}
+
+void SolidGenerator::Retranslate()
+{
+  color_input_->set_name(tr("Color"));
+}
+
+Node::Capabilities SolidGenerator::GetCapabilities(const NodeValueDatabase &) const
+{
+  return kShader;
+}
+
+QString SolidGenerator::ShaderFragmentCode(const NodeValueDatabase &) const
+{
+  return ReadFileAsString(":/shaders/solid.frag");
+}
+
+OLIVE_NAMESPACE_EXIT

app/node/generator/solid/solid.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 SOLIDGENERATOR_H
+#define SOLIDGENERATOR_H
+
+#include "node/node.h"
+
+OLIVE_NAMESPACE_ENTER
+
+class SolidGenerator : public Node
+{
+public:
+  SolidGenerator();
+
+  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 Capabilities GetCapabilities(const NodeValueDatabase&) const override;
+  virtual QString ShaderFragmentCode(const NodeValueDatabase&) const override;
+
+private:
+  NodeInput* color_input_;
+
+};
+
+OLIVE_NAMESPACE_EXIT
+
+#endif // SOLIDGENERATOR_H