Mike-Solar
bb40b4923e
Automated with clang-tidy readability-identifier-naming (config added to .clang-tidy) plus scripted passes, per the updated rules now documented in CONTRIBUTING.md: - types (class/struct/enum/alias/template params): PascalCase - functions, variables, members: snake_case (incl. rational -> Rational) - private/protected members: trailing underscore; static member variables likewise (instance_, available_themes_) - constants and enum values: snake_case (kLinear -> k_linear, F32P -> f32p); ALL_CAPS reserved for macros - macros: OAK_ prefix (OLIVE_ADD_TEST/OLIVE_ASSERT/OLIVE_CONFIG -> OAK_ADD_TEST/OAK_ASSERT/OAK_CONFIG, GL_PREAMBLE -> OAK_GL_PREAMBLE, include guards -> OAK_*) - file names: all lowercase (Current/Plugin/OliveHost/OliveClip/ OlivePluginInstance -> current/plugin/olivehost/oliveclip/ oliveplugininstance) - getters share the member name sans underscore, setters set_foo() - Qt and third-party (OpenFX) virtual overrides and framework callbacks keep their original names (exempt in .clang-tidy) Manual follow-ups required where automation could not reach: - string-based QMetaObject/SIGNAL/SLOT references updated to renamed methods (AddTask, CreatedFile, DeleteSpecificFile, moveSelectionUp, ...) - macro bodies referencing renamed methods (OLIVE_CONFIG, NODE_DEFAULT_DESTRUCTOR, MANAGEDDISPLAYWIDGET_*) - self-shadowing locals renamed where signals/methods became same-named (size_changed, worker_count, selected_items, import param, filters) - third_party OFX member/namespace usages restored (OFX::Host::*, _created, _clipPrefsDirty, createInstance, clearPersistentMessage) - STL protocol aliases restored (const_iterator) with .clang-tidy ignore rules; qHash overloads restored Full build and test suite pass: ctest 4/4, ~1960 gtest cases green.
104 lines
2.5 KiB
C++
104 lines
2.5 KiB
C++
/***
|
|
|
|
Olive - Non-Linear Video Editor
|
|
Copyright (C) 2022 Olive Team
|
|
Modifications Copyright (C) 2025 mikesolar
|
|
|
|
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"
|
|
|
|
#include "node/traverser.h"
|
|
|
|
namespace olive
|
|
{
|
|
|
|
const QString MergeNode::k_base_in = QStringLiteral("base_in");
|
|
const QString MergeNode::k_blend_in = QStringLiteral("blend_in");
|
|
|
|
#define super Node
|
|
|
|
MergeNode::MergeNode()
|
|
{
|
|
add_input(k_base_in, NodeValue::k_texture,
|
|
InputFlags(k_input_flag_not_keyframable));
|
|
|
|
add_input(k_blend_in, NodeValue::k_texture,
|
|
InputFlags(k_input_flag_not_keyframable));
|
|
|
|
set_flag(k_dont_show_in_param_view);
|
|
}
|
|
|
|
QString MergeNode::name() const
|
|
{
|
|
return tr("Merge");
|
|
}
|
|
|
|
QString MergeNode::id() const
|
|
{
|
|
return QStringLiteral("org.olivevideoeditor.Olive.merge");
|
|
}
|
|
|
|
QVector<Node::CategoryID> MergeNode::category() const
|
|
{
|
|
return { k_category_math };
|
|
}
|
|
|
|
QString MergeNode::description() const
|
|
{
|
|
return tr("Merge two textures together.");
|
|
}
|
|
|
|
void MergeNode::retranslate()
|
|
{
|
|
super::retranslate();
|
|
|
|
set_input_name(k_base_in, tr("Base"));
|
|
|
|
set_input_name(k_blend_in, tr("Blend"));
|
|
}
|
|
|
|
ShaderCode MergeNode::get_shader_code(const ShaderRequest &request) const
|
|
{
|
|
Q_UNUSED(request)
|
|
|
|
return ShaderCode(
|
|
FileFunctions::read_file_as_string(":/shaders/alphaover.frag"));
|
|
}
|
|
|
|
void MergeNode::value(const NodeValueRow &value, const NodeGlobals &globals,
|
|
NodeValueTable *table) const
|
|
{
|
|
TexturePtr base_tex = value[k_base_in].to_texture();
|
|
TexturePtr blend_tex = value[k_blend_in].to_texture();
|
|
|
|
if (base_tex || blend_tex) {
|
|
if (!base_tex || (blend_tex && blend_tex->channel_count() <
|
|
VideoParams::k_rgba_channel_count)) {
|
|
// We only have a blend texture or the blend texture is RGB only, no need to alpha over
|
|
table->push(value[k_blend_in]);
|
|
} else if (!blend_tex) {
|
|
// We only have a base texture, no need to alpha over
|
|
table->push(value[k_base_in]);
|
|
} else {
|
|
table->push(NodeValue::k_texture, base_tex->to_job(ShaderJob(value)),
|
|
this);
|
|
}
|
|
}
|
|
}
|
|
|
|
}
|