Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion engine/src/editor/undostack.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ TString UndoCommand::text() const {
}

void UndoCommand::undo() {
for(int i = m_childs.size(); i >= 0; i--) {
for(int i = m_childs.size() - 1; i >= 0; i--) {
m_childs[i]->undo();
}
}
Expand Down
16 changes: 16 additions & 0 deletions modules/editor/shadertools/converter/functions/camera.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@
class CameraPosition : public ShaderNode {
A_OBJECT(CameraPosition, ShaderNode, Shader/Camera)

A_NOPROPERTIES()
A_NOMETHODS()
A_NOENUMS()

public:
CameraPosition() {
m_outputs.push_back(std::make_pair("Output", MetaType::VECTOR3));
Expand All @@ -20,6 +24,10 @@ class CameraPosition : public ShaderNode {
class CameraDirection : public ShaderNode {
A_OBJECT(CameraDirection, ShaderNode, Shader/Camera)

A_NOPROPERTIES()
A_NOMETHODS()
A_NOENUMS()

public:
CameraDirection() {
m_outputs.push_back(std::make_pair("Output", MetaType::VECTOR3));
Expand All @@ -34,6 +42,10 @@ class CameraDirection : public ShaderNode {
class ScreenSize : public ShaderNode {
A_OBJECT(ScreenSize, ShaderNode, Shader/Camera)

A_NOPROPERTIES()
A_NOMETHODS()
A_NOENUMS()

public:
ScreenSize() {
m_outputs.push_back(std::make_pair("Output", MetaType::VECTOR4));
Expand Down Expand Up @@ -64,6 +76,8 @@ class ScreenPosition : public ShaderNode {
A_PROPERTIES(
A_PROPERTY(bool, normalized, ScreenPosition::normalized, ScreenPosition::setNormalized)
)
A_NOMETHODS()
A_NOENUMS()

public:
ScreenPosition() :
Expand Down Expand Up @@ -114,6 +128,8 @@ class ProjectionMatrix : public ShaderNode {
A_PROPERTIES(
A_PROPERTY(bool, inverted, ProjectionMatrix::inverted, ProjectionMatrix::setInverted)
)
A_NOMETHODS()
A_NOENUMS()

public:
ProjectionMatrix() :
Expand Down
28 changes: 28 additions & 0 deletions modules/editor/shadertools/converter/functions/constvalue.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@
class ConstPi : public ShaderNode {
A_OBJECT(ConstPi, ShaderNode, Shader/Constant)

A_NOPROPERTIES()
A_NOMETHODS()
A_NOENUMS()

public:
ConstPi() {
m_outputs.push_back(std::make_pair("Value", MetaType::FLOAT));
Expand All @@ -22,6 +26,10 @@ class ConstPi : public ShaderNode {
class ConstEuler : public ShaderNode {
A_OBJECT(ConstEuler, ShaderNode, Shader/Constant)

A_NOPROPERTIES()
A_NOMETHODS()
A_NOENUMS()

public:
ConstEuler() {
m_outputs.push_back(std::make_pair("Value", MetaType::FLOAT));
Expand All @@ -38,6 +46,10 @@ class ConstEuler : public ShaderNode {
class ConstGoldenRatio : public ShaderNode {
A_OBJECT(ConstGoldenRatio, ShaderNode, Shader/Constant)

A_NOPROPERTIES()
A_NOMETHODS()
A_NOENUMS()

public:
ConstGoldenRatio() {
m_outputs.push_back(std::make_pair("Value", MetaType::FLOAT));
Expand All @@ -57,6 +69,8 @@ class ConstFloat : public ShaderNode {
A_PROPERTIES(
A_PROPERTY(float, Value, ConstFloat::value, ConstFloat::setValue)
)
A_NOMETHODS()
A_NOENUMS()

public:
ConstFloat() :
Expand Down Expand Up @@ -91,6 +105,8 @@ class ConstInt : public ShaderNode {
A_PROPERTIES(
A_PROPERTY(int, Value, ConstFloat::value, ConstFloat::setValue)
)
A_NOMETHODS()
A_NOENUMS()

public:
ConstInt() :
Expand Down Expand Up @@ -125,6 +141,8 @@ class ConstVector2 : public ShaderNode {
A_PROPERTIES(
A_PROPERTY(Vector2, Value, ConstVector2::value, ConstVector2::setValue)
)
A_NOMETHODS()
A_NOENUMS()

public:
ConstVector2() {
Expand Down Expand Up @@ -157,6 +175,8 @@ class ConstVector3 : public ShaderNode {
A_PROPERTIES(
A_PROPERTY(Vector3, Value, ConstVector3::value, ConstVector3::setValue)
)
A_NOMETHODS()
A_NOENUMS()

public:
ConstVector3() {
Expand Down Expand Up @@ -189,6 +209,8 @@ class ConstVector4 : public ShaderNode {
A_PROPERTIES(
A_PROPERTY(Vector4, Value, ConstVector4::value, ConstVector4::setValue)
)
A_NOMETHODS()
A_NOENUMS()

public:
ConstVector4() :
Expand Down Expand Up @@ -223,6 +245,8 @@ class ConstColor : public ShaderNode {
A_PROPERTIES(
A_PROPERTYEX(Vector4, Value, ConstColor::value, ConstColor::setValue, "editor=Color")
)
A_NOMETHODS()
A_NOENUMS()

public:
ConstColor() :
Expand Down Expand Up @@ -259,6 +283,8 @@ class ConstMatrix3 : public ShaderNode {
A_PROPERTY(Vector3, Value1, ConstMatrix3::value1, ConstMatrix3::setValue1),
A_PROPERTY(Vector3, Value2, ConstMatrix3::value2, ConstMatrix3::setValue2)
)
A_NOMETHODS()
A_NOENUMS()

public:
ConstMatrix3() {
Expand Down Expand Up @@ -320,6 +346,8 @@ class ConstMatrix4 : public ShaderNode {
A_PROPERTY(Vector4, Value2, ConstMatrix4::value2, ConstMatrix4::setValue2),
A_PROPERTY(Vector4, Value3, ConstMatrix4::value3, ConstMatrix4::setValue3)
)
A_NOMETHODS()
A_NOENUMS()

public:
ConstMatrix4() {
Expand Down
8 changes: 8 additions & 0 deletions modules/editor/shadertools/converter/functions/coordinates.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@
class ProjectionCoord : public ShaderNode {
A_OBJECT(ProjectionCoord, ShaderNode, Shader/Coordinates)

A_NOPROPERTIES()
A_NOMETHODS()
A_NOENUMS()

public:
ProjectionCoord() {
m_outputs.push_back(std::make_pair("Output", MetaType::VECTOR3));
Expand All @@ -27,6 +31,8 @@ class TexCoord : public ShaderNode {
A_PROPERTIES(
A_PROPERTY(int, Index, TexCoord::index, TexCoord::setIndex)
)
A_NOMETHODS()
A_NOENUMS()

public:
TexCoord() :
Expand Down Expand Up @@ -56,6 +62,8 @@ class CoordPanner : public ShaderNode {
A_PROPERTY(float, X, CoordPanner::valueX, CoordPanner::setValueX),
A_PROPERTY(float, Y, CoordPanner::valueY, CoordPanner::setValueY)
)
A_NOMETHODS()
A_NOENUMS()

public:
CoordPanner() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@
class CustomFunction : public ShaderNode {
A_OBJECT(CustomFunction, ShaderNode, Graph)

A_NOPROPERTIES()
A_NOMETHODS()
A_NOENUMS()

public:
CustomFunction() { }

Expand Down
2 changes: 2 additions & 0 deletions modules/editor/shadertools/converter/functions/function.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ class ShaderNode : public GraphNode {
A_METHODS(
A_SLOT(ShaderNode::switchPreview)
)
A_NOPROPERTIES()
A_NOENUMS()

public:
ShaderNode();
Expand Down
2 changes: 2 additions & 0 deletions modules/editor/shadertools/converter/functions/imageeffects.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ class Desaturate : public ShaderNode {
A_PROPERTY(Vector3, RGB, Desaturate::rgb, Desaturate::setRgb),
A_PROPERTY(float, fraction, Desaturate::fraction, Desaturate::setFraction)
)
A_NOMETHODS()
A_NOENUMS()

public:
Desaturate() :
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ class If : public ShaderNode {
A_PROPERTY(float, AEB, If::getAEB, If::setAEB),
A_PROPERTY(float, ALB, If::getALB, If::setALB)
)
A_NOMETHODS()
A_NOENUMS()

public:
If() :
Expand Down Expand Up @@ -125,6 +127,10 @@ class If : public ShaderNode {
class Compare : public ShaderNode {
A_OBJECT(Compare, ShaderNode, Shader/Logic Operators)

A_NOPROPERTIES()
A_NOMETHODS()
A_NOENUMS()

public:
Compare() :
m_a(0.0f),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ class ParamFloat : public ShaderNode {
A_PROPERTY(TString, Parameter_Name, ParamFloat::name, ParamFloat::setName),
A_PROPERTY(float, Default_Value, ParamFloat::defaultValue, ParamFloat::setDefaultValue)
)
A_NOMETHODS()
A_NOENUMS()

public:
ParamFloat() :
Expand Down Expand Up @@ -53,6 +55,8 @@ class ParamVector : public ShaderNode {
A_PROPERTY(TString, Parameter_Name, ParamVector::name, ParamVector::setName),
A_PROPERTY(Vector4, Default_Value, ParamVector::defaultValue, ParamVector::setDefaultValue)
)
A_NOMETHODS()
A_NOENUMS()

public:
ParamVector() :
Expand Down
Loading
Loading