Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Use class name instead of Object ID in remote scene view

Browse source
This commit is contained in:
Jayden Sipe 2026-02-01 18:35:16 -05:00
parent a1eaac8171
commit d731418507
2 changed files with 52 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

68
scene/debugger/scene_debugger_object.cpp
View file

@ -75,9 +75,15 @@ SceneDebuggerObject::SceneDebuggerObject(Object *p_obj) {
// Add base object properties.
List<PropertyInfo> pinfo;
p_obj->get_property_list(&pinfo, true);
for (const PropertyInfo &E : pinfo) {
for (PropertyInfo &E : pinfo) {
const Variant &m = p_obj->get(E.name);
if (!m.is_null() && E.type == Variant::OBJECT && E.hint == PROPERTY_HINT_NODE_TYPE && E.usage & PROPERTY_USAGE_EDITOR) {
E.hint_string = _parse_type_from_remote_object(m);
}
if (E.usage & (PROPERTY_USAGE_EDITOR | PROPERTY_USAGE_CATEGORY)) {
properties.push_back(SceneDebuggerProperty(E, p_obj->get(E.name)));
properties.push_back(SceneDebuggerProperty(E, m));
}
}
}
@ -139,28 +145,31 @@ void SceneDebuggerObject::_parse_script_properties(Script *p_script, ScriptInsta
Variant m;
if (p_instance->get(E, m)) {
const String script_path = sm.key == p_script ? "" : sm.key->get_path().get_file() + "/";
PropertyInfo pi;
const PropertyInfo *pi_ptr = non_exported_members.getptr(E);
if (pi_ptr == nullptr) {
pi.type = m.get_type();
if (!m.is_null() && m.get_type() == Variant::OBJECT) {
PropertyInfo pi(m.get_type(), "Members/" + script_path + E, PROPERTY_HINT_OBJECT_ID, _parse_type_from_remote_object(m));
properties.push_back(SceneDebuggerProperty(pi, m));
} else {
pi = *pi_ptr;
}
pi.name = "Members/" + script_path + E;
PropertyInfo pi;
const PropertyInfo *pi_ptr = non_exported_members.getptr(E);
if (pi_ptr == nullptr) {
pi.type = m.get_type();
} else {
pi = *pi_ptr;
}
pi.name = "Members/" + script_path + E;
properties.push_back(SceneDebuggerProperty(pi, m));
properties.push_back(SceneDebuggerProperty(pi, m));
}
}
}
}
// Constants
for (KeyValue<const Script *, HashMap<StringName, Variant>> &sc : constants) {
for (const KeyValue<StringName, Variant> &E : sc.value) {
String script_path = sc.key == p_script ? "" : sc.key->get_path().get_file() + "/";
if (E.value.get_type() == Variant::OBJECT) {
Variant inst_id = ((Object *)E.value)->get_instance_id();
PropertyInfo pi(inst_id.get_type(), "Constants/" + E.key, PROPERTY_HINT_OBJECT_ID, "Object", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_READ_ONLY);
properties.push_back(SceneDebuggerProperty(pi, inst_id));
const String script_path = sc.key == p_script ? "" : sc.key->get_path().get_file() + "/";
if (!E.value.is_null() && E.value.get_type() == Variant::OBJECT) {
PropertyInfo pi(E.value.get_type(), "Constants/" + E.key, PROPERTY_HINT_OBJECT_ID, _parse_type_from_remote_object(E.value), PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_READ_ONLY);
properties.push_back(SceneDebuggerProperty(pi, E.value));
} else {
PropertyInfo pi(E.value.get_type(), "Constants/" + script_path + E.key);
pi.usage |= PROPERTY_USAGE_READ_ONLY;
@ -170,6 +179,29 @@ void SceneDebuggerObject::_parse_script_properties(Script *p_script, ScriptInsta
}
}
}
String SceneDebuggerObject::_parse_type_from_remote_object(const Variant &p_variant) {
String name;
if (p_variant.get_type() == Variant::OBJECT) {
const Object *obj = p_variant.get_validated_object();
if (obj) {
const ScriptInstance *script_instance = obj->get_script_instance();
if (script_instance) {
Ref<Script> script = script_instance->get_script();
if (script.is_valid()) {
name = script->get_global_name();
}
}
if (name.is_empty()) {
return obj->get_class();
}
}
}
return name;
}
void SceneDebuggerObject::serialize(Array &r_arr, int p_max_size) {
Array send_props;
@ -250,7 +282,9 @@ void SceneDebuggerObject::deserialize(uint64_t p_id, const String &p_class_name,
var = Object::cast_to<EncodedObjectAsID>(var)->get_object_id();
pinfo.type = var.get_type();
pinfo.hint = PROPERTY_HINT_OBJECT_ID;
pinfo.hint_string = "Object";
if (pinfo.hint_string.is_empty()) {
pinfo.hint_string = "Object";
}
}
}
}

1
scene/debugger/scene_debugger_object.h
View file

@ -43,6 +43,7 @@ class Script;
class SceneDebuggerObject {
private:
void _parse_script_properties(Script *p_script, ScriptInstance *p_instance);
static String _parse_type_from_remote_object(const Variant &p_variant);
public:
typedef Pair<PropertyInfo, Variant> SceneDebuggerProperty;