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

ported solid color generator to external shader

Browse Source
This commit is contained in:
itsmattkc
2019-12-15 03:07:10 +11:00
parent 61bb9fec6f
commit ae7c9597e2
9 changed files with 42 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/node/CMakeLists.txt
-1
View File
@@ -17,7 +17,6 @@
add_subdirectory(blend)
add_subdirectory(block)
add_subdirectory(distort)
add_subdirectory(generator)
add_subdirectory(input)
add_subdirectory(output)
app/node/factory.cpp
+12 -3
View File
@@ -5,7 +5,6 @@
#include "block/gap/gap.h"
#include "block/transition/crossdissolve/crossdissolve.h"
#include "distort/transform/transform.h"
#include "generator/solid/solid.h"
#include "input/media/video/video.h"
#include "input/media/audio/audio.h"
#include "output/timeline/timeline.h"
@@ -27,6 +26,7 @@ void NodeFactory::Initialize()
library_.append(new ExternalNode(":/shaders/gaussianblur.xml"));
library_.append(new ExternalNode(":/shaders/boxblur.xml"));
library_.append(new ExternalNode(":/shaders/opacity.xml"));
library_.append(new ExternalNode(":/shaders/solid.xml"));
}
void NodeFactory::Destroy()
@@ -98,6 +98,17 @@ Node* NodeFactory::CreateFromMenuAction(QAction *action)
return nullptr;
}
Node *NodeFactory::CreateFromID(const QString &id)
{
foreach (Node* n, library_) {
if (n->id() == id) {
return n->copy();
}
}
return nullptr;
}
Node *NodeFactory::CreateInternal(const NodeFactory::InternalID &id)
{
switch (id) {
@@ -111,8 +122,6 @@ Node *NodeFactory::CreateInternal(const NodeFactory::InternalID &id)
return new CrossDissolveTransition();
case kTransformDistort:
return new TransformDistort();
case kSolidGenerator:
return new SolidGenerator();
case kVideoInput:
return new VideoInput();
case kAudioInput:
app/node/factory.h
+3 -2
View File
@@ -14,7 +14,6 @@ public:
kClipBlock,
kGapBlock,
kAlphaOverBlend,
kSolidGenerator,
kAudioInput,
kTransformDistort,
kTransitionBlock,
@@ -34,7 +33,9 @@ public:
static Menu* CreateMenu();
static Node *CreateFromMenuAction(QAction* action);
static Node* CreateFromMenuAction(QAction* action);
static Node* CreateFromID(const QString& id);
private:
static Node* CreateInternal(const InternalID& id);
app/node/generator/CMakeLists.txt
-22
View File
@@ -1,22 +0,0 @@
# 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/>.
add_subdirectory(solid)
set(OLIVE_SOURCES
${OLIVE_SOURCES}
PARENT_SCOPE
)
app/node/generator/solid/CMakeLists.txt
-22
View File
@@ -1,22 +0,0 @@
# 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
-69
View File
@@ -1,69 +0,0 @@
/***
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"
SolidGenerator::SolidGenerator() :
texture_(nullptr)
{
color_input_ = new NodeInput("color_in");
color_input_->set_data_type(NodeParam::kColor);
AddInput(color_input_);
}
Node *SolidGenerator::copy() const
{
return new SolidGenerator();
}
QString SolidGenerator::Name() const
{
return tr("Solid");
}
QString SolidGenerator::id() const
{
return "org.olivevideoeditor.Olive.solidgenerator";
}
QString SolidGenerator::Category() const
{
return tr("Generator");
}
QString SolidGenerator::Description() const
{
return tr("Generate a solid color.");
}
bool SolidGenerator::IsAccelerated() const
{
return true;
}
QString SolidGenerator::AcceleratedCodeFragment() const
{
return ReadFileAsString(":/shaders/solid.frag");
}
void SolidGenerator::Retranslate()
{
color_input_->set_name(tr("Color"));
}
app/node/generator/solid/solid.h
-55
View File
@@ -1,55 +0,0 @@
/***
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 <QOpenGLTexture>
#include "node/node.h"
/**
* @brief A node that generates a solid color
*/
class SolidGenerator : public Node
{
Q_OBJECT
public:
SolidGenerator();
virtual Node* copy() const override;
virtual QString Name() const override;
virtual QString id() const override;
virtual QString Category() const override;
virtual QString Description() const override;
virtual bool IsAccelerated() const override;
virtual QString AcceleratedCodeFragment() const override;
virtual void Retranslate() override;
private:
NodeInput* color_input_;
QOpenGLTexture* texture_;
};
#endif // SOLIDGENERATOR_H
app/shaders/shaders.qrc
+1
View File
@@ -10,6 +10,7 @@
<file>opacity.frag</file>
<file>opacity.xml</file>
<file>solid.frag</file>
<file>solid.xml</file>
<file>videoinput.frag</file>
<file>videoinput.vert</file>
</qresource>
app/shaders/solid.xml
+26
View File
@@ -0,0 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<effect id="org.olivevideoeditor.Olive.solidgenerator">
<!-- Effect Name -->
<name lang="en_US">Solid</name>
<!-- Effect Category -->
<category lang="en_US">Generator</category>
<!-- Effect Description -->
<description lang="en_US">
Generate a solid color.
</description>
<description lang="en_GB">
Generate a solid colour.
</description>
<!-- Parameter: Color Value -->
<param id="color_in" type="color">
<name lang="en_US">Color</name>
<name lang="en_GB">Colour</name>
<default>1.0, 0.0, 0.0, 1.0</default>
</param>
<!-- Qt Resource path to fragment shader -->
<fragment url=":/shaders/opacity.frag" />
</effect>