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

move undo files around for better organization

Browse Source
This commit is contained in:
itsmattkc
2023-02-20 16:09:22 -08:00
parent c5da1339b9
commit 11e4e051c3
76 changed files with 1612 additions and 1742 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/node/node.cpp
+4 -148
View File
@@ -29,11 +29,10 @@
#include "core.h"
#include "config/config.h"
#include "node/group/group.h"
#include "nodeundo.h"
#include "project.h"
#include "ui/colorcoding.h"
#include "ui/icons/icons.h"
#include "widget/nodeparamview/nodeparamviewundo.h"
#include "widget/nodeview/nodeviewundo.h"
namespace olive {
@@ -42,7 +41,6 @@ namespace olive {
const QString Node::kEnabledInput = QStringLiteral("enabled_in");
Node::Node() :
can_be_deleted_(true),
override_color_(-1),
folder_(nullptr),
flags_(kNone),
@@ -815,7 +813,7 @@ void Node::InputArrayResize(const QString &id, int size)
return;
}
ArrayResizeCommand* c = new ArrayResizeCommand(this, id, size);
NodeArrayResizeCommand* c = new NodeArrayResizeCommand(this, id, size);
c->redo_now();
delete c;
}
@@ -1426,7 +1424,7 @@ void Node::CopyValuesOfElement(const Node *src, Node *dst, const QString &input,
// Copy keyframes
if (NodeInputImmediate *immediate = dst->GetImmediate(input, dst_element)) {
if (command) {
command->add_child(new ImmediateRemoveAllKeyframesCommand(immediate));
command->add_child(new NodeImmediateRemoveAllKeyframesCommand(immediate));
} else {
immediate->delete_all_keyframes();
}
@@ -1455,7 +1453,7 @@ void Node::CopyValuesOfElement(const Node *src, Node *dst, const QString &input,
if (src_element == -1 && dst_element == -1) {
int array_sz = src->InputArraySize(input);
if (command) {
command->add_child(new Node::ArrayResizeCommand(dst, input, array_sz));
command->add_child(new NodeArrayResizeCommand(dst, input, array_sz));
} else {
dst->ArrayResizeInternal(input, array_sz);
}
@@ -1470,16 +1468,6 @@ void Node::CopyValuesOfElement(const Node *src, Node *dst, const QString &input,
}
}
bool Node::CanBeDeleted() const
{
return can_be_deleted_;
}
void Node::SetCanBeDeleted(bool s)
{
can_be_deleted_ = s;
}
void GetDependenciesRecursively(QVector<Node*>& list, const Node* node, bool traverse, bool exclusive_only)
{
for (auto it=node->input_connections().cbegin(); it!=node->input_connections().cend(); it++) {
@@ -1650,11 +1638,6 @@ TimeRange Node::TransformTimeTo(TimeRange time, Node *target, TransformTimeDirec
return time;
}
QVariant Node::PtrToValue(void *ptr)
{
return reinterpret_cast<quintptr>(ptr);
}
void Node::ParameterValueChanged(const QString& input, int element, const TimeRange& range)
{
InputValueChangedEvent(input, element);
@@ -1948,131 +1931,4 @@ std::list<NodeInput> Node::FindPath(Node *from, Node *to, int path_index)
return v;
}
Project *Node::ArrayInsertCommand::GetRelevantProject() const
{
return node_->project();
}
Project *Node::ArrayRemoveCommand::GetRelevantProject() const
{
return node_->project();
}
Project *Node::ArrayResizeCommand::GetRelevantProject() const
{
return node_->project();
}
void NodeSetPositionCommand::redo()
{
added_ = !context_->ContextContainsNode(node_);
if (!added_) {
old_pos_ = context_->GetNodePositionDataInContext(node_);
}
context_->SetNodePositionInContext(node_, pos_);
}
void NodeSetPositionCommand::undo()
{
if (added_) {
context_->RemoveNodeFromContext(node_);
} else {
context_->SetNodePositionInContext(node_, old_pos_);
}
}
void NodeRemovePositionFromContextCommand::redo()
{
contained_ = context_->ContextContainsNode(node_);
if (contained_) {
old_pos_ = context_->GetNodePositionDataInContext(node_);
context_->RemoveNodeFromContext(node_);
}
}
void NodeRemovePositionFromContextCommand::undo()
{
if (contained_) {
context_->SetNodePositionInContext(node_, old_pos_);
}
}
void NodeRemovePositionFromAllContextsCommand::redo()
{
Project *graph = node_->parent();
foreach (Node* context, graph->nodes()) {
if (context->ContextContainsNode(node_)) {
contexts_.insert({context, context->GetNodePositionInContext(node_)});
context->RemoveNodeFromContext(node_);
}
}
}
void NodeRemovePositionFromAllContextsCommand::undo()
{
for (auto it = contexts_.crbegin(); it != contexts_.crend(); it++) {
it->first->SetNodePositionInContext(node_, it->second);
}
contexts_.clear();
}
void NodeSetPositionAndDependenciesRecursivelyCommand::prepare()
{
move_recursively(node_, pos_.position - context_->GetNodePositionDataInContext(node_).position);
}
void NodeSetPositionAndDependenciesRecursivelyCommand::redo()
{
for (auto it=commands_.cbegin(); it!=commands_.cend(); it++) {
(*it)->redo_now();
}
}
void NodeSetPositionAndDependenciesRecursivelyCommand::undo()
{
for (auto it=commands_.crbegin(); it!=commands_.crend(); it++) {
(*it)->undo_now();
}
}
void NodeSetPositionAndDependenciesRecursivelyCommand::move_recursively(Node *node, const QPointF &diff)
{
Node::Position pos = context_->GetNodePositionDataInContext(node);
pos += diff;
commands_.append(new NodeSetPositionCommand(node_, context_, pos));
for (auto it=node->input_connections().cbegin(); it!=node->input_connections().cend(); it++) {
Node *output = it->second;
if (context_->ContextContainsNode(output)) {
move_recursively(output, diff);
}
}
}
void Node::ImmediateRemoveAllKeyframesCommand::prepare()
{
for (const NodeKeyframeTrack& track : immediate_->keyframe_tracks()) {
keys_.append(track);
}
}
void Node::ImmediateRemoveAllKeyframesCommand::redo()
{
for (auto it=keys_.cbegin(); it!=keys_.cend(); it++) {
(*it)->setParent(&memory_manager_);
}
}
void Node::ImmediateRemoveAllKeyframesCommand::undo()
{
for (auto it=keys_.crbegin(); it!=keys_.crend(); it++) {
(*it)->setParent(&memory_manager_);
}
}
}