godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-19 14:31:59 +00:00
Code Releases Wiki Activity

Improve to_string() and add it to Resource

Browse Source
This commit is contained in:
kobewi
2024-07-07 20:18:35 +02:00
parent 9a5d6d1049
commit e6783dbdd1
13 changed files with 53 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
scene/main/node.cpp
View File

@@ -2765,27 +2765,6 @@ void Node::get_storable_properties(HashSet<StringName> &r_storable_properties) c
}
}
String Node::to_string() {
// Keep this method in sync with `Object::to_string`.
ERR_THREAD_GUARD_V(String());
if (get_script_instance()) {
bool valid;
String ret = get_script_instance()->to_string(&valid);
if (valid) {
return ret;
}
}
if (_get_extension() && _get_extension()->to_string) {
String ret;
GDExtensionBool is_valid;
_get_extension()->to_string(_get_extension_instance(), &is_valid, &ret);
if (is_valid) {
return ret;
}
}
return (get_name() ? String(get_name()) + ":" : "") + Object::to_string();
}
void Node::set_scene_instance_state(const Ref<SceneState> &p_state) {
ERR_THREAD_GUARD
data.instance_state = p_state;
@@ -3601,6 +3580,11 @@ void Node::_validate_property(PropertyInfo &p_property) const {
}
}
String Node::_to_string() {
ERR_THREAD_GUARD_V(String());
return (get_name() ? String(get_name()) + ":" : "") + Object::_to_string();
}
void Node::input(const Ref<InputEvent> &p_event) {
}