godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #50033 from nekomatata/nodepath-code-style-fix 

Coding style fix in editor NodePath update
This commit is contained in:
Rémi Verschelde 2021-06-30 21:38:38 +02:00 committed by GitHub
parent 915344fe76 62ce81ec15
commit 3530cb639a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
editor/scene_tree_dock.cpp
View File

@ -1409,7 +1409,7 @@ void SceneTreeDock::fill_path_renames(Node *p_node, Node *p_new_parent, List<Pai
_fill_path_renames(base_path, new_base_path, p_node, p_renames); _fill_path_renames(base_path, new_base_path, p_node, p_renames);
} }
bool SceneTreeDock::_update_node_path(const NodePath &p_root_path, NodePath &p_node_path, List<Pair<NodePath, NodePath>> *p_renames) { bool SceneTreeDock::_update_node_path(const NodePath &p_root_path, NodePath &r_node_path, List<Pair<NodePath, NodePath>> *p_renames) {
NodePath root_path_new = p_root_path; NodePath root_path_new = p_root_path;
for (List<Pair<NodePath, NodePath>>::Element *F = p_renames->front(); F; F = F->next()) { for (List<Pair<NodePath, NodePath>>::Element *F = p_renames->front(); F; F = F->next()) {
if (p_root_path == F->get().first) { if (p_root_path == F->get().first) {
@ -1423,7 +1423,7 @@ bool SceneTreeDock::_update_node_path(const NodePath &p_root_path, NodePath &p_n
NodePath rel_path_old = p_root_path.rel_path_to(F->get().first); NodePath rel_path_old = p_root_path.rel_path_to(F->get().first);
// If old path detected, then it needs to be replaced with the new one. // If old path detected, then it needs to be replaced with the new one.
if (p_node_path == rel_path_old) { if (r_node_path == rel_path_old) {
NodePath rel_path_new = F->get().second; NodePath rel_path_new = F->get().second;
// If not empty, get new relative path. // If not empty, get new relative path.
@ -1431,16 +1431,16 @@ bool SceneTreeDock::_update_node_path(const NodePath &p_root_path, NodePath &p_n
rel_path_new = root_path_new.rel_path_to(rel_path_new); rel_path_new = root_path_new.rel_path_to(rel_path_new);
} }
p_node_path = rel_path_new; r_node_path = rel_path_new;
return true; return true;
} }
// Update the node itself if it has a valid node path and has not been deleted. // Update the node itself if it has a valid node path and has not been deleted.
if (p_root_path == F->get().first && p_node_path != NodePath() && F->get().second != NodePath()) { if (p_root_path == F->get().first && r_node_path != NodePath() && F->get().second != NodePath()) {
NodePath abs_path = NodePath(String(root_path_new).plus_file(p_node_path)).simplified(); NodePath abs_path = NodePath(String(root_path_new).plus_file(r_node_path)).simplified();
NodePath rel_path_new = F->get().second.rel_path_to(abs_path); NodePath rel_path_new = F->get().second.rel_path_to(abs_path);
p_node_path = rel_path_new; r_node_path = rel_path_new;
return true; return true;
} }
} }
@ -1448,18 +1448,18 @@ bool SceneTreeDock::_update_node_path(const NodePath &p_root_path, NodePath &p_n
return false; return false;
} }
bool SceneTreeDock::_check_node_path_recursive(const NodePath &p_root_path, Variant &p_variant, List<Pair<NodePath, NodePath>> *p_renames) { bool SceneTreeDock::_check_node_path_recursive(const NodePath &p_root_path, Variant &r_variant, List<Pair<NodePath, NodePath>> *p_renames) {
switch (p_variant.get_type()) { switch (r_variant.get_type()) {
case Variant::NODE_PATH: { case Variant::NODE_PATH: {
NodePath node_path = p_variant; NodePath node_path = r_variant;
if (_update_node_path(p_root_path, node_path, p_renames)) { if (_update_node_path(p_root_path, node_path, p_renames)) {
p_variant = node_path; r_variant = node_path;
return true; return true;
} }
} break; } break;
case Variant::ARRAY: { case Variant::ARRAY: {
Array a = p_variant; Array a = r_variant;
bool updated = false; bool updated = false;
for (int i = 0; i < a.size(); i++) { for (int i = 0; i < a.size(); i++) {
Variant value = a[i]; Variant value = a[i];
@ -1472,13 +1472,13 @@ bool SceneTreeDock::_check_node_path_recursive(const NodePath &p_root_path, Vari
} }
} }
if (updated) { if (updated) {
p_variant = a; r_variant = a;
return true; return true;
} }
} break; } break;
case Variant::DICTIONARY: { case Variant::DICTIONARY: {
Dictionary d = p_variant; Dictionary d = r_variant;
bool updated = false; bool updated = false;
for (int i = 0; i < d.size(); i++) { for (int i = 0; i < d.size(); i++) {
Variant value = d.get_value_at_index(i); Variant value = d.get_value_at_index(i);
@ -1491,7 +1491,7 @@ bool SceneTreeDock::_check_node_path_recursive(const NodePath &p_root_path, Vari
} }
} }
if (updated) { if (updated) {
p_variant = d; r_variant = d;
return true; return true;
} }
} break; } break;

4
editor/scene_tree_dock.h
View File

@ -247,8 +247,8 @@ class SceneTreeDock : public VBoxContainer {
static SceneTreeDock *singleton; static SceneTreeDock *singleton;
static void _update_configuration_warning(); static void _update_configuration_warning();
static bool _update_node_path(const NodePath &p_root_path, NodePath &p_node_path, List<Pair<NodePath, NodePath>> *p_renames); static bool _update_node_path(const NodePath &p_root_path, NodePath &r_node_path, List<Pair<NodePath, NodePath>> *p_renames);
static bool _check_node_path_recursive(const NodePath &p_root_path, Variant &p_variant, List<Pair<NodePath, NodePath>> *p_renames); static bool _check_node_path_recursive(const NodePath &p_root_path, Variant &r_variant, List<Pair<NodePath, NodePath>> *p_renames);
protected: protected:
void _notification(int p_what); void _notification(int p_what);