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

Merge branch 'master' into gizmos

Browse Source
This commit is contained in:
itsmattkc
2020-05-06 16:35:40 +10:00
parent 2e0082b04c 78e305a593
commit 1ceefb6dba
86 changed files with 1276 additions and 1589 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/node/CMakeLists.txt
+1 -4
View File
@@ -16,6 +16,7 @@
add_subdirectory(audio)
add_subdirectory(block)
add_subdirectory(filter)
add_subdirectory(generator)
add_subdirectory(input)
add_subdirectory(math)
@@ -27,8 +28,6 @@ set(OLIVE_SOURCES
node/dependency.cpp
node/edge.h
node/edge.cpp
node/external.h
node/external.cpp
node/factory.h
node/factory.cpp
node/graph.h
@@ -39,8 +38,6 @@ set(OLIVE_SOURCES
node/inputarray.cpp
node/keyframe.h
node/keyframe.cpp
node/metareader.h
node/metareader.cpp
node/node.h
node/node.cpp
node/output.h
app/node/audio/pan/pan.cpp
+3 -3
View File
@@ -49,9 +49,9 @@ QString PanNode::id() const
return QStringLiteral("org.olivevideoeditor.Olive.pan");
}
QString PanNode::Category() const
QList<Node::CategoryID> PanNode::Category() const
{
return tr("Audio");
return {kCategoryChannels};
}
QString PanNode::Description() const
@@ -64,7 +64,7 @@ Node::Capabilities PanNode::GetCapabilities(const NodeValueDatabase &) const
return kSampleProcessor;
}
NodeInput *PanNode::ProcessesSamplesFrom(const NodeValueDatabase &value) const
NodeInput *PanNode::ProcessesSamplesFrom(const NodeValueDatabase &) const
{
return samples_input_;
}
app/node/audio/pan/pan.h
+1 -1
View File
@@ -34,7 +34,7 @@ public:
virtual QString Name() const override;
virtual QString id() const override;
virtual QString Category() const override;
virtual QList<CategoryID> Category() const override;
virtual QString Description() const override;
virtual Capabilities GetCapabilities(const NodeValueDatabase&) const override;
app/node/audio/volume/volume.cpp
+2 -2
View File
@@ -48,9 +48,9 @@ QString VolumeNode::id() const
return QStringLiteral("org.olivevideoeditor.Olive.volume");
}
QString VolumeNode::Category() const
QList<Node::CategoryID> VolumeNode::Category() const
{
return tr("Audio");
return {kCategoryFilter};
}
QString VolumeNode::Description() const
app/node/audio/volume/volume.h
+1 -1
View File
@@ -34,7 +34,7 @@ public:
virtual QString Name() const override;
virtual QString id() const override;
virtual QString Category() const override;
virtual QList<CategoryID> Category() const override;
virtual QString Description() const override;
virtual Capabilities GetCapabilities(const NodeValueDatabase&) const override;
app/node/block/block.cpp
+7 -2
View File
@@ -63,9 +63,9 @@ Block::Block() :
set_length_and_media_out(1);
}
QString Block::Category() const
QList<Node::CategoryID> Block::Category() const
{
return tr("Block");
return {kCategoryTimeline};
}
const rational &Block::in() const
@@ -365,4 +365,9 @@ void Block::InvalidateCache(const TimeRange &range, NodeInput *from, NodeInput *
Node::InvalidateCache(range, from, source);
}
void Block::Hash(QCryptographicHash &, const rational &) const
{
// A block does nothing by default
}
OLIVE_NAMESPACE_EXIT
app/node/block/block.h
+3 -1
View File
@@ -49,7 +49,7 @@ public:
virtual Type type() const = 0;
virtual QString Category() const override;
virtual QList<CategoryID> Category() const override;
const rational& in() const;
const rational& out() const;
@@ -99,6 +99,8 @@ public:
virtual void InvalidateCache(const TimeRange& range, NodeInput* from, NodeInput* source) override;
virtual void Hash(QCryptographicHash &hash, const rational &time) const override;
public slots:
signals:
app/node/block/clip/clip.cpp
+9
View File
@@ -119,4 +119,13 @@ void ClipBlock::Retranslate()
texture_input_->set_name(tr("Buffer"));
}
void ClipBlock::Hash(QCryptographicHash &hash, const rational &time) const
{
if (texture_input_->IsConnected()) {
rational t = InputTimeAdjustment(texture_input_, TimeRange(time, time)).in();
texture_input_->get_connected_node()->Hash(hash, t);
}
}
OLIVE_NAMESPACE_EXIT
app/node/block/clip/clip.h
+2
View File
@@ -54,6 +54,8 @@ public:
virtual void Retranslate() override;
virtual void Hash(QCryptographicHash &hash, const rational &time) const override;
signals:
void PreviewUpdated();
app/node/block/transition/CMakeLists.txt
-2
View File
@@ -16,8 +16,6 @@
set(OLIVE_SOURCES
${OLIVE_SOURCES}
node/block/transition/externaltransition.h
node/block/transition/externaltransition.cpp
node/block/transition/transition.h
node/block/transition/transition.cpp
PARENT_SCOPE
app/node/block/transition/externaltransition.cpp
-93
View File
@@ -1,93 +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 "externaltransition.h"
OLIVE_NAMESPACE_ENTER
ExternalTransition::ExternalTransition(const QString &xml_meta_filename) :
meta_(xml_meta_filename)
{
foreach (NodeInput* input, meta_.inputs()) {
AddInput(input);
}
}
Node *ExternalTransition::copy() const
{
return new ExternalTransition(meta_.filename());
}
QString ExternalTransition::Name() const
{
return meta_.Name();
}
QString ExternalTransition::ShortName() const
{
return meta_.ShortName();
}
QString ExternalTransition::id() const
{
return meta_.id();
}
QString ExternalTransition::Category() const
{
return meta_.Category();
}
QString ExternalTransition::Description() const
{
return meta_.Description();
}
void ExternalTransition::Retranslate()
{
meta_.Retranslate();
}
Node::Capabilities ExternalTransition::GetCapabilities(const NodeValueDatabase &) const
{
return kShader;
}
QString ExternalTransition::ShaderVertexCode(const NodeValueDatabase &) const
{
return meta_.vert_code();
}
QString ExternalTransition::ShaderFragmentCode(const NodeValueDatabase&) const
{
return meta_.frag_code();
}
int ExternalTransition::ShaderIterations() const
{
return meta_.iterations();
}
NodeInput *ExternalTransition::ShaderIterativeInput() const
{
return meta_.iteration_input();
}
OLIVE_NAMESPACE_EXIT
app/node/block/transition/transition.cpp
+8 -2
View File
@@ -131,8 +131,6 @@ double TransitionBlock::GetInProgress(const rational &time) const
void TransitionBlock::Hash(QCryptographicHash &hash, const rational &time) const
{
Block::Hash(hash, time);
double all_prog = GetTotalProgress(time);
double in_prog = GetInProgress(time);
double out_prog = GetOutProgress(time);
@@ -140,6 +138,14 @@ 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_->IsConnected()) {
out_block_input_->get_connected_node()->Hash(hash, time);
}
if (in_block_input_->IsConnected()) {
in_block_input_->get_connected_node()->Hash(hash, time);
}
}
double TransitionBlock::GetInternalTransitionTime(const rational &time) const
app/node/external.cpp
-95
View File
@@ -1,95 +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 "external.h"
#include <QFile>
OLIVE_NAMESPACE_ENTER
ExternalNode::ExternalNode(const QString &xml_meta_filename) :
meta_(xml_meta_filename)
{
foreach (NodeInput* input, meta_.inputs()) {
AddInput(input);
}
}
Node *ExternalNode::copy() const
{
return new ExternalNode(meta_.filename());
}
QString ExternalNode::Name() const
{
return meta_.Name();
}
QString ExternalNode::ShortName() const
{
return meta_.ShortName();
}
QString ExternalNode::id() const
{
return meta_.id();
}
QString ExternalNode::Category() const
{
return meta_.Category();
}
QString ExternalNode::Description() const
{
return meta_.Description();
}
void ExternalNode::Retranslate()
{
meta_.Retranslate();
}
Node::Capabilities ExternalNode::GetCapabilities(const NodeValueDatabase &) const
{
return kShader;
}
QString ExternalNode::ShaderVertexCode(const NodeValueDatabase&) const
{
return meta_.vert_code();
}
QString ExternalNode::ShaderFragmentCode(const NodeValueDatabase&) const
{
return meta_.frag_code();
}
int ExternalNode::ShaderIterations() const
{
return meta_.iterations();
}
NodeInput *ExternalNode::ShaderIterativeInput() const
{
return meta_.iteration_input();
}
OLIVE_NAMESPACE_EXIT
app/node/factory.cpp
+29 -31
View File
@@ -24,17 +24,19 @@
#include "audio/volume/volume.h"
#include "block/clip/clip.h"
#include "block/gap/gap.h"
#include "block/transition/externaltransition.h"
#include "generator/matrix/matrix.h"
#include "generator/polygon/polygon.h"
#include "generator/solid/solid.h"
#include "filter/blur/blur.h"
#include "filter/stroke/stroke.h"
#include "input/media/video/video.h"
#include "input/media/audio/audio.h"
#include "input/time/timeinput.h"
#include "math/math/math.h"
#include "math/merge/merge.h"
#include "math/trigonometry/trigonometry.h"
#include "output/track/track.h"
#include "output/viewer/viewer.h"
#include "external.h"
OLIVE_NAMESPACE_ENTER
QList<Node*> NodeFactory::library_;
@@ -48,13 +50,10 @@ void NodeFactory::Initialize()
library_.append(CreateInternal(static_cast<InternalID>(i)));
}
library_.append(new ExternalNode(":/shaders/blur.xml"));
library_.append(new ExternalNode(":/shaders/solid.xml"));
library_.append(new ExternalNode(":/shaders/stroke.xml"));
library_.append(new ExternalNode(":/shaders/alphaover.xml"));
library_.append(new ExternalNode(":/shaders/dropshadow.xml"));
/*
library_.append(new ExternalTransition(":/shaders/crossdissolve.xml"));
library_.append(new ExternalTransition(":/shaders/diptoblack.xml"));
*/
}
void NodeFactory::Destroy()
@@ -74,34 +73,25 @@ Menu *NodeFactory::CreateMenu(QWidget* parent)
// Make sure nodes are up-to-date with the current translation
n->Retranslate();
QStringList path = n->Category().split('/');
Menu* destination = nullptr;
Menu* destination = menu;
QString category_name = Node::GetCategoryName(n->Category().isEmpty()
? Node::kCategoryUnknown
: n->Category().first());
// Find destination menu based on category hierarchy
foreach (const QString& dir_name, path) {
// Ignore an empty directory
if (dir_name.isEmpty()) {
continue;
// See if a menu with this category name already exists
QList<QAction*> menu_actions = menu->actions();
foreach (QAction* action, menu_actions) {
if (action->menu() && action->menu()->title() == category_name) {
destination = static_cast<Menu*>(action->menu());
break;
}
}
// See if a menu with this dir_name already exists
bool found_cat = false;
QList<QAction*> menu_actions = destination->actions();
foreach (QAction* action, menu_actions) {
if (action->menu() && action->menu()->title() == dir_name) {
destination = static_cast<Menu*>(action->menu());
found_cat = true;
break;
}
}
// Create menu here if it doesn't exist
if (!found_cat) {
Menu* new_category = new Menu(dir_name, destination);
destination->InsertAlphabetically(new_category);
destination = new_category;
}
// Create menu here if it doesn't exist
if (!destination) {
destination = new Menu(category_name, menu);
menu->InsertAlphabetically(destination);
}
// Add entry to menu
@@ -164,6 +154,14 @@ Node *NodeFactory::CreateInternal(const NodeFactory::InternalID &id)
return new TrigonometryNode();
case kTime:
return new TimeInput();
case kBlurFilter:
return new BlurFilterNode();
case kSolidGenerator:
return new SolidGenerator();
case kMerge:
return new MergeNode();
case kStrokeFilter:
return new StrokeFilterNode();
case kInternalNodeCount:
break;
app/node/factory.h
+4
View File
@@ -45,6 +45,10 @@ public:
kMath,
kTime,
kTrigonometry,
kBlurFilter,
kSolidGenerator,
kMerge,
kStrokeFilter,
// Count value
kInternalNodeCount
app/node/filter/CMakeLists.txt
+23
View File
@@ -0,0 +1,23 @@
# 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(blur)
add_subdirectory(stroke)
set(OLIVE_SOURCES
${OLIVE_SOURCES}
PARENT_SCOPE
)
app/node/filter/blur/CMakeLists.txt
+22
View File
@@ -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/filter/blur/blur.h
node/filter/blur/blur.cpp
PARENT_SCOPE
)
app/node/filter/blur/blur.cpp
+104
View File
@@ -0,0 +1,104 @@
/***
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 "blur.h"
OLIVE_NAMESPACE_ENTER
BlurFilterNode::BlurFilterNode()
{
texture_input_ = new NodeInput("tex_in", NodeParam::kTexture);
AddInput(texture_input_);
method_input_ = new NodeInput("method_in", NodeParam::kCombo, 0);
AddInput(method_input_);
radius_input_ = new NodeInput("radius_in", NodeParam::kFloat, 10.0f);
radius_input_->set_property(QStringLiteral("min"), 0.0f);
AddInput(radius_input_);
horiz_input_ = new NodeInput("horiz_in", NodeParam::kBoolean, true);
AddInput(horiz_input_);
vert_input_ = new NodeInput("vert_in", NodeParam::kBoolean, true);
AddInput(vert_input_);
repeat_edge_pixels_input_ = new NodeInput("repeat_edge_pixels_in", NodeParam::kBoolean, false);
AddInput(repeat_edge_pixels_input_);
}
Node *BlurFilterNode::copy() const
{
return new BlurFilterNode();
}
QString BlurFilterNode::Name() const
{
return tr("Blur");
}
QString BlurFilterNode::id() const
{
return QStringLiteral("org.olivevideoeditor.Olive.blur");
}
QList<Node::CategoryID> BlurFilterNode::Category() const
{
return {kCategoryFilter};
}
QString BlurFilterNode::Description() const
{
return tr("Blurs an image.");
}
void BlurFilterNode::Retranslate()
{
texture_input_->set_name(tr("Input"));
method_input_->set_name(tr("Method"));
method_input_->set_combobox_strings({ tr("Box"), tr("Gaussian") });
radius_input_->set_name(tr("Radius"));
horiz_input_->set_name(tr("Horizontal"));
vert_input_->set_name(tr("Vertical"));
repeat_edge_pixels_input_->set_name(tr("Repeat Edge Pixels"));
}
Node::Capabilities BlurFilterNode::GetCapabilities(const NodeValueDatabase &) const
{
return kShader;
}
QString BlurFilterNode::ShaderFragmentCode(const NodeValueDatabase &) const
{
return ReadFileAsString(":/shaders/blur.frag");
}
int BlurFilterNode::ShaderIterations() const
{
// FIXME: Optimize if horiz_in or vert_in is disabled
return 2;
}
NodeInput *BlurFilterNode::ShaderIterativeInput() const
{
return texture_input_;
}
OLIVE_NAMESPACE_EXIT
app/node/block/transition/externaltransition.h → app/node/filter/blur/blur.h
+20 -12
View File
@@ -18,40 +18,48 @@
***/
#ifndef EXTERNALTRANSITION_H
#define EXTERNALTRANSITION_H
#ifndef BLURFILTERNODE_H
#define BLURFILTERNODE_H
#include "transition.h"
#include "node/metareader.h"
#include "node/node.h"
OLIVE_NAMESPACE_ENTER
class ExternalTransition : public TransitionBlock
class BlurFilterNode : public Node
{
public:
ExternalTransition(const QString& xml_meta_filename);
BlurFilterNode();
virtual Node* copy() const override;
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;
virtual Capabilities GetCapabilities(const NodeValueDatabase&) const override;
virtual QString ShaderVertexCode(const NodeValueDatabase&) const override;
virtual QString ShaderFragmentCode(const NodeValueDatabase&) const override;
virtual int ShaderIterations() const override;
virtual NodeInput* ShaderIterativeInput() const override;
private:
NodeMetaReader meta_;
NodeInput* texture_input_;
NodeInput* method_input_;
NodeInput* radius_input_;
NodeInput* horiz_input_;
NodeInput* vert_input_;
NodeInput* repeat_edge_pixels_input_;
};
OLIVE_NAMESPACE_EXIT
#endif // EXTERNALTRANSITION_H
#endif // BLURFILTERNODE_H
app/node/filter/stroke/CMakeLists.txt
+22
View File
@@ -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/filter/stroke/stroke.h
node/filter/stroke/stroke.cpp
PARENT_SCOPE
)
app/node/filter/stroke/stroke.cpp
+95
View File
@@ -0,0 +1,95 @@
/***
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 "stroke.h"
#include "render/color.h"
OLIVE_NAMESPACE_ENTER
StrokeFilterNode::StrokeFilterNode()
{
tex_input_ = new NodeInput("tex_in", NodeParam::kTexture);
AddInput(tex_input_);
color_input_ = new NodeInput("color_in",
NodeParam::kColor,
QVariant::fromValue(Color(1.0f, 1.0f, 1.0f, 1.0f)));
AddInput(color_input_);
radius_input_ = new NodeInput("radius_in", NodeParam::kFloat, 10.0f);
radius_input_->set_property("min", 0.0f);
AddInput(radius_input_);
opacity_input_ = new NodeInput("opacity_in", NodeParam::kFloat, 1.0f);
opacity_input_->set_property("view", "percent");
opacity_input_->set_property("min", 0.0f);
opacity_input_->set_property("max", 1.0f);
AddInput(opacity_input_);
inner_input_ = new NodeInput("inner_in", NodeParam::kBoolean, false);
AddInput(inner_input_);
}
Node *StrokeFilterNode::copy() const
{
return new StrokeFilterNode();
}
QString StrokeFilterNode::Name() const
{
return tr("Stroke");
}
QString StrokeFilterNode::id() const
{
return QStringLiteral("org.olivevideoeditor.Olive.stroke");
}
QList<Node::CategoryID> StrokeFilterNode::Category() const
{
return {kCategoryFilter};
}
QString StrokeFilterNode::Description() const
{
return tr("Creates a stroke outline around an image.");
}
void StrokeFilterNode::Retranslate()
{
tex_input_->set_name(tr("Input"));
color_input_->set_name(tr("Color"));
radius_input_->set_name(tr("Radius"));
opacity_input_->set_name(tr("Opacity"));
inner_input_->set_name(tr("Inner"));
}
Node::Capabilities StrokeFilterNode::GetCapabilities(const NodeValueDatabase &) const
{
return kShader;
}
QString StrokeFilterNode::ShaderFragmentCode(const NodeValueDatabase &) const
{
return ReadFileAsString(":/shaders/stroke.frag");
}
OLIVE_NAMESPACE_EXIT
app/node/external.h → app/node/filter/stroke/stroke.h
+17 -18
View File
@@ -18,44 +18,43 @@
***/
#ifndef EXTERNALNODE_H
#define EXTERNALNODE_H
#ifndef STROKEFILTERNODE_H
#define STROKEFILTERNODE_H
#include <QXmlStreamReader>
#include "node.h"
#include "metareader.h"
#include "node/node.h"
OLIVE_NAMESPACE_ENTER
/**
* @brief A node generated from an external XML metadata file
*/
class ExternalNode : public Node
class StrokeFilterNode : public Node
{
public:
ExternalNode(const QString& xml_meta_filename);
StrokeFilterNode();
virtual Node* copy() const override;
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;
virtual Capabilities GetCapabilities(const NodeValueDatabase&) const override;
virtual QString ShaderVertexCode(const NodeValueDatabase&) const override;
virtual QString ShaderFragmentCode(const NodeValueDatabase&) const override;
virtual int ShaderIterations() const override;
virtual NodeInput* ShaderIterativeInput() const override;
private:
NodeMetaReader meta_;
NodeInput* tex_input_;
NodeInput* color_input_;
NodeInput* radius_input_;
NodeInput* opacity_input_;
NodeInput* inner_input_;
};
OLIVE_NAMESPACE_EXIT
#endif // EXTERNALNODE_H
#endif // STROKEFILTERNODE_H
app/node/generator/CMakeLists.txt
+1
View File
@@ -16,6 +16,7 @@
add_subdirectory(matrix)
add_subdirectory(polygon)
add_subdirectory(solid)
set(OLIVE_SOURCES
${OLIVE_SOURCES}
app/node/generator/matrix/matrix.cpp
+2 -2
View File
@@ -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
+1 -1
View File
@@ -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
+22
View File
@@ -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
+76
View File
@@ -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
+52
View File
@@ -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
app/node/input/media/media.cpp
+2 -2
View File
@@ -35,9 +35,9 @@ MediaInput::MediaInput() :
AddInput(footage_input_);
}
QString MediaInput::Category() const
QList<Node::CategoryID> MediaInput::Category() const
{
return tr("Input");
return {kCategoryInput};
}
StreamPtr MediaInput::footage()
app/node/input/media/media.h
+1 -1
View File
@@ -35,7 +35,7 @@ class MediaInput : public Node
public:
MediaInput();
virtual QString Category() const override;
virtual QList<CategoryID> Category() const override;
StreamPtr footage();
void SetFootage(StreamPtr f);
app/node/input/time/timeinput.cpp
+2 -2
View File
@@ -41,9 +41,9 @@ QString TimeInput::id() const
return QStringLiteral("org.olivevideoeditor.Olive.time");
}
QString TimeInput::Category() const
QList<Node::CategoryID> TimeInput::Category() const
{
return tr("Input");
return {kCategoryInput};
}
QString TimeInput::Description() const
app/node/input/time/timeinput.h
+1 -1
View File
@@ -35,7 +35,7 @@ public:
virtual QString Name() const override;
virtual QString id() const override;
virtual QString Category() const override;
virtual QList<CategoryID> Category() const override;
virtual QString Description() const override;
virtual NodeValueTable Value(NodeValueDatabase& value) const override;
app/node/math/CMakeLists.txt
+1
View File
@@ -15,6 +15,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
add_subdirectory(math)
add_subdirectory(merge)
add_subdirectory(trigonometry)
set(OLIVE_SOURCES
app/node/math/math/math.cpp
+2 -2
View File
@@ -61,9 +61,9 @@ QString MathNode::id() const
return QStringLiteral("org.olivevideoeditor.Olive.math");
}
QString MathNode::Category() const
QList<Node::CategoryID> MathNode::Category() const
{
return tr("Math");
return {kCategoryMath};
}
QString MathNode::Description() const
app/node/math/math/math.h
+1 -1
View File
@@ -34,7 +34,7 @@ public:
virtual QString Name() 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/math/merge/CMakeLists.txt
+22
View File
@@ -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/math/merge/merge.h
node/math/merge/merge.cpp
PARENT_SCOPE
)
app/node/math/merge/merge.cpp
+96
View File
@@ -0,0 +1,96 @@
/***
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 "merge.h"
OLIVE_NAMESPACE_ENTER
MergeNode::MergeNode()
{
base_in_ = new NodeInput("base_in", NodeParam::kTexture);
AddInput(base_in_);
blend_in_ = new NodeInput("blend_in", NodeParam::kTexture);
AddInput(blend_in_);
}
Node *MergeNode::copy() const
{
return new MergeNode();
}
QString MergeNode::Name() const
{
return tr("Merge");
}
QString MergeNode::id() const
{
return QStringLiteral("org.olivevideoeditor.Olive.merge");
}
QList<Node::CategoryID> MergeNode::Category() const
{
return {kCategoryMath};
}
QString MergeNode::Description() const
{
return tr("Merge two textures together.");
}
void MergeNode::Retranslate()
{
base_in_->set_name(tr("Base"));
blend_in_->set_name(tr("Blend"));
}
Node::Capabilities MergeNode::GetCapabilities(const NodeValueDatabase &) const
{
return kShader;
}
QString MergeNode::ShaderFragmentCode(const NodeValueDatabase &) const
{
return ReadFileAsString(":/shaders/alphaover.frag");
}
NodeInput *MergeNode::base_in() const
{
return base_in_;
}
NodeInput *MergeNode::blend_in() const
{
return blend_in_;
}
void MergeNode::Hash(QCryptographicHash &hash, const rational &time) const
{
if (base_in_->IsConnected()) {
base_in_->get_connected_node()->Hash(hash, time);
}
if (blend_in_->IsConnected()) {
blend_in_->get_connected_node()->Hash(hash, time);
}
}
OLIVE_NAMESPACE_EXIT
app/node/math/merge/merge.h
+59
View File
@@ -0,0 +1,59 @@
/***
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 MERGENODE_H
#define MERGENODE_H
#include "node/node.h"
OLIVE_NAMESPACE_ENTER
class MergeNode : public Node
{
public:
MergeNode();
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;
NodeInput* base_in() const;
NodeInput* blend_in() const;
virtual void Hash(QCryptographicHash &hash, const rational &time) const override;
private:
NodeInput* base_in_;
NodeInput* blend_in_;
};
OLIVE_NAMESPACE_EXIT
#endif // MERGENODE_H
app/node/math/trigonometry/trigonometry.cpp
+2 -2
View File
@@ -48,9 +48,9 @@ QString TrigonometryNode::id() const
return QStringLiteral("org.olivevideoeditor.Olive.trigonometry");
}
QString TrigonometryNode::Category() const
QList<Node::CategoryID> TrigonometryNode::Category() const
{
return tr("Math");
return {kCategoryMath};
}
QString TrigonometryNode::Description() const
app/node/math/trigonometry/trigonometry.h
+1 -1
View File
@@ -34,7 +34,7 @@ public:
virtual QString Name() 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/metareader.cpp
-386
View File
@@ -1,386 +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 "metareader.h"
#include <QFile>
#include "common/xmlutils.h"
#include "config/config.h"
#include "node.h"
OLIVE_NAMESPACE_ENTER
NodeMetaReader::NodeMetaReader(const QString &xml_meta_filename) :
xml_filename_(xml_meta_filename),
iterations_(1),
iteration_input_(nullptr)
{
QFile metadata_file(xml_filename_);
if (metadata_file.open(QFile::ReadOnly)) {
QXmlStreamReader reader(&metadata_file);
while (XMLReadNextStartElement(&reader)) {
if (reader.name() == QStringLiteral("effect")) {
XMLReadEffect(&reader);
} else {
reader.skipCurrentElement();
}
}
metadata_file.close();
} else {
qWarning() << "Failed to load node metadata file" << xml_filename_;
}
}
QString NodeMetaReader::Name() const
{
return GetStringForCurrentLanguage(&names_);
}
QString NodeMetaReader::ShortName() const
{
if (short_names_.isEmpty()) {
return Name();
} else {
return GetStringForCurrentLanguage(&short_names_);
}
}
const QString &NodeMetaReader::id() const
{
return id_;
}
QString NodeMetaReader::Category() const
{
return GetStringForCurrentLanguage(&categories_);
}
QString NodeMetaReader::Description() const
{
return GetStringForCurrentLanguage(&descriptions_);
}
const QString &NodeMetaReader::filename() const
{
return xml_filename_;
}
const QString &NodeMetaReader::frag_code() const
{
return frag_code_;
}
const QString &NodeMetaReader::vert_code() const
{
return vert_code_;
}
const int &NodeMetaReader::iterations() const
{
return iterations_;
}
NodeInput *NodeMetaReader::iteration_input() const
{
return iteration_input_;
}
const QList<NodeInput *> &NodeMetaReader::inputs() const
{
return inputs_;
}
void NodeMetaReader::Retranslate()
{
{
// Re-translate every parameter name
QMap<QString, LanguageMap>::const_iterator iterator;
// Iterate through parameter language tables that we have
for (iterator=param_names_.begin();iterator!=param_names_.end();iterator++) {
NodeInput* this_input = GetInputWithID(iterator.key());
this_input->set_name(GetStringForCurrentLanguage(&iterator.value()));
}
}
{
// Re-translate any combobox items
QMap<QString, QList<LanguageMap> >::const_iterator param_it;
for (param_it=combo_names_.begin(); param_it!=combo_names_.end(); param_it++) {
NodeInput* input = GetInputWithID(param_it.key());
QStringList combo_items;
foreach (const LanguageMap& lang_map, param_it.value()) {
combo_items.append(GetStringForCurrentLanguage(&lang_map));
}
input->set_combobox_strings(combo_items);
}
}
}
void NodeMetaReader::XMLReadLanguageString(QXmlStreamReader* reader, LanguageMap* map)
{
QString lang;
// Traverse through name attributes for its language
XMLAttributeLoop(reader, attr) {
if (attr.name() == QStringLiteral("lang")) {
lang = attr.value().toString();
// We don't recognize any other "name" attributes at this time
break;
}
}
// Insert name with language into map
map->insert(lang, reader->readElementText().trimmed());
}
void NodeMetaReader::XMLReadEffect(QXmlStreamReader* reader)
{
// Traverse through effect attributes for an ID
XMLAttributeLoop(reader, attr) {
if (attr.name() == QStringLiteral("id")) {
id_ = attr.value().toString();
// We don't recognize any other "effect" attributes at this time
break;
}
}
if (id_.isEmpty()) {
qWarning() << "Effect metadata" << xml_filename_ << "has no ID";
return;
}
// Continue reading for other metadata
while (XMLReadNextStartElement(reader)) {
if (reader->name() == QStringLiteral("name")) {
// Pick up name
XMLReadLanguageString(reader, &names_);
} else if (reader->name() == QStringLiteral("shortnames")) {
// Pick up short name
XMLReadLanguageString(reader, &short_names_);
} else if (reader->name() == QStringLiteral("category")) {
// Pick up category
XMLReadLanguageString(reader, &categories_);
} else if (reader->name() == QStringLiteral("description")) {
// Pick up description
XMLReadLanguageString(reader, &descriptions_);
} else if (reader->name() == QStringLiteral("iterations")) {
// Pick up iterations
XMLReadIterations(reader);
} else if (reader->name() == QStringLiteral("fragment")) {
// Pick up fragment shader code
XMLReadShader(reader, frag_code_);
} else if (reader->name() == QStringLiteral("vertex")) {
// Pick up vertex shader code
XMLReadShader(reader, vert_code_);
} else if (reader->name() == QStringLiteral("param")) {
// Pick up a parameter
XMLReadParam(reader);
} else {
reader->skipCurrentElement();
}
}
}
void NodeMetaReader::XMLReadIterations(QXmlStreamReader* reader)
{
int iteration_pickup = reader->readElementText().toInt();
if (iterations_ > 0) {
iterations_ = iteration_pickup;
} else {
// If the iteration value is invalid, don't set it, print an error instead
qWarning() << "Invalid iteration number in" << xml_filename_ << "- setting to default (1)";
}
}
void NodeMetaReader::XMLReadParam(QXmlStreamReader *reader)
{
QString param_id;
NodeParam::DataType param_type = NodeParam::kAny;
bool is_iterative = false;
// Traverse through parameter attributes for an ID
XMLAttributeLoop(reader, attr) {
if (attr.name() == QStringLiteral("id")) {
param_id = attr.value().toString();
} else if (attr.name() == QStringLiteral("type")) {
param_type = NodeParam::StringToDataType(attr.value().toString());
} else if (attr.name() == QStringLiteral("iterative_input")) {
is_iterative = true;
}
}
if (param_id.isEmpty()) {
qWarning() << "Effect metadata" << xml_filename_ << "contains a parameter with no ID - parameter was not added";
return;
}
QVector<QVariant> default_val;
QHash<QString, QVariant> properties;
LanguageMap param_names;
QList<LanguageMap> combo_names;
QList<LanguageMap> combo_descriptions;
// Traverse through param contents for more data
while (XMLReadNextStartElement(reader)) {
// NOTE: readElementText() returns a string, but for number types (which min and max apply to), QVariant will
// convert them automatically
if (reader->name() == QStringLiteral("name")) {
// Insert language into map
XMLReadLanguageString(reader, &param_names);
} else if (reader->name() == QStringLiteral("default")) {
// Reads the default value
while (XMLReadNextStartElement(reader)) {
if (reader->name() == QStringLiteral("value")) {
default_val.append(NodeInput::StringToValue(param_type, reader->readElementText()));
} else {
reader->skipCurrentElement();
}
}
} else if (reader->name() == QStringLiteral("option")) {
// Read names and descriptions
LanguageMap names;
LanguageMap descriptions;
while (XMLReadNextStartElement(reader)) {
if (reader->name() == QStringLiteral("name")) {
XMLReadLanguageString(reader, &names);
} else if (reader->name() == QStringLiteral("description")) {
XMLReadLanguageString(reader, &descriptions);
} else {
reader->skipCurrentElement();
}
}
combo_names.append(names);
combo_descriptions.append(descriptions);
} else {
properties.insert(reader->name().toString(), reader->readElementText());
}
}
param_names_.insert(param_id, param_names);
// Insert combo options if they exist
if (!combo_names.isEmpty()) {
combo_names_.insert(param_id, combo_names);
combo_descriptions_.insert(param_id, combo_descriptions);
}
NodeInput* input = new NodeInput(param_id, param_type, default_val);
QHash<QString, QVariant>::const_iterator iterator;
for (iterator=properties.begin();iterator!=properties.end();iterator++) {
input->set_property(iterator.key(), iterator.value());
}
if (is_iterative) {
iteration_input_ = input;
}
inputs_.append(input);
}
void NodeMetaReader::XMLReadShader(QXmlStreamReader *reader, QString &destination)
{
QString code_url;
// Traverse through parameter attributes for an ID
XMLAttributeLoop(reader, attr) {
if (attr.name() == QStringLiteral("url")) {
code_url = attr.value().toString();
// We don't recognize any other "shader" attributes at this time
break;
}
}
// Add code in file from URL
if (!code_url.isEmpty()) {
destination.append(Node::ReadFileAsString(code_url));
}
// Add any code that's inline in the XML
QString element_text = reader->readElementText().trimmed();
if (!element_text.isEmpty()) {
destination.append(element_text);
}
}
QString NodeMetaReader::GetStringForCurrentLanguage(const LanguageMap *language_map)
{
if (language_map->isEmpty()) {
// There are no entries for this map, this must be an empty string
return QString();
}
// Get current language config
QString language = Config::Current()[QStringLiteral("Language")].toString();
// See if our map has an exact language match
QString str_for_lang = language_map->value(language);
if (!str_for_lang.isEmpty()) {
return str_for_lang;
}
// If not, try to find a match with the same language but not the same derivation
QString base_lang = language.split('_').first();
QList<QString> available_languages = language_map->keys();
foreach (const QString& l, available_languages) {
if (l.startsWith(base_lang)) {
// This is the same language, so we can return this
return language_map->value(l);
}
}
// We couldn't find an exact or close match, just return the first in the list
// (assume a string in the wrong language is better than no string at all)
return language_map->first();
}
NodeInput *NodeMetaReader::GetInputWithID(const QString &id) const
{
foreach (NodeInput* input, inputs_) {
if (input->id() == id) {
return input;
}
}
return nullptr;
}
OLIVE_NAMESPACE_EXIT
app/node/metareader.h
-91
View File
@@ -1,91 +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 NODEMETAREADER_H
#define NODEMETAREADER_H
#include <QMap>
#include <QString>
#include <QXmlStreamReader>
#include "input.h"
OLIVE_NAMESPACE_ENTER
class NodeMetaReader
{
public:
NodeMetaReader(const QString& xml_meta_filename);
QString Name() const;
QString ShortName() const;
const QString& id() const;
QString Category() const;
QString Description() const;
const QString& filename() const;
const QString& frag_code() const;
const QString& vert_code() const;
const int& iterations() const;
NodeInput* iteration_input() const;
const QList<NodeInput*>& inputs() const;
void Retranslate();
private:
using LanguageMap = QMap<QString, QString>;
void XMLReadLanguageString(QXmlStreamReader* reader, LanguageMap *map);
void XMLReadEffect(QXmlStreamReader *reader);
void XMLReadIterations(QXmlStreamReader* reader);
void XMLReadParam(QXmlStreamReader* reader);
void XMLReadShader(QXmlStreamReader* reader, QString& destination);
static QString GetStringForCurrentLanguage(const LanguageMap *language_map);
NodeInput* GetInputWithID(const QString& id) const;
QString xml_filename_;
LanguageMap names_;
LanguageMap short_names_;
LanguageMap descriptions_;
LanguageMap categories_;
QMap<QString, LanguageMap > param_names_;
QMap<QString, QList<LanguageMap> > combo_names_;
QMap<QString, QList<LanguageMap> > combo_descriptions_;
QString id_;
QString frag_code_;
QString vert_code_;
int iterations_;
NodeInput* iteration_input_;
QList<NodeInput*> inputs_;
};
OLIVE_NAMESPACE_EXIT
#endif // NODEMETAREADER_H
app/node/node.cpp
+29 -6
View File
@@ -127,12 +127,6 @@ QString Node::ShortName() const
return Name();
}
QString Node::Category() const
{
// Return an empty category for any nodes that don't use one
return QString();
}
QString Node::Description() const
{
// Return an empty string by default
@@ -582,6 +576,35 @@ void Node::DisconnectAll()
}
}
QString Node::GetCategoryName(const CategoryID &c)
{
switch (c) {
case kCategoryInput:
return tr("Input");
case kCategoryOutput:
return tr("Output");
case kCategoryGeneral:
return tr("General");
case kCategoryMath:
return tr("Math");
case kCategoryColor:
return tr("Color");
case kCategoryFilter:
return tr("Filter");
case kCategoryTimeline:
return tr("Timeline");
case kCategoryGenerator:
return tr("Generator");
case kCategoryChannels:
return tr("Channel");
case kCategoryUnknown:
case kCategoryCount:
break;
}
return tr("Uncategorized");
}
QList<TimeRange> Node::TransformTimeTo(const TimeRange &time, Node *target, NodeParam::Type direction)
{
QList<TimeRange> paths_found;
app/node/node.h
+22 -1
View File
@@ -62,6 +62,22 @@ public:
kSampleProcessor = 0x2
};
enum CategoryID {
kCategoryUnknown = -1,
kCategoryInput,
kCategoryOutput,
kCategoryGenerator,
kCategoryMath,
kCategoryFilter,
kCategoryColor,
kCategoryGeneral,
kCategoryTimeline,
kCategoryChannels,
kCategoryCount
};
Node();
virtual ~Node() override;
@@ -116,7 +132,7 @@ public:
* interpreted as an empty string category. This value should be run through a translator as its largely user
* oriented.
*/
virtual QString Category() const;
virtual QList<CategoryID> Category() const = 0;
/**
* @brief Return a description of this node's purpose (optional for subclassing, but recommended)
@@ -242,6 +258,11 @@ public:
*/
void DisconnectAll();
/**
* @brief Get the human-readable name for any category
*/
static QString GetCategoryName(const CategoryID &c);
/**
* @brief Transforms time from this node through the connections it takes to get to the specified node
*/
app/node/output/track/track.cpp
+4 -4
View File
@@ -80,9 +80,9 @@ QString TrackOutput::id() const
return QStringLiteral("org.olivevideoeditor.Olive.track");
}
QString TrackOutput::Category() const
QList<Node::CategoryID> TrackOutput::Category() const
{
return tr("Output");
return {kCategoryTimeline};
}
QString TrackOutput::Description() const
@@ -420,11 +420,11 @@ NodeInputArray *TrackOutput::block_input() const
void TrackOutput::Hash(QCryptographicHash &hash, const rational &time) const
{
// Resolve block list
Block* b = BlockAtTime(time);
// Defer to block at this time, don't add any of our own information to the hash
if (b) {
return b->Hash(hash, time);
b->Hash(hash, time);
}
}
app/node/output/track/track.h
+1 -1
View File
@@ -44,7 +44,7 @@ public:
virtual QString Name() const override;
virtual QString id() const override;
virtual QString Category() const override;
virtual QList<CategoryID> Category() const override;
virtual QString Description() const override;
QString GetTrackName();
app/node/output/track/tracklist.cpp
+4 -3
View File
@@ -22,6 +22,7 @@
#include "node/factory.h"
#include "node/math/math/math.h"
#include "node/math/merge/merge.h"
#include "node/output/viewer/viewer.h"
OLIVE_NAMESPACE_ENTER
@@ -104,11 +105,11 @@ TrackOutput* TrackList::AddTrack()
switch (type_) {
case Timeline::kTrackTypeVideo:
{
Node* blend = NodeFactory::CreateFromID(QStringLiteral("org.olivevideoeditor.Olive.alphaoverblend"));
MergeNode* blend = new MergeNode();
GetParentGraph()->AddNode(blend);
NodeParam::ConnectEdge(track->output(), static_cast<NodeInput*>(blend->GetInputWithID("blend_in")));
NodeParam::ConnectEdge(last_track->output(), static_cast<NodeInput*>(blend->GetInputWithID("base_in")));
NodeParam::ConnectEdge(track->output(), blend->blend_in());
NodeParam::ConnectEdge(last_track->output(), blend->base_in());
NodeParam::ConnectEdge(blend->output(), edge->input());
break;
}
app/node/output/viewer/viewer.cpp
+2 -2
View File
@@ -72,9 +72,9 @@ QString ViewerOutput::id() const
return QStringLiteral("org.olivevideoeditor.Olive.vieweroutput");
}
QString ViewerOutput::Category() const
QList<Node::CategoryID> ViewerOutput::Category() const
{
return tr("Output");
return {kCategoryOutput};
}
QString ViewerOutput::Description() const
app/node/output/viewer/viewer.h
+1 -1
View File
@@ -49,7 +49,7 @@ public:
virtual QString Name() const override;
virtual QString id() const override;
virtual QString Category() const override;
virtual QList<CategoryID> Category() const override;
virtual QString Description() const override;
NodeInput* texture_input() const;