style: unify identifier naming per updated conventions
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.
This commit is contained in:
@@ -24,55 +24,55 @@ namespace olive
|
||||
|
||||
#define super OCIOBaseNode
|
||||
|
||||
const QString ChromaKeyNode::kColorInput = QStringLiteral("color_key");
|
||||
const QString ChromaKeyNode::kMaskOnlyInput = QStringLiteral("mask_only_in");
|
||||
const QString ChromaKeyNode::kInvertInput = QStringLiteral("invert_in");
|
||||
const QString ChromaKeyNode::kUpperToleranceInput =
|
||||
const QString ChromaKeyNode::k_color_input = QStringLiteral("color_key");
|
||||
const QString ChromaKeyNode::k_mask_only_input = QStringLiteral("mask_only_in");
|
||||
const QString ChromaKeyNode::k_invert_input = QStringLiteral("invert_in");
|
||||
const QString ChromaKeyNode::k_upper_tolerance_input =
|
||||
QStringLiteral("upper_tolerance_in");
|
||||
const QString ChromaKeyNode::kLowerToleranceInput =
|
||||
const QString ChromaKeyNode::k_lower_tolerance_input =
|
||||
QStringLiteral("lower_tolerance_in");
|
||||
const QString ChromaKeyNode::kGarbageMatteInput = QStringLiteral("garbage_in");
|
||||
const QString ChromaKeyNode::kCoreMatteInput = QStringLiteral("core_in");
|
||||
const QString ChromaKeyNode::kShadowsInput = QStringLiteral("shadows_in");
|
||||
const QString ChromaKeyNode::kHighlightsInput = QStringLiteral("highlights_in");
|
||||
const QString ChromaKeyNode::k_garbage_matte_input = QStringLiteral("garbage_in");
|
||||
const QString ChromaKeyNode::k_core_matte_input = QStringLiteral("core_in");
|
||||
const QString ChromaKeyNode::k_shadows_input = QStringLiteral("shadows_in");
|
||||
const QString ChromaKeyNode::k_highlights_input = QStringLiteral("highlights_in");
|
||||
|
||||
ChromaKeyNode::ChromaKeyNode()
|
||||
{
|
||||
AddInput(kColorInput, NodeValue::kColor,
|
||||
add_input(k_color_input, NodeValue::k_color,
|
||||
QVariant::fromValue(Color(0.0f, 1.0f, 0.0f, 1.0f)));
|
||||
|
||||
AddInput(kLowerToleranceInput, NodeValue::kFloat, 5.0);
|
||||
SetInputProperty(kLowerToleranceInput, QStringLiteral("min"), 0.0);
|
||||
SetInputProperty(kLowerToleranceInput, QStringLiteral("base"), 0.1);
|
||||
add_input(k_lower_tolerance_input, NodeValue::k_float, 5.0);
|
||||
set_input_property(k_lower_tolerance_input, QStringLiteral("min"), 0.0);
|
||||
set_input_property(k_lower_tolerance_input, QStringLiteral("base"), 0.1);
|
||||
|
||||
AddInput(kUpperToleranceInput, NodeValue::kFloat, 25.0);
|
||||
SetInputProperty(kUpperToleranceInput, QStringLiteral("base"), 0.1);
|
||||
add_input(k_upper_tolerance_input, NodeValue::k_float, 25.0);
|
||||
set_input_property(k_upper_tolerance_input, QStringLiteral("base"), 0.1);
|
||||
|
||||
// FIXME: Temporarily disabled. This will break if "lower tolerance" is keyframed or connected to
|
||||
// something and there's currently no solution to remedy that. If there is in the future,
|
||||
// we can look into re-enabling this.
|
||||
//SetInputProperty(kUpperToleranceInput, QStringLiteral("min"), GetStandardValue(kLowerToleranceInput).toDouble());
|
||||
|
||||
AddInput(kGarbageMatteInput, NodeValue::kTexture,
|
||||
InputFlags(kInputFlagNotKeyframable));
|
||||
add_input(k_garbage_matte_input, NodeValue::k_texture,
|
||||
InputFlags(k_input_flag_not_keyframable));
|
||||
|
||||
AddInput(kCoreMatteInput, NodeValue::kTexture,
|
||||
InputFlags(kInputFlagNotKeyframable));
|
||||
add_input(k_core_matte_input, NodeValue::k_texture,
|
||||
InputFlags(k_input_flag_not_keyframable));
|
||||
|
||||
AddInput(kHighlightsInput, NodeValue::kFloat, 100.0f);
|
||||
SetInputProperty(kHighlightsInput, QStringLiteral("min"), 0.0);
|
||||
SetInputProperty(kHighlightsInput, QStringLiteral("base"), 0.1);
|
||||
add_input(k_highlights_input, NodeValue::k_float, 100.0f);
|
||||
set_input_property(k_highlights_input, QStringLiteral("min"), 0.0);
|
||||
set_input_property(k_highlights_input, QStringLiteral("base"), 0.1);
|
||||
|
||||
AddInput(kShadowsInput, NodeValue::kFloat, 100.0f);
|
||||
SetInputProperty(kShadowsInput, QStringLiteral("min"), 0.0);
|
||||
SetInputProperty(kShadowsInput, QStringLiteral("base"), 0.1);
|
||||
add_input(k_shadows_input, NodeValue::k_float, 100.0f);
|
||||
set_input_property(k_shadows_input, QStringLiteral("min"), 0.0);
|
||||
set_input_property(k_shadows_input, QStringLiteral("base"), 0.1);
|
||||
|
||||
AddInput(kInvertInput, NodeValue::kBoolean, false);
|
||||
add_input(k_invert_input, NodeValue::k_boolean, false);
|
||||
|
||||
AddInput(kMaskOnlyInput, NodeValue::kBoolean, false);
|
||||
add_input(k_mask_only_input, NodeValue::k_boolean, false);
|
||||
}
|
||||
|
||||
QString ChromaKeyNode::Name() const
|
||||
QString ChromaKeyNode::name() const
|
||||
{
|
||||
return tr("Chroma Key");
|
||||
}
|
||||
@@ -82,98 +82,98 @@ QString ChromaKeyNode::id() const
|
||||
return QStringLiteral("org.olivevideoeditor.Olive.chromakey");
|
||||
}
|
||||
|
||||
QVector<Node::CategoryID> ChromaKeyNode::Category() const
|
||||
QVector<Node::CategoryID> ChromaKeyNode::category() const
|
||||
{
|
||||
return { kCategoryKeying };
|
||||
return { k_category_keying };
|
||||
}
|
||||
|
||||
QString ChromaKeyNode::Description() const
|
||||
QString ChromaKeyNode::description() const
|
||||
{
|
||||
return tr(
|
||||
"A simple color key based on the distance from the chroma of a selected color.");
|
||||
}
|
||||
|
||||
void ChromaKeyNode::Retranslate()
|
||||
void ChromaKeyNode::retranslate()
|
||||
{
|
||||
super::Retranslate();
|
||||
SetInputName(kTextureInput, tr("Input"));
|
||||
SetInputName(kGarbageMatteInput, tr("Garbage Matte"));
|
||||
SetInputName(kCoreMatteInput, tr("Core Matte"));
|
||||
SetInputName(kColorInput, tr("Key Color"));
|
||||
SetInputName(kShadowsInput, tr("Shadows"));
|
||||
SetInputName(kHighlightsInput, tr("Highlights"));
|
||||
SetInputName(kUpperToleranceInput, tr("Upper Tolerance"));
|
||||
SetInputName(kLowerToleranceInput, tr("Lower Tolerance"));
|
||||
SetInputName(kInvertInput, tr("Invert Mask"));
|
||||
SetInputName(kMaskOnlyInput, tr("Show Mask Only"));
|
||||
super::retranslate();
|
||||
set_input_name(k_texture_input, tr("Input"));
|
||||
set_input_name(k_garbage_matte_input, tr("Garbage Matte"));
|
||||
set_input_name(k_core_matte_input, tr("Core Matte"));
|
||||
set_input_name(k_color_input, tr("Key Color"));
|
||||
set_input_name(k_shadows_input, tr("Shadows"));
|
||||
set_input_name(k_highlights_input, tr("Highlights"));
|
||||
set_input_name(k_upper_tolerance_input, tr("Upper Tolerance"));
|
||||
set_input_name(k_lower_tolerance_input, tr("Lower Tolerance"));
|
||||
set_input_name(k_invert_input, tr("Invert Mask"));
|
||||
set_input_name(k_mask_only_input, tr("Show Mask Only"));
|
||||
}
|
||||
|
||||
void ChromaKeyNode::InputValueChangedEvent(const QString &input, int element)
|
||||
{
|
||||
Q_UNUSED(element);
|
||||
if (input == kLowerToleranceInput) {
|
||||
if (input == k_lower_tolerance_input) {
|
||||
// FIXME: Temporarily disabled. This will break if "lower tolerance" is keyframed or connected to
|
||||
// something and there's currently no solution to remedy that. If there is in the future,
|
||||
// we can look into re-enabling this.
|
||||
//SetInputProperty(kUpperToleranceInput, QStringLiteral("min"), GetStandardValue(kLowerToleranceInput).toDouble());
|
||||
}
|
||||
|
||||
GenerateProcessor();
|
||||
generate_processor();
|
||||
}
|
||||
|
||||
ShaderCode ChromaKeyNode::GetShaderCode(const ShaderRequest &request) const
|
||||
ShaderCode ChromaKeyNode::get_shader_code(const ShaderRequest &request) const
|
||||
{
|
||||
return ShaderCode(FileFunctions::ReadFileAsString(
|
||||
return ShaderCode(FileFunctions::read_file_as_string(
|
||||
QStringLiteral(":/shaders/chromakey.frag"))
|
||||
.arg(request.stub));
|
||||
}
|
||||
|
||||
void ChromaKeyNode::GenerateProcessor()
|
||||
void ChromaKeyNode::generate_processor()
|
||||
{
|
||||
if (manager()) {
|
||||
try {
|
||||
ColorTransform transform("cie_xyz_d65_interchange");
|
||||
set_processor(ColorProcessor::Create(
|
||||
manager(), manager()->GetReferenceColorSpace(), transform));
|
||||
} catch (const OCIO::Exception &e) {
|
||||
set_processor(ColorProcessor::create(
|
||||
manager(), manager()->get_reference_color_space(), transform));
|
||||
} catch (const ocio::Exception &e) {
|
||||
std::cerr << std::endl << e.what() << std::endl;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void ChromaKeyNode::Value(const NodeValueRow &value, const NodeGlobals &globals,
|
||||
void ChromaKeyNode::value(const NodeValueRow &value, const NodeGlobals &globals,
|
||||
NodeValueTable *table) const
|
||||
{
|
||||
if (TexturePtr tex = value[kTextureInput].toTexture()) {
|
||||
if (TexturePtr tex = value[k_texture_input].to_texture()) {
|
||||
if (processor()) {
|
||||
ColorTransformJob job(value);
|
||||
|
||||
job.SetColorProcessor(processor());
|
||||
job.SetInputTexture(value[kTextureInput]);
|
||||
job.SetNeedsCustomShader(this);
|
||||
job.SetFunctionName(QStringLiteral("SceneLinearToCIEXYZ_d65"));
|
||||
job.set_color_processor(processor());
|
||||
job.set_input_texture(value[k_texture_input]);
|
||||
job.set_needs_custom_shader(this);
|
||||
job.set_function_name(QStringLiteral("SceneLinearToCIEXYZ_d65"));
|
||||
|
||||
table->Push(NodeValue::kTexture, tex->toJob(job), this);
|
||||
table->push(NodeValue::k_texture, tex->to_job(job), this);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void ChromaKeyNode::ConfigChanged()
|
||||
void ChromaKeyNode::config_changed()
|
||||
{
|
||||
GenerateProcessor();
|
||||
generate_processor();
|
||||
}
|
||||
|
||||
QString ChromaKeyNode::GetInputIDForLegacyID(const QString &id) const
|
||||
QString ChromaKeyNode::get_input_id_for_legacy_id(const QString &id) const
|
||||
{
|
||||
// Older project files used the misspelled "tolerence" input IDs
|
||||
if (id == QStringLiteral("upper_tolerence_in")) {
|
||||
return kUpperToleranceInput;
|
||||
return k_upper_tolerance_input;
|
||||
}
|
||||
if (id == QStringLiteral("lower_tolerence_in")) {
|
||||
return kLowerToleranceInput;
|
||||
return k_lower_tolerance_input;
|
||||
}
|
||||
|
||||
return super::GetInputIDForLegacyID(id);
|
||||
return super::get_input_id_for_legacy_id(id);
|
||||
}
|
||||
|
||||
} // namespace olive
|
||||
|
||||
@@ -14,8 +14,8 @@
|
||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
***/
|
||||
|
||||
#ifndef CHROMAKEYNODE_H
|
||||
#define CHROMAKEYNODE_H
|
||||
#ifndef OAK_CHROMAKEYNODE_H
|
||||
#define OAK_CHROMAKEYNODE_H
|
||||
|
||||
#include "node/color/ociobase/ociobase.h"
|
||||
|
||||
@@ -29,41 +29,41 @@ public:
|
||||
|
||||
NODE_DEFAULT_FUNCTIONS(ChromaKeyNode)
|
||||
|
||||
virtual QString Name() const override;
|
||||
virtual QString name() const override;
|
||||
virtual QString id() const override;
|
||||
virtual QVector<CategoryID> Category() const override;
|
||||
virtual QString Description() const override;
|
||||
virtual QVector<CategoryID> category() const override;
|
||||
virtual QString description() const override;
|
||||
|
||||
virtual void Retranslate() override;
|
||||
virtual void retranslate() override;
|
||||
|
||||
virtual void InputValueChangedEvent(const QString &input,
|
||||
int element) override;
|
||||
|
||||
virtual ShaderCode
|
||||
GetShaderCode(const ShaderRequest &request) const override;
|
||||
virtual void Value(const NodeValueRow &value, const NodeGlobals &globals,
|
||||
get_shader_code(const ShaderRequest &request) const override;
|
||||
virtual void value(const NodeValueRow &value, const NodeGlobals &globals,
|
||||
NodeValueTable *table) const override;
|
||||
|
||||
virtual void ConfigChanged() override;
|
||||
virtual void config_changed() override;
|
||||
|
||||
// Maps the misspelled tolerance input IDs from old project files onto the
|
||||
// corrected ones
|
||||
virtual QString GetInputIDForLegacyID(const QString &id) const override;
|
||||
virtual QString get_input_id_for_legacy_id(const QString &id) const override;
|
||||
|
||||
static const QString kColorInput;
|
||||
static const QString kInvertInput;
|
||||
static const QString kMaskOnlyInput;
|
||||
static const QString kUpperToleranceInput;
|
||||
static const QString kLowerToleranceInput;
|
||||
static const QString kGarbageMatteInput;
|
||||
static const QString kCoreMatteInput;
|
||||
static const QString kShadowsInput;
|
||||
static const QString kHighlightsInput;
|
||||
static const QString k_color_input;
|
||||
static const QString k_invert_input;
|
||||
static const QString k_mask_only_input;
|
||||
static const QString k_upper_tolerance_input;
|
||||
static const QString k_lower_tolerance_input;
|
||||
static const QString k_garbage_matte_input;
|
||||
static const QString k_core_matte_input;
|
||||
static const QString k_shadows_input;
|
||||
static const QString k_highlights_input;
|
||||
|
||||
private:
|
||||
void GenerateProcessor();
|
||||
void generate_processor();
|
||||
};
|
||||
|
||||
} // namespace olive
|
||||
|
||||
#endif // CHROMAKEYNODE_H
|
||||
#endif // OAK_CHROMAKEYNODE_H
|
||||
|
||||
@@ -19,49 +19,49 @@
|
||||
namespace olive
|
||||
{
|
||||
|
||||
const QString ColorDifferenceKeyNode::kTextureInput = QStringLiteral("tex_in");
|
||||
const QString ColorDifferenceKeyNode::kGarbageMatteInput =
|
||||
const QString ColorDifferenceKeyNode::k_texture_input = QStringLiteral("tex_in");
|
||||
const QString ColorDifferenceKeyNode::k_garbage_matte_input =
|
||||
QStringLiteral("garbage_in");
|
||||
const QString ColorDifferenceKeyNode::kCoreMatteInput =
|
||||
const QString ColorDifferenceKeyNode::k_core_matte_input =
|
||||
QStringLiteral("core_in");
|
||||
const QString ColorDifferenceKeyNode::kColorInput = QStringLiteral("color_in");
|
||||
const QString ColorDifferenceKeyNode::kShadowsInput =
|
||||
const QString ColorDifferenceKeyNode::k_color_input = QStringLiteral("color_in");
|
||||
const QString ColorDifferenceKeyNode::k_shadows_input =
|
||||
QStringLiteral("shadows_in");
|
||||
const QString ColorDifferenceKeyNode::kHighlightsInput =
|
||||
const QString ColorDifferenceKeyNode::k_highlights_input =
|
||||
QStringLiteral("highlights_in");
|
||||
const QString ColorDifferenceKeyNode::kMaskOnlyInput =
|
||||
const QString ColorDifferenceKeyNode::k_mask_only_input =
|
||||
QStringLiteral("mask_only_in");
|
||||
|
||||
#define super Node
|
||||
|
||||
ColorDifferenceKeyNode::ColorDifferenceKeyNode()
|
||||
{
|
||||
AddInput(kTextureInput, NodeValue::kTexture,
|
||||
InputFlags(kInputFlagNotKeyframable));
|
||||
add_input(k_texture_input, NodeValue::k_texture,
|
||||
InputFlags(k_input_flag_not_keyframable));
|
||||
|
||||
AddInput(kGarbageMatteInput, NodeValue::kTexture,
|
||||
InputFlags(kInputFlagNotKeyframable));
|
||||
add_input(k_garbage_matte_input, NodeValue::k_texture,
|
||||
InputFlags(k_input_flag_not_keyframable));
|
||||
|
||||
AddInput(kCoreMatteInput, NodeValue::kTexture,
|
||||
InputFlags(kInputFlagNotKeyframable));
|
||||
add_input(k_core_matte_input, NodeValue::k_texture,
|
||||
InputFlags(k_input_flag_not_keyframable));
|
||||
|
||||
AddInput(kColorInput, NodeValue::kCombo, 0);
|
||||
add_input(k_color_input, NodeValue::k_combo, 0);
|
||||
|
||||
AddInput(kHighlightsInput, NodeValue::kFloat, 1.0f);
|
||||
SetInputProperty(kHighlightsInput, QStringLiteral("min"), 0.0);
|
||||
SetInputProperty(kHighlightsInput, QStringLiteral("base"), 0.01);
|
||||
add_input(k_highlights_input, NodeValue::k_float, 1.0f);
|
||||
set_input_property(k_highlights_input, QStringLiteral("min"), 0.0);
|
||||
set_input_property(k_highlights_input, QStringLiteral("base"), 0.01);
|
||||
|
||||
AddInput(kShadowsInput, NodeValue::kFloat, 1.0f);
|
||||
SetInputProperty(kShadowsInput, QStringLiteral("min"), 0.0);
|
||||
SetInputProperty(kShadowsInput, QStringLiteral("base"), 0.01);
|
||||
add_input(k_shadows_input, NodeValue::k_float, 1.0f);
|
||||
set_input_property(k_shadows_input, QStringLiteral("min"), 0.0);
|
||||
set_input_property(k_shadows_input, QStringLiteral("base"), 0.01);
|
||||
|
||||
AddInput(kMaskOnlyInput, NodeValue::kBoolean, false);
|
||||
add_input(k_mask_only_input, NodeValue::k_boolean, false);
|
||||
|
||||
SetFlag(kVideoEffect);
|
||||
SetEffectInput(kTextureInput);
|
||||
set_flag(k_video_effect);
|
||||
set_effect_input(k_texture_input);
|
||||
}
|
||||
|
||||
QString ColorDifferenceKeyNode::Name() const
|
||||
QString ColorDifferenceKeyNode::name() const
|
||||
{
|
||||
return tr("Color Difference Key");
|
||||
}
|
||||
@@ -71,48 +71,48 @@ QString ColorDifferenceKeyNode::id() const
|
||||
return QStringLiteral("org.olivevideoeditor.Olive.colordifferencekey");
|
||||
}
|
||||
|
||||
QVector<Node::CategoryID> ColorDifferenceKeyNode::Category() const
|
||||
QVector<Node::CategoryID> ColorDifferenceKeyNode::category() const
|
||||
{
|
||||
return { kCategoryKeying };
|
||||
return { k_category_keying };
|
||||
}
|
||||
|
||||
QString ColorDifferenceKeyNode::Description() const
|
||||
QString ColorDifferenceKeyNode::description() const
|
||||
{
|
||||
return tr(
|
||||
"A simple color key based on the distance of one color from other colors.");
|
||||
}
|
||||
|
||||
void ColorDifferenceKeyNode::Retranslate()
|
||||
void ColorDifferenceKeyNode::retranslate()
|
||||
{
|
||||
super::Retranslate();
|
||||
super::retranslate();
|
||||
|
||||
SetInputName(kTextureInput, tr("Input"));
|
||||
SetInputName(kGarbageMatteInput, tr("Garbage Matte"));
|
||||
SetInputName(kCoreMatteInput, tr("Core Matte"));
|
||||
SetInputName(kColorInput, tr("Key Color"));
|
||||
SetComboBoxStrings(kColorInput, { tr("Green"), tr("Blue") });
|
||||
SetInputName(kShadowsInput, tr("Shadows"));
|
||||
SetInputName(kHighlightsInput, tr("Highlights"));
|
||||
SetInputName(kMaskOnlyInput, tr("Show Mask Only"));
|
||||
set_input_name(k_texture_input, tr("Input"));
|
||||
set_input_name(k_garbage_matte_input, tr("Garbage Matte"));
|
||||
set_input_name(k_core_matte_input, tr("Core Matte"));
|
||||
set_input_name(k_color_input, tr("Key Color"));
|
||||
set_combo_box_strings(k_color_input, { tr("Green"), tr("Blue") });
|
||||
set_input_name(k_shadows_input, tr("Shadows"));
|
||||
set_input_name(k_highlights_input, tr("Highlights"));
|
||||
set_input_name(k_mask_only_input, tr("Show Mask Only"));
|
||||
}
|
||||
|
||||
ShaderCode
|
||||
ColorDifferenceKeyNode::GetShaderCode(const ShaderRequest &request) const
|
||||
ColorDifferenceKeyNode::get_shader_code(const ShaderRequest &request) const
|
||||
{
|
||||
Q_UNUSED(request)
|
||||
return ShaderCode(
|
||||
FileFunctions::ReadFileAsString(":/shaders/colordifferencekey.frag"));
|
||||
FileFunctions::read_file_as_string(":/shaders/colordifferencekey.frag"));
|
||||
}
|
||||
|
||||
void ColorDifferenceKeyNode::Value(const NodeValueRow &value,
|
||||
void ColorDifferenceKeyNode::value(const NodeValueRow &value,
|
||||
const NodeGlobals &globals,
|
||||
NodeValueTable *table) const
|
||||
{
|
||||
// If there's no texture, no need to run an operation
|
||||
if (TexturePtr tex = value[kTextureInput].toTexture()) {
|
||||
if (TexturePtr tex = value[k_texture_input].to_texture()) {
|
||||
ShaderJob job;
|
||||
job.Insert(value);
|
||||
table->Push(NodeValue::kTexture, tex->toJob(job), this);
|
||||
job.insert(value);
|
||||
table->push(NodeValue::k_texture, tex->to_job(job), this);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -14,8 +14,8 @@
|
||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
***/
|
||||
|
||||
#ifndef COLORDIFFERENCEKEYNODE_H
|
||||
#define COLORDIFFERENCEKEYNODE_H
|
||||
#ifndef OAK_COLORDIFFERENCEKEYNODE_H
|
||||
#define OAK_COLORDIFFERENCEKEYNODE_H
|
||||
|
||||
#include "node/node.h"
|
||||
|
||||
@@ -28,27 +28,27 @@ public:
|
||||
|
||||
NODE_DEFAULT_FUNCTIONS(ColorDifferenceKeyNode)
|
||||
|
||||
virtual QString Name() const override;
|
||||
virtual QString name() const override;
|
||||
virtual QString id() const override;
|
||||
virtual QVector<CategoryID> Category() const override;
|
||||
virtual QString Description() const override;
|
||||
virtual QVector<CategoryID> category() const override;
|
||||
virtual QString description() const override;
|
||||
|
||||
virtual void Retranslate() override;
|
||||
virtual void retranslate() override;
|
||||
|
||||
virtual ShaderCode
|
||||
GetShaderCode(const ShaderRequest &request) const override;
|
||||
virtual void Value(const NodeValueRow &value, const NodeGlobals &globals,
|
||||
get_shader_code(const ShaderRequest &request) const override;
|
||||
virtual void value(const NodeValueRow &value, const NodeGlobals &globals,
|
||||
NodeValueTable *table) const override;
|
||||
|
||||
static const QString kTextureInput;
|
||||
static const QString kGarbageMatteInput;
|
||||
static const QString kCoreMatteInput;
|
||||
static const QString kColorInput;
|
||||
static const QString kShadowsInput;
|
||||
static const QString kHighlightsInput;
|
||||
static const QString kMaskOnlyInput;
|
||||
static const QString k_texture_input;
|
||||
static const QString k_garbage_matte_input;
|
||||
static const QString k_core_matte_input;
|
||||
static const QString k_color_input;
|
||||
static const QString k_shadows_input;
|
||||
static const QString k_highlights_input;
|
||||
static const QString k_mask_only_input;
|
||||
};
|
||||
|
||||
} // namespace olive
|
||||
|
||||
#endif // COLORDIFFERENCEKEYNODE_H
|
||||
#endif // OAK_COLORDIFFERENCEKEYNODE_H
|
||||
|
||||
@@ -21,30 +21,30 @@
|
||||
namespace olive
|
||||
{
|
||||
|
||||
const QString DespillNode::kTextureInput = QStringLiteral("tex_in");
|
||||
const QString DespillNode::kColorInput = QStringLiteral("color_in");
|
||||
const QString DespillNode::kMethodInput = QStringLiteral("method_in");
|
||||
const QString DespillNode::kPreserveLuminanceInput =
|
||||
const QString DespillNode::k_texture_input = QStringLiteral("tex_in");
|
||||
const QString DespillNode::k_color_input = QStringLiteral("color_in");
|
||||
const QString DespillNode::k_method_input = QStringLiteral("method_in");
|
||||
const QString DespillNode::k_preserve_luminance_input =
|
||||
QStringLiteral("preserve_luminance_input");
|
||||
|
||||
#define super Node
|
||||
|
||||
DespillNode::DespillNode()
|
||||
{
|
||||
AddInput(kTextureInput, NodeValue::kTexture,
|
||||
InputFlags(kInputFlagNotKeyframable));
|
||||
add_input(k_texture_input, NodeValue::k_texture,
|
||||
InputFlags(k_input_flag_not_keyframable));
|
||||
|
||||
AddInput(kColorInput, NodeValue::kCombo, 0);
|
||||
add_input(k_color_input, NodeValue::k_combo, 0);
|
||||
|
||||
AddInput(kMethodInput, NodeValue::kCombo, 0);
|
||||
add_input(k_method_input, NodeValue::k_combo, 0);
|
||||
|
||||
AddInput(kPreserveLuminanceInput, NodeValue::kBoolean, false);
|
||||
add_input(k_preserve_luminance_input, NodeValue::k_boolean, false);
|
||||
|
||||
SetFlag(kVideoEffect);
|
||||
SetEffectInput(kTextureInput);
|
||||
set_flag(k_video_effect);
|
||||
set_effect_input(k_texture_input);
|
||||
}
|
||||
|
||||
QString DespillNode::Name() const
|
||||
QString DespillNode::name() const
|
||||
{
|
||||
return tr("Despill");
|
||||
}
|
||||
@@ -54,62 +54,62 @@ QString DespillNode::id() const
|
||||
return QStringLiteral("org.olivevideoeditor.Olive.despill");
|
||||
}
|
||||
|
||||
QVector<Node::CategoryID> DespillNode::Category() const
|
||||
QVector<Node::CategoryID> DespillNode::category() const
|
||||
{
|
||||
return { kCategoryKeying };
|
||||
return { k_category_keying };
|
||||
}
|
||||
|
||||
QString DespillNode::Description() const
|
||||
QString DespillNode::description() const
|
||||
{
|
||||
return tr("Selection of simple despill operations");
|
||||
}
|
||||
|
||||
void DespillNode::Retranslate()
|
||||
void DespillNode::retranslate()
|
||||
{
|
||||
super::Retranslate();
|
||||
super::retranslate();
|
||||
|
||||
SetInputName(kTextureInput, tr("Input"));
|
||||
set_input_name(k_texture_input, tr("Input"));
|
||||
|
||||
SetInputName(kColorInput, tr("Key Color"));
|
||||
SetComboBoxStrings(kColorInput, { tr("Green"), tr("Blue") });
|
||||
set_input_name(k_color_input, tr("Key Color"));
|
||||
set_combo_box_strings(k_color_input, { tr("Green"), tr("Blue") });
|
||||
|
||||
SetInputName(kMethodInput, tr("Method"));
|
||||
SetComboBoxStrings(kMethodInput, { tr("Average"), tr("Double Red Average"),
|
||||
set_input_name(k_method_input, tr("Method"));
|
||||
set_combo_box_strings(k_method_input, { tr("Average"), tr("Double Red Average"),
|
||||
tr("Double Average"), tr("Limit") });
|
||||
|
||||
SetInputName(kPreserveLuminanceInput, tr("Preserve Luminance"));
|
||||
set_input_name(k_preserve_luminance_input, tr("Preserve Luminance"));
|
||||
}
|
||||
|
||||
ShaderCode DespillNode::GetShaderCode(const ShaderRequest &request) const
|
||||
ShaderCode DespillNode::get_shader_code(const ShaderRequest &request) const
|
||||
{
|
||||
Q_UNUSED(request)
|
||||
return ShaderCode(
|
||||
FileFunctions::ReadFileAsString(":/shaders/despill.frag"));
|
||||
FileFunctions::read_file_as_string(":/shaders/despill.frag"));
|
||||
}
|
||||
|
||||
void DespillNode::Value(const NodeValueRow &value, const NodeGlobals &globals,
|
||||
void DespillNode::value(const NodeValueRow &value, const NodeGlobals &globals,
|
||||
NodeValueTable *table) const
|
||||
{
|
||||
ShaderJob job;
|
||||
job.Insert(value);
|
||||
job.insert(value);
|
||||
|
||||
// Set luma coefficients
|
||||
double luma_coeffs[3] = { 0.0f, 0.0f, 0.0f };
|
||||
if (project() && project()->color_manager()) {
|
||||
project()->color_manager()->GetDefaultLumaCoefs(luma_coeffs);
|
||||
project()->color_manager()->get_default_luma_coefs(luma_coeffs);
|
||||
} else {
|
||||
luma_coeffs[0] = 0.2126;
|
||||
luma_coeffs[1] = 0.7152;
|
||||
luma_coeffs[2] = 0.0722;
|
||||
}
|
||||
job.Insert(
|
||||
job.insert(
|
||||
QStringLiteral("luma_coeffs"),
|
||||
NodeValue(NodeValue::kVec3,
|
||||
NodeValue(NodeValue::k_vec3,
|
||||
QVector3D(luma_coeffs[0], luma_coeffs[1], luma_coeffs[2])));
|
||||
|
||||
// If there's no texture, no need to run an operation
|
||||
if (TexturePtr tex = job.Get(kTextureInput).toTexture()) {
|
||||
table->Push(NodeValue::kTexture, tex->toJob(job), this);
|
||||
if (TexturePtr tex = job.get(k_texture_input).to_texture()) {
|
||||
table->push(NodeValue::k_texture, tex->to_job(job), this);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -14,8 +14,8 @@
|
||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
***/
|
||||
|
||||
#ifndef DESPILLNODE_H
|
||||
#define DESPILLNODE_H
|
||||
#ifndef OAK_DESPILLNODE_H
|
||||
#define OAK_DESPILLNODE_H
|
||||
|
||||
#include "node/node.h"
|
||||
#include "node/color/colormanager/colormanager.h"
|
||||
@@ -29,24 +29,24 @@ public:
|
||||
|
||||
NODE_DEFAULT_FUNCTIONS(DespillNode)
|
||||
|
||||
virtual QString Name() const override;
|
||||
virtual QString name() const override;
|
||||
virtual QString id() const override;
|
||||
virtual QVector<CategoryID> Category() const override;
|
||||
virtual QString Description() const override;
|
||||
virtual QVector<CategoryID> category() const override;
|
||||
virtual QString description() const override;
|
||||
|
||||
virtual void Retranslate() override;
|
||||
virtual void retranslate() override;
|
||||
|
||||
virtual ShaderCode
|
||||
GetShaderCode(const ShaderRequest &request) const override;
|
||||
virtual void Value(const NodeValueRow &value, const NodeGlobals &globals,
|
||||
get_shader_code(const ShaderRequest &request) const override;
|
||||
virtual void value(const NodeValueRow &value, const NodeGlobals &globals,
|
||||
NodeValueTable *table) const override;
|
||||
|
||||
static const QString kTextureInput;
|
||||
static const QString kColorInput;
|
||||
static const QString kMethodInput;
|
||||
static const QString kPreserveLuminanceInput;
|
||||
static const QString k_texture_input;
|
||||
static const QString k_color_input;
|
||||
static const QString k_method_input;
|
||||
static const QString k_preserve_luminance_input;
|
||||
};
|
||||
|
||||
} // namespace olive
|
||||
|
||||
#endif // DESPILLNODE_H
|
||||
#endif // OAK_DESPILLNODE_H
|
||||
|
||||
Reference in New Issue
Block a user