summaryrefslogtreecommitdiff
path: root/scene/debugger/scene_debugger.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'scene/debugger/scene_debugger.cpp')
-rw-r--r--scene/debugger/scene_debugger.cpp62
1 files changed, 31 insertions, 31 deletions
diff --git a/scene/debugger/scene_debugger.cpp b/scene/debugger/scene_debugger.cpp
index 2a98b4cf22..8cb63c4ab5 100644
--- a/scene/debugger/scene_debugger.cpp
+++ b/scene/debugger/scene_debugger.cpp
@@ -34,13 +34,13 @@
#include "core/io/marshalls.h"
#include "core/script_language.h"
#include "scene/main/scene_tree.h"
-#include "scene/main/viewport.h"
+#include "scene/main/window.h"
#include "scene/resources/packed_scene.h"
void SceneDebugger::initialize() {
#ifdef DEBUG_ENABLED
LiveEditor::singleton = memnew(LiveEditor);
- EngineDebugger::register_message_capture("scene", EngineDebugger::Capture(NULL, SceneDebugger::parse_message));
+ EngineDebugger::register_message_capture("scene", EngineDebugger::Capture(nullptr, SceneDebugger::parse_message));
#endif
}
@@ -51,7 +51,7 @@ void SceneDebugger::deinitialize() {
if (EngineDebugger::has_capture("scene"))
EngineDebugger::unregister_message_capture("scene");
memdelete(LiveEditor::singleton);
- LiveEditor::singleton = NULL;
+ LiveEditor::singleton = nullptr;
}
#endif
}
@@ -230,8 +230,8 @@ void SceneDebugger::remove_from_cache(const String &p_filename, Node *p_node) {
if (!debugger)
return;
- Map<String, Set<Node *> > &edit_cache = debugger->live_scene_edit_cache;
- Map<String, Set<Node *> >::Element *E = edit_cache.find(p_filename);
+ Map<String, Set<Node *>> &edit_cache = debugger->live_scene_edit_cache;
+ Map<String, Set<Node *>>::Element *E = edit_cache.find(p_filename);
if (E) {
E->get().erase(p_node);
if (E->get().size() == 0) {
@@ -239,8 +239,8 @@ void SceneDebugger::remove_from_cache(const String &p_filename, Node *p_node) {
}
}
- Map<Node *, Map<ObjectID, Node *> > &remove_list = debugger->live_edit_remove_list;
- Map<Node *, Map<ObjectID, Node *> >::Element *F = remove_list.find(p_node);
+ Map<Node *, Map<ObjectID, Node *>> &remove_list = debugger->live_edit_remove_list;
+ Map<Node *, Map<ObjectID, Node *>>::Element *F = remove_list.find(p_node);
if (F) {
for (Map<ObjectID, Node *>::Element *G = F->get().front(); G; G = G->next()) {
@@ -279,7 +279,7 @@ SceneDebuggerObject::SceneDebuggerObject(ObjectID p_id) {
}
} else if (Script *s = Object::cast_to<Script>(obj)) {
// Add script constants (no instance).
- _parse_script_properties(s, NULL);
+ _parse_script_properties(s, nullptr);
}
// Add base object properties.
@@ -293,8 +293,8 @@ SceneDebuggerObject::SceneDebuggerObject(ObjectID p_id) {
}
void SceneDebuggerObject::_parse_script_properties(Script *p_script, ScriptInstance *p_instance) {
- typedef Map<const Script *, Set<StringName> > ScriptMemberMap;
- typedef Map<const Script *, Map<StringName, Variant> > ScriptConstantsMap;
+ typedef Map<const Script *, Set<StringName>> ScriptMemberMap;
+ typedef Map<const Script *, Map<StringName, Variant>> ScriptConstantsMap;
ScriptMemberMap members;
if (p_instance) {
@@ -373,7 +373,7 @@ void SceneDebuggerObject::serialize(Array &r_arr, int p_max_size) {
var = res->get_path();
} else { //only send information that can be sent..
int len = 0; //test how big is this to encode
- encode_variant(var, NULL, len);
+ encode_variant(var, nullptr, len);
if (len > p_max_size) { //limit to max size
hint = PROPERTY_HINT_OBJECT_TOO_BIG;
hint_string = "";
@@ -478,7 +478,7 @@ void SceneDebuggerTree::deserialize(const Array &p_arr) {
}
/// LiveEditor
-LiveEditor *LiveEditor::singleton = NULL;
+LiveEditor *LiveEditor::singleton = nullptr;
LiveEditor *LiveEditor::get_singleton() {
return singleton;
}
@@ -515,11 +515,11 @@ void LiveEditor::_node_set_func(int p_id, const StringName &p_prop, const Varian
return;
NodePath np = live_edit_node_path_cache[p_id];
- Node *base = NULL;
+ Node *base = nullptr;
if (scene_tree->root->has_node(live_edit_root))
base = scene_tree->root->get_node(live_edit_root);
- Map<String, Set<Node *> >::Element *E = live_scene_edit_cache.find(live_edit_scene);
+ Map<String, Set<Node *>>::Element *E = live_scene_edit_cache.find(live_edit_scene);
if (!E)
return; //scene not editable
@@ -553,11 +553,11 @@ void LiveEditor::_node_call_func(int p_id, const StringName &p_method, VARIANT_A
return;
NodePath np = live_edit_node_path_cache[p_id];
- Node *base = NULL;
+ Node *base = nullptr;
if (scene_tree->root->has_node(live_edit_root))
base = scene_tree->root->get_node(live_edit_root);
- Map<String, Set<Node *> >::Element *E = live_scene_edit_cache.find(live_edit_scene);
+ Map<String, Set<Node *>>::Element *E = live_scene_edit_cache.find(live_edit_scene);
if (!E)
return; //scene not editable
@@ -626,11 +626,11 @@ void LiveEditor::_create_node_func(const NodePath &p_parent, const String &p_typ
if (!scene_tree)
return;
- Node *base = NULL;
+ Node *base = nullptr;
if (scene_tree->root->has_node(live_edit_root))
base = scene_tree->root->get_node(live_edit_root);
- Map<String, Set<Node *> >::Element *E = live_scene_edit_cache.find(live_edit_scene);
+ Map<String, Set<Node *>>::Element *E = live_scene_edit_cache.find(live_edit_scene);
if (!E)
return; //scene not editable
@@ -664,11 +664,11 @@ void LiveEditor::_instance_node_func(const NodePath &p_parent, const String &p_p
if (!ps.is_valid())
return;
- Node *base = NULL;
+ Node *base = nullptr;
if (scene_tree->root->has_node(live_edit_root))
base = scene_tree->root->get_node(live_edit_root);
- Map<String, Set<Node *> >::Element *E = live_scene_edit_cache.find(live_edit_scene);
+ Map<String, Set<Node *>>::Element *E = live_scene_edit_cache.find(live_edit_scene);
if (!E)
return; //scene not editable
@@ -697,11 +697,11 @@ void LiveEditor::_remove_node_func(const NodePath &p_at) {
if (!scene_tree)
return;
- Node *base = NULL;
+ Node *base = nullptr;
if (scene_tree->root->has_node(live_edit_root))
base = scene_tree->root->get_node(live_edit_root);
- Map<String, Set<Node *> >::Element *E = live_scene_edit_cache.find(live_edit_scene);
+ Map<String, Set<Node *>>::Element *E = live_scene_edit_cache.find(live_edit_scene);
if (!E)
return; //scene not editable
@@ -728,11 +728,11 @@ void LiveEditor::_remove_and_keep_node_func(const NodePath &p_at, ObjectID p_kee
if (!scene_tree)
return;
- Node *base = NULL;
+ Node *base = nullptr;
if (scene_tree->root->has_node(live_edit_root))
base = scene_tree->root->get_node(live_edit_root);
- Map<String, Set<Node *> >::Element *E = live_scene_edit_cache.find(live_edit_scene);
+ Map<String, Set<Node *>>::Element *E = live_scene_edit_cache.find(live_edit_scene);
if (!E)
return; //scene not editable
@@ -762,11 +762,11 @@ void LiveEditor::_restore_node_func(ObjectID p_id, const NodePath &p_at, int p_a
if (!scene_tree)
return;
- Node *base = NULL;
+ Node *base = nullptr;
if (scene_tree->root->has_node(live_edit_root))
base = scene_tree->root->get_node(live_edit_root);
- Map<String, Set<Node *> >::Element *E = live_scene_edit_cache.find(live_edit_scene);
+ Map<String, Set<Node *>>::Element *E = live_scene_edit_cache.find(live_edit_scene);
if (!E)
return; //scene not editable
@@ -783,7 +783,7 @@ void LiveEditor::_restore_node_func(ObjectID p_id, const NodePath &p_at, int p_a
continue;
Node *n2 = n->get_node(p_at);
- Map<Node *, Map<ObjectID, Node *> >::Element *EN = live_edit_remove_list.find(n);
+ Map<Node *, Map<ObjectID, Node *>>::Element *EN = live_edit_remove_list.find(n);
if (!EN)
continue;
@@ -808,11 +808,11 @@ void LiveEditor::_duplicate_node_func(const NodePath &p_at, const String &p_new_
if (!scene_tree)
return;
- Node *base = NULL;
+ Node *base = nullptr;
if (scene_tree->root->has_node(live_edit_root))
base = scene_tree->root->get_node(live_edit_root);
- Map<String, Set<Node *> >::Element *E = live_scene_edit_cache.find(live_edit_scene);
+ Map<String, Set<Node *>>::Element *E = live_scene_edit_cache.find(live_edit_scene);
if (!E)
return; //scene not editable
@@ -841,11 +841,11 @@ void LiveEditor::_reparent_node_func(const NodePath &p_at, const NodePath &p_new
if (!scene_tree)
return;
- Node *base = NULL;
+ Node *base = nullptr;
if (scene_tree->root->has_node(live_edit_root))
base = scene_tree->root->get_node(live_edit_root);
- Map<String, Set<Node *> >::Element *E = live_scene_edit_cache.find(live_edit_scene);
+ Map<String, Set<Node *>>::Element *E = live_scene_edit_cache.find(live_edit_scene);
if (!E)
return; //scene not editable
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-08 03:34:42 +0000