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

code: use macros for default node functions

Browse Source 
Easier to maintain
This commit is contained in:
itsmattkc
2022-05-04 11:01:17 -07:00
parent 91b761693b
commit d55d9c820f
69 changed files with 49 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/node/generator/matrix/matrix.cpp
-5
View File
@@ -51,11 +51,6 @@ MatrixGenerator::MatrixGenerator()
AddInput(kAnchorInput, NodeValue::kVec2, QVector2D(0.0, 0.0));
}
Node *MatrixGenerator::copy() const
{
return new MatrixGenerator();
}
QString MatrixGenerator::Name() const
{
return tr("Orthographic Matrix");
app/node/generator/matrix/matrix.h
+1 -3
View File
@@ -34,9 +34,7 @@ class MatrixGenerator : public Node
public:
MatrixGenerator();
NODE_DEFAULT_DESTRUCTOR(MatrixGenerator)
virtual Node* copy() const override;
NODE_DEFAULT_FUNCTIONS(MatrixGenerator)
virtual QString Name() const override;
virtual QString ShortName() const override;
app/node/generator/noise/noise.cpp
-5
View File
@@ -44,11 +44,6 @@ NoiseGeneratorNode::NoiseGeneratorNode()
SetFlags(kVideoEffect);
}
Node* NoiseGeneratorNode::copy() const
{
return new NoiseGeneratorNode();
}
QString NoiseGeneratorNode::Name() const
{
return tr("Noise");
app/node/generator/noise/noise.h
+1 -3
View File
@@ -30,9 +30,7 @@ class NoiseGeneratorNode : public Node {
public:
NoiseGeneratorNode();
NODE_DEFAULT_DESTRUCTOR(NoiseGeneratorNode)
virtual Node *copy() const override;
NODE_DEFAULT_FUNCTIONS(NoiseGeneratorNode)
virtual QString Name() const override;
virtual QString id() const override;
app/node/generator/polygon/polygon.cpp
-5
View File
@@ -61,11 +61,6 @@ PolygonGenerator::PolygonGenerator()
poly_gizmo_ = new PathGizmo(this);
}
Node *PolygonGenerator::copy() const
{
return new PolygonGenerator();
}
QString PolygonGenerator::Name() const
{
return tr("Polygon");
app/node/generator/polygon/polygon.h
+1 -3
View File
@@ -39,9 +39,7 @@ class PolygonGenerator : public GeneratorWithMerge
public:
PolygonGenerator();
NODE_DEFAULT_DESTRUCTOR(PolygonGenerator)
virtual Node* copy() const override;
NODE_DEFAULT_FUNCTIONS(PolygonGenerator)
virtual QString Name() const override;
virtual QString id() const override;
app/node/generator/shape/generatorwithmerge.h
-2
View File
@@ -31,8 +31,6 @@ class GeneratorWithMerge : public Node
public:
GeneratorWithMerge();
NODE_DEFAULT_DESTRUCTOR(GeneratorWithMerge)
virtual void Retranslate() override;
virtual ShaderCode GetShaderCode(const QString &shader_id) const override;
app/node/generator/shape/shapenode.h
+1 -2
View File
@@ -36,8 +36,7 @@ public:
kEllipse
};
NODE_DEFAULT_DESTRUCTOR(ShapeNode)
NODE_COPY_FUNCTION(ShapeNode)
NODE_DEFAULT_FUNCTIONS(ShapeNode)
virtual QString Name() const override;
virtual QString id() const override;
app/node/generator/shape/shapenodebase.h
-2
View File
@@ -35,8 +35,6 @@ class ShapeNodeBase : public GeneratorWithMerge
public:
ShapeNodeBase(bool create_color_input = true);
NODE_DEFAULT_DESTRUCTOR(ShapeNodeBase)
virtual void Retranslate() override;
virtual void UpdateGizmoPositions(const NodeValueRow &row, const NodeGlobals &globals) override;
app/node/generator/solid/solid.cpp
-5
View File
@@ -34,11 +34,6 @@ SolidGenerator::SolidGenerator()
AddInput(kColorInput, NodeValue::kColor, QVariant::fromValue(Color(1.0f, 0.0f, 0.0f, 1.0f)));
}
Node *SolidGenerator::copy() const
{
return new SolidGenerator();
}
QString SolidGenerator::Name() const
{
return tr("Solid");
app/node/generator/solid/solid.h
+1 -3
View File
@@ -31,9 +31,7 @@ class SolidGenerator : public Node
public:
SolidGenerator();
NODE_DEFAULT_DESTRUCTOR(SolidGenerator)
virtual Node* copy() const override;
NODE_DEFAULT_FUNCTIONS(SolidGenerator)
virtual QString Name() const override;
virtual QString id() const override;
app/node/generator/text/textv1.h
+1 -2
View File
@@ -31,8 +31,7 @@ class TextGeneratorV1 : public Node
public:
TextGeneratorV1();
NODE_DEFAULT_DESTRUCTOR(TextGeneratorV1)
NODE_COPY_FUNCTION(TextGeneratorV1)
NODE_DEFAULT_FUNCTIONS(TextGeneratorV1)
virtual QString Name() const override;
virtual QString id() const override;
app/node/generator/text/textv2.h
+1 -2
View File
@@ -31,8 +31,7 @@ class TextGeneratorV2 : public ShapeNodeBase
public:
TextGeneratorV2();
NODE_DEFAULT_DESTRUCTOR(TextGeneratorV2)
NODE_COPY_FUNCTION(TextGeneratorV2)
NODE_DEFAULT_FUNCTIONS(TextGeneratorV2)
virtual QString Name() const override;
virtual QString id() const override;
app/node/generator/text/textv3.h
+1 -2
View File
@@ -32,8 +32,7 @@ class TextGeneratorV3 : public ShapeNodeBase
public:
TextGeneratorV3();
NODE_DEFAULT_DESTRUCTOR(TextGeneratorV3)
NODE_COPY_FUNCTION(TextGeneratorV3)
NODE_DEFAULT_FUNCTIONS(TextGeneratorV3)
virtual QString Name() const override;
virtual QString id() const override;