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

change: change code style to Linux style except indent.

Browse Source
This commit is contained in:
Mike Solar
2025-08-03 03:09:40 +08:00
parent 65ab76edc8
commit 74f73ab3be
789 changed files with 77113 additions and 68888 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/node/math/merge/merge.cpp
+34 -28
View File
@@ -22,7 +22,8 @@
#include "node/traverser.h"
namespace olive {
namespace olive
{
const QString MergeNode::kBaseIn = QStringLiteral("base_in");
const QString MergeNode::kBlendIn = QStringLiteral("blend_in");
@@ -31,66 +32,71 @@ const QString MergeNode::kBlendIn = QStringLiteral("blend_in");
MergeNode::MergeNode()
{
AddInput(kBaseIn, NodeValue::kTexture, InputFlags(kInputFlagNotKeyframable));
AddInput(kBaseIn, NodeValue::kTexture,
InputFlags(kInputFlagNotKeyframable));
AddInput(kBlendIn, NodeValue::kTexture, InputFlags(kInputFlagNotKeyframable));
AddInput(kBlendIn, NodeValue::kTexture,
InputFlags(kInputFlagNotKeyframable));
SetFlag(kDontShowInParamView);
SetFlag(kDontShowInParamView);
}
QString MergeNode::Name() const
{
return tr("Merge");
return tr("Merge");
}
QString MergeNode::id() const
{
return QStringLiteral("org.olivevideoeditor.Olive.merge");
return QStringLiteral("org.olivevideoeditor.Olive.merge");
}
QVector<Node::CategoryID> MergeNode::Category() const
{
return {kCategoryMath};
return { kCategoryMath };
}
QString MergeNode::Description() const
{
return tr("Merge two textures together.");
return tr("Merge two textures together.");
}
void MergeNode::Retranslate()
{
super::Retranslate();
super::Retranslate();
SetInputName(kBaseIn, tr("Base"));
SetInputName(kBaseIn, tr("Base"));
SetInputName(kBlendIn, tr("Blend"));
SetInputName(kBlendIn, tr("Blend"));
}
ShaderCode MergeNode::GetShaderCode(const ShaderRequest &request) const
{
Q_UNUSED(request)
Q_UNUSED(request)
return ShaderCode(FileFunctions::ReadFileAsString(":/shaders/alphaover.frag"));
return ShaderCode(
FileFunctions::ReadFileAsString(":/shaders/alphaover.frag"));
}
void MergeNode::Value(const NodeValueRow &value, const NodeGlobals &globals, NodeValueTable *table) const
void MergeNode::Value(const NodeValueRow &value, const NodeGlobals &globals,
NodeValueTable *table) const
{
TexturePtr base_tex = value[kBaseIn].toTexture();
TexturePtr blend_tex = value[kBlendIn].toTexture();
TexturePtr base_tex = value[kBaseIn].toTexture();
TexturePtr blend_tex = value[kBlendIn].toTexture();
if (base_tex || blend_tex) {
if (!base_tex || (blend_tex && blend_tex->channel_count() < VideoParams::kRGBAChannelCount)) {
// We only have a blend texture or the blend texture is RGB only, no need to alpha over
table->Push(value[kBlendIn]);
} else if (!blend_tex) {
// We only have a base texture, no need to alpha over
table->Push(value[kBaseIn]);
} else {
table->Push(NodeValue::kTexture, base_tex->toJob(ShaderJob(value)), this);
}
}
if (base_tex || blend_tex) {
if (!base_tex || (blend_tex && blend_tex->channel_count() <
VideoParams::kRGBAChannelCount)) {
// We only have a blend texture or the blend texture is RGB only, no need to alpha over
table->Push(value[kBlendIn]);
} else if (!blend_tex) {
// We only have a base texture, no need to alpha over
table->Push(value[kBaseIn]);
} else {
table->Push(NodeValue::kTexture, base_tex->toJob(ShaderJob(value)),
this);
}
}
}
}