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/polygon/polygon.cpp
+25 -21
View File
@@ -25,25 +25,27 @@
namespace olive {
const QString PolygonGenerator::kPointsInput = QStringLiteral("points_in");
const QString PolygonGenerator::kColorInput = QStringLiteral("color_in");
PolygonGenerator::PolygonGenerator()
{
points_input_ = new NodeInput(this, QStringLiteral("points_in"), NodeValue::kVec2, QVector2D(0, 0));
points_input_->SetIsArray(true);
AddInput(kPointsInput, NodeValue::kVec2, QVector2D(0, 0), InputFlags(kInputFlagArray));
color_input_ = new NodeInput(this, QStringLiteral("color_in"), NodeValue::kColor, QVariant::fromValue(Color(1.0, 1.0, 1.0)));
AddInput(kColorInput, NodeValue::kColor, QVariant::fromValue(Color(1.0, 1.0, 1.0)));
// The Default Pentagon(tm)
points_input_->ArrayResize(5);
points_input_->SetStandardValueOnTrack(960, 0, 0);
points_input_->SetStandardValueOnTrack(240, 1, 0);
points_input_->SetStandardValueOnTrack(640, 0, 1);
points_input_->SetStandardValueOnTrack(480, 1, 1);
points_input_->SetStandardValueOnTrack(760, 0, 2);
points_input_->SetStandardValueOnTrack(800, 1, 2);
points_input_->SetStandardValueOnTrack(1100, 0, 3);
points_input_->SetStandardValueOnTrack(800, 1, 3);
points_input_->SetStandardValueOnTrack(1280, 0, 4);
points_input_->SetStandardValueOnTrack(480, 1, 4);
InputArrayResize(kPointsInput, 5);
SetSplitStandardValueOnTrack(kPointsInput, 0, 960, 0);
SetSplitStandardValueOnTrack(kPointsInput, 1, 240, 0);
SetSplitStandardValueOnTrack(kPointsInput, 0, 640, 1);
SetSplitStandardValueOnTrack(kPointsInput, 1, 480, 1);
SetSplitStandardValueOnTrack(kPointsInput, 0, 760, 2);
SetSplitStandardValueOnTrack(kPointsInput, 1, 800, 2);
SetSplitStandardValueOnTrack(kPointsInput, 0, 1100, 3);
SetSplitStandardValueOnTrack(kPointsInput, 1, 800, 3);
SetSplitStandardValueOnTrack(kPointsInput, 0, 1200, 4);
SetSplitStandardValueOnTrack(kPointsInput, 1, 480, 4);
}
Node *PolygonGenerator::copy() const
@@ -73,8 +75,8 @@ QString PolygonGenerator::Description() const
void PolygonGenerator::Retranslate()
{
points_input_->set_name(tr("Points"));
color_input_->set_name(tr("Color"));
SetInputName(kPointsInput, tr("Points"));
SetInputName(kColorInput, tr("Color"));
}
ShaderCode PolygonGenerator::GetShaderCode(const QString &shader_id) const
@@ -84,12 +86,14 @@ ShaderCode PolygonGenerator::GetShaderCode(const QString &shader_id) const
return ShaderCode(FileFunctions::ReadFileAsString(QStringLiteral(":/shaders/polygon.frag")));
}
NodeValueTable PolygonGenerator::Value(NodeValueDatabase &value) const
NodeValueTable PolygonGenerator::Value(const QString &output, NodeValueDatabase &value) const
{
Q_UNUSED(output)
ShaderJob job;
job.InsertValue(points_input_, value);
job.InsertValue(color_input_, value);
job.InsertValue(this, kPointsInput, value);
job.InsertValue(this, kColorInput, value);
job.InsertValue(QStringLiteral("resolution_in"), value[QStringLiteral("global")].GetWithMeta(NodeValue::kVec2, QStringLiteral("resolution")));
job.SetAlphaChannelRequired(true);
@@ -168,10 +172,10 @@ void PolygonGenerator::GizmoRelease()
QVector<QPointF> PolygonGenerator::GetGizmoCoordinates(NodeValueDatabase &db, const QVector2D& scale) const
{
// FIXME: Should Get() use a `kArray` type instead of a `kVec2` type?
QVector<NodeValueTable> array_tbl = db[points_input_].Get(NodeValue::kVec2).value< QVector<NodeValueTable> >();
QVector<NodeValueTable> array_tbl = db[kPointsInput].Get(NodeValue::kVec2).value< QVector<NodeValueTable> >();
QVector<QPointF> points(array_tbl.size());
for (int i=0;i<points_input_->ArraySize();i++) {
for (int i=0;i<array_tbl.size();i++) {
QVector2D v = array_tbl.at(i).Get(NodeValue::kVec2).value<QVector2D>();
v *= scale;
app/node/generator/polygon/polygon.h
+4 -5
View File
@@ -42,7 +42,7 @@ public:
virtual void Retranslate() override;
virtual ShaderCode GetShaderCode(const QString& shader_id) const override;
virtual NodeValueTable Value(NodeValueDatabase &value) const override;
virtual NodeValueTable Value(const QString& output, NodeValueDatabase &value) const override;
virtual bool HasGizmos() const override;
//virtual void DrawGizmos(NodeValueDatabase& db, QPainter *p) const override;
@@ -51,15 +51,14 @@ public:
//virtual void GizmoMove(const QPointF &p, const QVector2D &scale, const rational &time) override;
//virtual void GizmoRelease() override;
static const QString kPointsInput;
static const QString kColorInput;
private:
QVector<QPointF> GetGizmoCoordinates(NodeValueDatabase &db, const QVector2D &scale) const;
QVector<QRectF> GetGizmoRects(const QVector<QPointF>& points) const;
NodeInput* points_input_;
NodeInput* color_input_;
NodeInput* gizmo_drag_;
QPointF gizmo_drag_start_;