asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use GDExtension to_string in Node

Browse source 
Matches the `Object::to_string` implementation.
This commit is contained in:
Raul Santos 2024-06-06 04:43:13 +02:00
parent e96ad5af98
commit 29bf60cc02
No known key found for this signature in database
GPG key ID: B532473AE3A803E4
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
core/object/object.cpp
View file

@ -923,6 +923,7 @@ void Object::notification(int p_notification, bool p_reversed) {
} }
String Object::to_string() { String Object::to_string() {
// Keep this method in sync with `Node::to_string`.
if (script_instance) { if (script_instance) {
bool valid; bool valid;
String ret = script_instance->to_string(&valid); String ret = script_instance->to_string(&valid);

8
scene/main/node.cpp
View file

@ -2583,6 +2583,7 @@ void Node::get_storable_properties(HashSet<StringName> &r_storable_properties) c
} }
String Node::to_string() { String Node::to_string() {
// Keep this method in sync with `Object::to_string`.
ERR_THREAD_GUARD_V(String()); ERR_THREAD_GUARD_V(String());
if (get_script_instance()) { if (get_script_instance()) {
bool valid; bool valid;
@ -2591,7 +2592,12 @@ String Node::to_string() {
return ret; return ret;
} }
} }
if (_get_extension() && _get_extension()->to_string) {
String ret;
GDExtensionBool is_valid;
_get_extension()->to_string(_get_extension_instance(), &is_valid, &ret);
return ret;
}
return (get_name() ? String(get_name()) + ":" : "") + Object::to_string(); return (get_name() ? String(get_name()) + ":" : "") + Object::to_string();
} }