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

make nodes more const friendly and prepare their functions for stateless work

Browse Source 
Since the nodes won't be holding any rendering data themselves in this system,
we may as well enforce some level of non-write access by setting all the
functions to const. They were already const-friendly, they just weren't
labelled as such.
This commit is contained in:
itsmattkc
2019-12-04 20:10:42 +11:00
parent cbf4d5b8c7
commit bc0f01d9a3
30 changed files with 505 additions and 346 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/node/distort/transform/transform.cpp
+20 -21
View File
@@ -46,27 +46,27 @@ TransformDistort::TransformDistort()
AddParameter(matrix_output_);
}
Node *TransformDistort::copy()
Node *TransformDistort::copy() const
{
return new TransformDistort();
}
QString TransformDistort::Name()
QString TransformDistort::Name() const
{
return tr("Transform");
}
QString TransformDistort::id()
QString TransformDistort::id() const
{
return "org.olivevideoeditor.Olive.transform";
}
QString TransformDistort::Category()
QString TransformDistort::Category() const
{
return tr("Distort");
}
QString TransformDistort::Description()
QString TransformDistort::Description() const
{
return tr("Apply transformations to position, rotation, and scale.");
}
@@ -84,26 +84,25 @@ void TransformDistort::Retranslate()
anchor_input_->set_name(tr("Anchor Point"));
}
QVariant TransformDistort::Value(NodeOutput *output)
NodeValueTable TransformDistort::Value(const NodeValueDatabase &value) const
{
if (output == matrix_output_) {
QMatrix4x4 mat;
QMatrix4x4 mat;
// Position translate
QVector2D pos = position_input_->value().value<QVector2D>();
mat.translate(pos);
// Position translate
QVector2D pos = value[position_input_].Get(NodeParam::kVec2).value<QVector2D>();
mat.translate(pos);
// Rotation
mat.rotate(rotation_input_->value().toFloat(), 0, 0, 1);
// Rotation
mat.rotate(value[rotation_input_].Get(NodeParam::kFloat).toFloat(), 0, 0, 1);
// Scale
mat.scale(scale_input_->value().value<QVector2D>()*0.01f);
// Scale
mat.scale(value[scale_input_].Get(NodeParam::kVec2).value<QVector2D>()*0.01f);
// Anchor Point
mat.translate(-anchor_input_->value().value<QVector2D>());
// Anchor Point
mat.translate(-value[anchor_input_].Get(NodeParam::kVec2).value<QVector2D>());
return mat;
}
return 0;
// Push matrix output
NodeValueTable output = value.Merge();
output.Push(NodeParam::kMatrix, mat);
return output;
}
app/node/distort/transform/transform.h
+6 -6
View File
@@ -29,18 +29,18 @@ class TransformDistort : public Node
public:
TransformDistort();
virtual Node* copy() override;
virtual Node* copy() const override;
virtual QString Name() override;
virtual QString id() override;
virtual QString Category() override;
virtual QString Description() override;
virtual QString Name() const override;
virtual QString id() const override;
virtual QString Category() const override;
virtual QString Description() const override;
NodeOutput* matrix_output();
virtual void Retranslate() override;
virtual QVariant Value(NodeOutput *output) override;
virtual NodeValueTable Value(const NodeValueDatabase& value) const override;
private:
NodeInput* position_input_;