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

nodes: remove graph and merge into project

Browse Source
This commit is contained in:
itsmattkc
2023-02-17 14:13:03 -08:00
parent 491fbacfbc
commit 9745b536f6
62 changed files with 266 additions and 344 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/render/diskmanager.h
+1 -1
View File
@@ -27,7 +27,7 @@
#include <QTimer>
#include "common/define.h"
#include "node/project/project.h"
#include "node/project.h"
namespace olive {
app/render/playbackcache.cpp
+1 -1
View File
@@ -21,7 +21,7 @@
#include "playbackcache.h"
#include "node/output/viewer/viewer.h"
#include "node/project/project.h"
#include "node/project.h"
#include "node/project/sequence/sequence.h"
#include "render/diskmanager.h"
app/render/previewautocacher.cpp
+1 -1
View File
@@ -26,7 +26,7 @@
#include "codec/conformmanager.h"
#include "node/input/multicam/multicamnode.h"
#include "node/inputdragger.h"
#include "node/project/project.h"
#include "node/project.h"
#include "render/diskmanager.h"
#include "render/rendermanager.h"
app/render/previewautocacher.h
+1 -2
View File
@@ -25,11 +25,10 @@
#include "config/config.h"
#include "node/color/colormanager/colormanager.h"
#include "node/graph.h"
#include "node/group/group.h"
#include "node/node.h"
#include "node/output/viewer/viewer.h"
#include "node/project/project.h"
#include "node/project.h"
#include "render/projectcopier.h"
#include "render/renderjobtracker.h"
#include "render/renderticket.h"
app/render/projectcopier.cpp
+14 -12
View File
@@ -20,6 +20,8 @@
#include "projectcopier.h"
#include "node/group/group.h"
namespace olive {
ProjectCopier::ProjectCopier(QObject *parent) :
@@ -39,12 +41,12 @@ void ProjectCopier::SetProject(Project *project)
copy_map_.clear();
graph_update_queue_.clear();
disconnect(original_, &NodeGraph::NodeAdded, this, &ProjectCopier::QueueNodeAdd);
disconnect(original_, &NodeGraph::NodeRemoved, this, &ProjectCopier::QueueNodeRemove);
disconnect(original_, &NodeGraph::InputConnected, this, &ProjectCopier::QueueEdgeAdd);
disconnect(original_, &NodeGraph::InputDisconnected, this, &ProjectCopier::QueueEdgeRemove);
disconnect(original_, &NodeGraph::ValueChanged, this, &ProjectCopier::QueueValueChange);
disconnect(original_, &NodeGraph::InputValueHintChanged, this, &ProjectCopier::QueueValueHintChange);
disconnect(original_, &Project::NodeAdded, this, &ProjectCopier::QueueNodeAdd);
disconnect(original_, &Project::NodeRemoved, this, &ProjectCopier::QueueNodeRemove);
disconnect(original_, &Project::InputConnected, this, &ProjectCopier::QueueEdgeAdd);
disconnect(original_, &Project::InputDisconnected, this, &ProjectCopier::QueueEdgeRemove);
disconnect(original_, &Project::ValueChanged, this, &ProjectCopier::QueueValueChange);
disconnect(original_, &Project::InputValueHintChanged, this, &ProjectCopier::QueueValueHintChange);
}
original_ = project;
@@ -71,12 +73,12 @@ void ProjectCopier::SetProject(Project *project)
UpdateLastSyncedValue();
// Connect signals for future node additions/deletions
connect(original_, &NodeGraph::NodeAdded, this, &ProjectCopier::QueueNodeAdd, Qt::DirectConnection);
connect(original_, &NodeGraph::NodeRemoved, this, &ProjectCopier::QueueNodeRemove, Qt::DirectConnection);
connect(original_, &NodeGraph::InputConnected, this, &ProjectCopier::QueueEdgeAdd, Qt::DirectConnection);
connect(original_, &NodeGraph::InputDisconnected, this, &ProjectCopier::QueueEdgeRemove, Qt::DirectConnection);
connect(original_, &NodeGraph::ValueChanged, this, &ProjectCopier::QueueValueChange, Qt::DirectConnection);
connect(original_, &NodeGraph::InputValueHintChanged, this, &ProjectCopier::QueueValueHintChange, Qt::DirectConnection);
connect(original_, &Project::NodeAdded, this, &ProjectCopier::QueueNodeAdd, Qt::DirectConnection);
connect(original_, &Project::NodeRemoved, this, &ProjectCopier::QueueNodeRemove, Qt::DirectConnection);
connect(original_, &Project::InputConnected, this, &ProjectCopier::QueueEdgeAdd, Qt::DirectConnection);
connect(original_, &Project::InputDisconnected, this, &ProjectCopier::QueueEdgeRemove, Qt::DirectConnection);
connect(original_, &Project::ValueChanged, this, &ProjectCopier::QueueValueChange, Qt::DirectConnection);
connect(original_, &Project::InputValueHintChanged, this, &ProjectCopier::QueueValueHintChange, Qt::DirectConnection);
}
}
app/render/projectcopier.h
+2 -2
View File
@@ -21,7 +21,7 @@
#ifndef PROJECTCOPIER_H
#define PROJECTCOPIER_H
#include "node/project/project.h"
#include "node/project.h"
namespace olive {
@@ -99,7 +99,7 @@ private:
std::list<QueuedJob> graph_update_queue_;
QHash<Node*, Node*> copy_map_;
QHash<NodeGraph*, NodeGraph*> graph_map_;
QHash<Project*, Project*> graph_map_;
QVector<Node*> created_nodes_;
JobTime graph_changed_time_;
app/render/rendermanager.h
+1 -1
View File
@@ -26,8 +26,8 @@
#include "config/config.h"
#include "colorprocessorcache.h"
#include "dialog/rendercancel/rendercancel.h"
#include "node/graph.h"
#include "node/output/viewer/viewer.h"
#include "node/project.h"
#include "node/traverser.h"
#include "render/previewautocacher.h"
#include "render/renderer.h"
app/render/renderprocessor.cpp
+1 -1
View File
@@ -28,7 +28,7 @@
#include "audio/audioprocessor.h"
#include "node/block/clip/clip.h"
#include "node/block/transition/transition.h"
#include "node/project/project.h"
#include "node/project.h"
#include "rendermanager.h"
namespace olive {