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/widget/keyframeview/keyframeview.cpp
+3 -3
View File
@@ -31,14 +31,14 @@ KeyframeView::KeyframeView(QWidget *parent) :
setAlignment(Qt::AlignLeft | Qt::AlignTop);
}
void KeyframeView::SetElementY(const NodeConnectable::InputConnection &c, int y)
void KeyframeView::SetElementY(const NodeInput &c, int y)
{
qreal scene_y = mapToScene(mapFromGlobal(QPoint(0, y))).y();
element_y_.insert(c, scene_y);
for (auto it=item_map().cbegin(); it!=item_map().cend(); it++) {
if (it.key()->parent() == c.input && it.key()->element() == c.element) {
if (it.key()->key_track_ref().input() == c) {
it.value()->SetOverrideY(scene_y);
}
}
@@ -60,7 +60,7 @@ void KeyframeView::SceneRectUpdateEvent(QRectF &rect)
KeyframeViewItem* KeyframeView::AddKeyframe(NodeKeyframe* key)
{
KeyframeViewItem* item = super::AddKeyframe(key);
item->SetOverrideY(element_y_.value({key->parent(), key->element()}));
item->SetOverrideY(element_y_.value(key->key_track_ref().input()));
return item;
}
app/widget/keyframeview/keyframeview.h
+2 -2
View File
@@ -36,7 +36,7 @@ public:
max_scroll_ = i;
}
void SetElementY(const Node::InputConnection& c, int y);
void SetElementY(const NodeInput& c, int y);
protected:
virtual void wheelEvent(QWheelEvent* event) override;
@@ -47,7 +47,7 @@ public slots:
virtual KeyframeViewItem* AddKeyframe(NodeKeyframe* key) override;
private:
QHash<Node::InputConnection, qreal> element_y_;
QHash<NodeInput, qreal> element_y_;
int max_scroll_;
app/widget/keyframeview/keyframeviewbase.cpp
+39 -37
View File
@@ -74,35 +74,36 @@ void KeyframeViewBase::DeleteSelected()
void KeyframeViewBase::AddKeyframesOfNode(Node *n)
{
foreach (NodeInput* i, n->inputs()) {
AddKeyframesOfInput(i);
foreach (const QString& i, n->inputs()) {
AddKeyframesOfInput(n, i);
}
}
void KeyframeViewBase::AddKeyframesOfInput(NodeInput *input)
void KeyframeViewBase::AddKeyframesOfInput(Node* n, const QString& input)
{
if (!input->IsKeyframable()) {
if (!n->IsInputKeyframable(input)) {
return;
}
for (int i=-1; i<input->ArraySize(); i++) {
AddKeyframesOfElement(input, i);
int arr_sz = n->InputArraySize(input);
for (int i=-1; i<arr_sz; i++) {
AddKeyframesOfElement(NodeInput(n, input, i));
}
}
void KeyframeViewBase::AddKeyframesOfElement(NodeInput *input, int element)
void KeyframeViewBase::AddKeyframesOfElement(const NodeInput& input)
{
const QVector<NodeKeyframeTrack>& tracks = input->GetKeyframeTracks(element);
const QVector<NodeKeyframeTrack>& tracks = input.node()->GetKeyframeTracks(input);
for (int i=0; i<tracks.size(); i++) {
AddKeyframesOfTrack(input, element, i);
AddKeyframesOfTrack(NodeKeyframeTrackReference(input, i));
}
}
void KeyframeViewBase::AddKeyframesOfTrack(NodeInput *input, int element, int track)
void KeyframeViewBase::AddKeyframesOfTrack(const NodeKeyframeTrackReference& ref)
{
const QVector<NodeKeyframeTrack>& tracks = input->GetKeyframeTracks(element);
const NodeKeyframeTrack& t = tracks.at(track);
const QVector<NodeKeyframeTrack>& tracks = ref.input().node()->GetKeyframeTracks(ref.input());
const NodeKeyframeTrack& t = tracks.at(ref.track());
foreach (NodeKeyframe* key, t) {
AddKeyframe(key);
@@ -111,35 +112,36 @@ void KeyframeViewBase::AddKeyframesOfTrack(NodeInput *input, int element, int tr
void KeyframeViewBase::RemoveKeyframesOfNode(Node *n)
{
foreach (NodeInput* i, n->inputs()) {
RemoveKeyframesOfInput(i);
foreach (const QString& i, n->inputs()) {
RemoveKeyframesOfInput(n, i);
}
}
void KeyframeViewBase::RemoveKeyframesOfInput(NodeInput *input)
void KeyframeViewBase::RemoveKeyframesOfInput(Node* n, const QString& input)
{
if (!input->IsKeyframable()) {
if (!n->IsInputKeyframable(input)) {
return;
}
for (int i=-1; i<input->ArraySize(); i++) {
RemoveKeyframesOfElement(input, i);
int arr_sz = n->InputArraySize(input);
for (int i=-1; i<arr_sz; i++) {
RemoveKeyframesOfElement(NodeInput(n, input, i));
}
}
void KeyframeViewBase::RemoveKeyframesOfElement(NodeInput *input, int element)
void KeyframeViewBase::RemoveKeyframesOfElement(const NodeInput& input)
{
const QVector<NodeKeyframeTrack>& tracks = input->GetKeyframeTracks(element);
const QVector<NodeKeyframeTrack>& tracks = input.node()->GetKeyframeTracks(input);
for (int i=0; i<tracks.size(); i++) {
RemoveKeyframesOfTrack(input, element, i);
RemoveKeyframesOfTrack(NodeKeyframeTrackReference(input, i));
}
}
void KeyframeViewBase::RemoveKeyframesOfTrack(NodeInput *input, int element, int track)
void KeyframeViewBase::RemoveKeyframesOfTrack(const NodeKeyframeTrackReference& ref)
{
const QVector<NodeKeyframeTrack>& tracks = input->GetKeyframeTracks(element);
const NodeKeyframeTrack& t = tracks.at(track);
const QVector<NodeKeyframeTrack>& tracks = ref.input().node()->GetKeyframeTracks(ref.input());
const NodeKeyframeTrack& t = tracks.at(ref.track());
foreach (NodeKeyframe* key, t) {
RemoveKeyframe(key);
@@ -222,7 +224,7 @@ void KeyframeViewBase::mousePressEvent(QMouseEvent *event)
selected_keys_.replace(i, {key,
key->x(),
GetAdjustedTime(key->key()->parent()->parent(), GetTimeTarget(), key->key()->time(), false),
GetAdjustedTime(key->key()->parent(), GetTimeTarget(), key->key()->time(), false),
key->key()->value().toDouble()});
}
}
@@ -286,18 +288,17 @@ void KeyframeViewBase::mouseMoveEvent(QMouseEvent *event)
if (IsYAxisEnabled()) {
foreach (const KeyframeItemAndTime& keypair, selected_keys_) {
NodeInput* input = keypair.key->key()->parent();
QList<QByteArray> properties = input->dynamicPropertyNames();
Node* node = keypair.key->key()->parent();
const QString& input = keypair.key->key()->input();
double new_val = keypair.value - mouse_diff_scaled.y();
double limited = new_val;
if (properties.contains("min")) {
limited = qMax(limited, input->property("min").toDouble());
if (node->HasInputProperty(input, QStringLiteral("min"))) {
limited = qMax(limited, node->GetInputProperty(input, QStringLiteral("min")).toDouble());
}
if (properties.contains("max")) {
limited = qMin(limited, input->property("max").toDouble());
if (node->HasInputProperty(input, QStringLiteral("max"))) {
limited = qMin(limited, node->GetInputProperty(input, QStringLiteral("max")).toDouble());
}
if (limited != new_val) {
@@ -305,15 +306,16 @@ void KeyframeViewBase::mouseMoveEvent(QMouseEvent *event)
}
}
NodeInput* initial_drag_input = initial_drag_item_->key()->parent();
if (initial_drag_input->dynamicPropertyNames().contains("view")) {
display_type = static_cast<FloatSlider::DisplayType>(initial_drag_input->property("view").toInt());
Node* initial_drag_input = initial_drag_item_->key()->parent();
const QString& initial_drag_input_id = initial_drag_item_->key()->input();
if (initial_drag_input->HasInputProperty(initial_drag_input_id, QStringLiteral("view"))) {
display_type = static_cast<FloatSlider::DisplayType>(initial_drag_input->GetInputProperty(initial_drag_input_id, QStringLiteral("view")).toInt());
}
}
foreach (const KeyframeItemAndTime& keypair, selected_keys_) {
rational node_time = GetAdjustedTime(GetTimeTarget(),
keypair.key->key()->parent()->parent(),
keypair.key->key()->parent(),
CalculateNewTimeFromScreen(keypair.time, mouse_diff_scaled.x()),
true);
@@ -590,7 +592,7 @@ void KeyframeViewBase::AutoSelectKeyTimeNeighbors()
rational key_time = key_item->key()->time();
QVector<NodeKeyframe*> keys = key_item->key()->parent()->GetKeyframesAtTime(key_time, key_item->key()->element());
QVector<NodeKeyframe*> keys = key_item->key()->parent()->GetKeyframesAtTime(key_item->key()->input(), key_time, key_item->key()->element());
foreach (NodeKeyframe* k, keys) {
if (k == key_item->key()) {
app/widget/keyframeview/keyframeviewbase.h
+6 -6
View File
@@ -42,19 +42,19 @@ public:
void AddKeyframesOfNode(Node* n);
void AddKeyframesOfInput(NodeInput* input);
void AddKeyframesOfInput(Node *n, const QString &input);
void AddKeyframesOfElement(NodeInput* input, int element);
void AddKeyframesOfElement(const NodeInput &input);
void AddKeyframesOfTrack(NodeInput* input, int element, int track);
void AddKeyframesOfTrack(const NodeKeyframeTrackReference &ref);
void RemoveKeyframesOfNode(Node* n);
void RemoveKeyframesOfInput(NodeInput* input);
void RemoveKeyframesOfInput(Node *n, const QString &input);
void RemoveKeyframesOfElement(NodeInput* input, int element);
void RemoveKeyframesOfElement(const NodeInput &input);
void RemoveKeyframesOfTrack(NodeInput* input, int element, int track);
void RemoveKeyframesOfTrack(const NodeKeyframeTrackReference &ref);
void SelectAll();
app/widget/keyframeview/keyframeviewitem.cpp
+1 -2
View File
@@ -26,7 +26,6 @@
#include <QWidget>
#include "common/qtutils.h"
#include "node/input.h"
namespace olive {
@@ -117,7 +116,7 @@ void KeyframeViewItem::TimeTargetChangedEvent(Node *)
void KeyframeViewItem::UpdatePos()
{
rational adjusted = GetAdjustedTime(key_->parent()->parent(), GetTimeTarget(), key_->time(), false);
rational adjusted = GetAdjustedTime(key_->parent(), GetTimeTarget(), key_->time(), false);
setPos(adjusted.toDouble() * scale_, vert_center_);
}
app/widget/keyframeview/keyframeviewundo.cpp
+2 -3
View File
@@ -20,7 +20,6 @@
#include "keyframeviewundo.h"
#include "node/input.h"
#include "node/node.h"
#include "project/item/sequence/sequence.h"
@@ -35,7 +34,7 @@ KeyframeSetTypeCommand::KeyframeSetTypeCommand(NodeKeyframe* key, NodeKeyframe::
Project *KeyframeSetTypeCommand::GetRelevantProject() const
{
return key_->parent()->parent()->parent()->project();
return key_->parent()->parent()->project();
}
void KeyframeSetTypeCommand::redo()
@@ -66,7 +65,7 @@ KeyframeSetBezierControlPoint::KeyframeSetBezierControlPoint(NodeKeyframe* key,
Project *KeyframeSetBezierControlPoint::GetRelevantProject() const
{
return key_->parent()->parent()->parent()->project();
return key_->parent()->parent()->project();
}
void KeyframeSetBezierControlPoint::redo()