began support of timeline tracks/channels

This commit is contained in:
itsmattkc
2019-08-15 23:40:22 +10:00
parent fb7c7f1bdb
commit 7d9d12ee0b
25 changed files with 831 additions and 373 deletions
+24
View File
@@ -0,0 +1,24 @@
# 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(alphaover)
set(OLIVE_SOURCES
${OLIVE_SOURCES}
node/blend/blend.h
node/blend/blend.cpp
PARENT_SCOPE
)
+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/blend/alphaover/alphaover.h
node/blend/alphaover/alphaover.cpp
PARENT_SCOPE
)
+17
View File
@@ -0,0 +1,17 @@
#include "alphaover.h"
AlphaOverBlend::AlphaOverBlend()
{
}
void AlphaOverBlend::Process(const rational &time)
{
Q_UNUSED(time)
// FIXME: Write Alpha Over Formula
// Note that alpha will always be premultiplied by this point
//GLuint base_tex = base_input_->get_value(time).value<GLuint>();
}
+15
View File
@@ -0,0 +1,15 @@
#ifndef ALPHAOVER_H
#define ALPHAOVER_H
#include "node/blend/blend.h"
class AlphaOverBlend : public BlendNode
{
public:
AlphaOverBlend();
public slots:
virtual void Process(const rational &time) override;
};
#endif // ALPHAOVER_H
+22
View File
@@ -0,0 +1,22 @@
#include "blend.h"
BlendNode::BlendNode()
{
base_input_ = new NodeInput("base_in");
base_input_->add_data_input(NodeParam::kTexture);
AddParameter(base_input_);
blend_input_ = new NodeInput("blend_in");
blend_input_->add_data_input(NodeParam::kTexture);
AddParameter(blend_input_);
}
NodeInput *BlendNode::base_input()
{
return base_input_;
}
NodeInput *BlendNode::blend_input()
{
return blend_input_;
}
+21
View File
@@ -0,0 +1,21 @@
#ifndef BLEND_H
#define BLEND_H
#include "node/node.h"
class BlendNode : public Node
{
public:
BlendNode();
NodeInput* base_input();
NodeInput* blend_input();
private:
NodeInput* base_input_;
NodeInput* blend_input_;
};
#endif // BLEND_H