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

use strings to connect nodes

Browse Source 
This makes the node system somewhat more high-level with the intent of making
working with them far more flexible and stable. By making the architecture more
abstracted, it becomes far less rigid which should allow us to do even more
with it and make it much less crash prone.
This commit is contained in:
itsmattkc
2021-02-09 15:48:37 +11:00
parent d1a3e22eaa
commit 81c1922911
138 changed files with 4487 additions and 3913 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/node/generator/matrix/matrix.cpp
+44 -35
View File
@@ -27,23 +27,26 @@
namespace olive {
const QString MatrixGenerator::kPositionInput = QStringLiteral("pos_in");
const QString MatrixGenerator::kRotationInput = QStringLiteral("rot_in");
const QString MatrixGenerator::kScaleInput = QStringLiteral("scale_in");
const QString MatrixGenerator::kUniformScaleInput = QStringLiteral("uniform_scale_in");
const QString MatrixGenerator::kAnchorInput = QStringLiteral("anchor_in");
MatrixGenerator::MatrixGenerator()
{
position_input_ = new NodeInput(this, QStringLiteral("pos_in"), NodeValue::kVec2, QVector2D());
AddInput(kPositionInput, NodeValue::kVec2, QVector2D(0.0, 0.0));
rotation_input_ = new NodeInput(this, QStringLiteral("rot_in"), NodeValue::kFloat, 0.0f);
AddInput(kRotationInput, NodeValue::kFloat, 0.0);
scale_input_ = new NodeInput(this, QStringLiteral("scale_in"), NodeValue::kVec2, QVector2D(1.0f, 1.0f));
scale_input_->setProperty("min", QVector2D(0, 0));
scale_input_->setProperty("view", FloatSlider::kPercentage);
scale_input_->setProperty("disabley", true);
AddInput(kScaleInput, NodeValue::kVec2, QVector2D(1.0f, 1.0f));
SetInputProperty(kScaleInput, QStringLiteral("min"), QVector2D(0, 0));
SetInputProperty(kScaleInput, QStringLiteral("view"), FloatSlider::kPercentage);
SetInputProperty(kScaleInput, QStringLiteral("disabley"), true);
uniform_scale_input_ = new NodeInput(this, QStringLiteral("uniform_scale_in"), NodeValue::kBoolean, true);
uniform_scale_input_->SetKeyframable(false);
uniform_scale_input_->SetConnectable(false);
connect(uniform_scale_input_, &NodeInput::ValueChanged, this, &MatrixGenerator::UniformScaleChanged);
AddInput(kUniformScaleInput, NodeValue::kBoolean, true, InputFlags(kInputFlagNotConnectable | kInputFlagNotKeyframable));
anchor_input_ = new NodeInput(this, QStringLiteral("anchor_in"), NodeValue::kVec2, QVector2D());
AddInput(kAnchorInput, NodeValue::kVec2, QVector2D(0.0, 0.0));
}
Node *MatrixGenerator::copy() const
@@ -78,20 +81,22 @@ QString MatrixGenerator::Description() const
void MatrixGenerator::Retranslate()
{
position_input_->set_name(tr("Position"));
rotation_input_->set_name(tr("Rotation"));
scale_input_->set_name(tr("Scale"));
uniform_scale_input_->set_name(tr("Uniform Scale"));
anchor_input_->set_name(tr("Anchor Point"));
SetInputName(kPositionInput, tr("Position"));
SetInputName(kRotationInput, tr("Rotation"));
SetInputName(kScaleInput, tr("Scale"));
SetInputName(kUniformScaleInput, tr("Uniform Scale"));
SetInputName(kAnchorInput, tr("Anchor Point"));
}
NodeValueTable MatrixGenerator::Value(NodeValueDatabase &value) const
NodeValueTable MatrixGenerator::Value(const QString &output, NodeValueDatabase &value) const
{
Q_UNUSED(output)
// Push matrix output
QMatrix4x4 mat = GenerateMatrix(value, true, false, false, false);
NodeValueTable output = value.Merge();
output.Push(NodeValue::kMatrix, mat, this);
return output;
NodeValueTable out = value.Merge();
out.Push(NodeValue::kMatrix, mat, this);
return out;
}
QMatrix4x4 MatrixGenerator::GenerateMatrix(NodeValueDatabase &value, bool take, bool ignore_anchor, bool ignore_position, bool ignore_scale) const
@@ -103,47 +108,47 @@ QMatrix4x4 MatrixGenerator::GenerateMatrix(NodeValueDatabase &value, bool take,
if (!ignore_anchor) {
if (take) {
// Take and store
anchor = value[anchor_input_].Take(NodeValue::kVec2).value<QVector2D>();
anchor = value[kAnchorInput].Take(NodeValue::kVec2).value<QVector2D>();
} else {
// Get and store
anchor = value[anchor_input_].Get(NodeValue::kVec2).value<QVector2D>();
anchor = value[kAnchorInput].Get(NodeValue::kVec2).value<QVector2D>();
}
} else if (take) {
// Just take
value[anchor_input_].Take(NodeValue::kVec2).value<QVector2D>();
value[kAnchorInput].Take(NodeValue::kVec2).value<QVector2D>();
}
if (!ignore_scale) {
if (take) {
scale = value[scale_input_].Take(NodeValue::kVec2).value<QVector2D>();
scale = value[kScaleInput].Take(NodeValue::kVec2).value<QVector2D>();
} else {
scale = value[scale_input_].Get(NodeValue::kVec2).value<QVector2D>();
scale = value[kScaleInput].Get(NodeValue::kVec2).value<QVector2D>();
}
} else if (take) {
value[scale_input_].Take(NodeValue::kVec2).value<QVector2D>();
value[kScaleInput].Take(NodeValue::kVec2).value<QVector2D>();
}
if (!ignore_position) {
if (take) {
position = value[position_input_].Take(NodeValue::kVec2).value<QVector2D>();
position = value[kPositionInput].Take(NodeValue::kVec2).value<QVector2D>();
} else {
position = value[position_input_].Get(NodeValue::kVec2).value<QVector2D>();
position = value[kPositionInput].Get(NodeValue::kVec2).value<QVector2D>();
}
} else if (take) {
value[position_input_].Take(NodeValue::kVec2).value<QVector2D>();
value[kPositionInput].Take(NodeValue::kVec2).value<QVector2D>();
}
if (take) {
return GenerateMatrix(position,
value[rotation_input_].Take(NodeValue::kFloat).toFloat(),
value[kRotationInput].Take(NodeValue::kFloat).toFloat(),
scale,
value[uniform_scale_input_].Take(NodeValue::kBoolean).toBool(),
value[kUniformScaleInput].Take(NodeValue::kBoolean).toBool(),
anchor);
} else {
return GenerateMatrix(position,
value[rotation_input_].Get(NodeValue::kFloat).toFloat(),
value[kRotationInput].Get(NodeValue::kFloat).toFloat(),
scale,
value[uniform_scale_input_].Get(NodeValue::kBoolean).toBool(),
value[kUniformScaleInput].Get(NodeValue::kBoolean).toBool(),
anchor);
}
@@ -178,9 +183,13 @@ QMatrix4x4 MatrixGenerator::GenerateMatrix(const QVector2D& pos,
return mat;
}
void MatrixGenerator::UniformScaleChanged()
void MatrixGenerator::InputValueChangedEvent(const QString &input, int element)
{
scale_input_->setProperty("disabley", uniform_scale_input_->GetStandardValue().toBool());
Q_UNUSED(element)
if (input == kUniformScaleInput) {
SetInputProperty(kScaleInput, QStringLiteral("disabley"), GetStandardValue(kUniformScaleInput).toBool());
}
}
}
app/node/generator/matrix/matrix.h
+8 -39
View File
@@ -44,7 +44,13 @@ public:
virtual void Retranslate() override;
virtual NodeValueTable Value(NodeValueDatabase& value) const override;
virtual NodeValueTable Value(const QString& output, NodeValueDatabase& value) const override;
static const QString kPositionInput;
static const QString kRotationInput;
static const QString kScaleInput;
static const QString kUniformScaleInput;
static const QString kAnchorInput;
protected:
QMatrix4x4 GenerateMatrix(NodeValueDatabase &value, bool take, bool ignore_anchor, bool ignore_position, bool ignore_scale) const;
@@ -54,44 +60,7 @@ protected:
bool uniform_scale,
const QVector2D &anchor);
NodeInput* position_input() const
{
return position_input_;
}
NodeInput* rotation_input() const
{
return rotation_input_;
}
NodeInput* scale_input() const
{
return scale_input_;
}
NodeInput* uniform_scale_input() const
{
return uniform_scale_input_;
}
NodeInput* anchor_input() const
{
return anchor_input_;
}
private:
NodeInput* position_input_;
NodeInput* rotation_input_;
NodeInput* scale_input_;
NodeInput* uniform_scale_input_;
NodeInput* anchor_input_;
private slots:
void UniformScaleChanged();
virtual void InputValueChangedEvent(const QString& input, int element) override;
};