godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-04 12:00:25 +00:00
Code Releases Wiki Activity

Add templated version of ObjectDB::get_instance()

Browse Source
This commit is contained in:
kobewi
2025-03-27 14:42:42 +01:00
parent 594d64ec24
commit bc9d0c7835
49 changed files with 121 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
scene/debugger/scene_debugger.cpp
View File

@@ -331,7 +331,7 @@ Error SceneDebugger::parse_message(void *p_user, const String &p_msg, const Arra
}
void SceneDebugger::_save_node(ObjectID id, const String &p_path) {
Node *node = Object::cast_to<Node>(ObjectDB::get_instance(id));
Node *node = ObjectDB::get_instance<Node>(id);
ERR_FAIL_NULL(node);
#ifdef TOOLS_ENABLED
@@ -383,7 +383,7 @@ void SceneDebugger::_send_object_ids(const Vector<ObjectID> &p_ids, bool p_updat
}
if (p_update_selection) {
if (Node *node = Object::cast_to<Node>(ObjectDB::get_instance(id))) {
if (Node *node = ObjectDB::get_instance<Node>(id)) {
nodes.push_back(node);
}
}
@@ -1763,12 +1763,12 @@ void RuntimeNodeSelect::_send_ids(const Vector<Node *> &p_picked_nodes, bool p_i
for (ObjectID id : selected_ci_nodes) {
ids.push_back(id);
nodes.push_back(Object::cast_to<Node>(ObjectDB::get_instance(id)));
nodes.push_back(ObjectDB::get_instance<Node>(id));
}
#ifndef _3D_DISABLED
for (const KeyValue<ObjectID, Ref<SelectionBox3D>> &KV : selected_3d_nodes) {
ids.push_back(KV.key);
nodes.push_back(Object::cast_to<Node>(ObjectDB::get_instance(KV.key)));
nodes.push_back(ObjectDB::get_instance<Node>(KV.key));
}
#endif // _3D_DISABLED
@@ -1903,7 +1903,7 @@ void RuntimeNodeSelect::_update_selection() {
for (LocalVector<ObjectID>::Iterator E = selected_ci_nodes.begin(); E != selected_ci_nodes.end(); ++E) {
ObjectID id = *E;
CanvasItem *ci = Object::cast_to<CanvasItem>(ObjectDB::get_instance(id));
CanvasItem *ci = ObjectDB::get_instance<CanvasItem>(id);
if (!ci) {
selected_ci_nodes.erase(id);
--E;
@@ -1949,7 +1949,7 @@ void RuntimeNodeSelect::_update_selection() {
#ifndef _3D_DISABLED
for (HashMap<ObjectID, Ref<SelectionBox3D>>::ConstIterator KV = selected_3d_nodes.begin(); KV != selected_3d_nodes.end(); ++KV) {
ObjectID id = KV->key;
Node3D *node_3d = Object::cast_to<Node3D>(ObjectDB::get_instance(id));
Node3D *node_3d = ObjectDB::get_instance<Node3D>(id);
if (!node_3d) {
selected_3d_nodes.erase(id);
--KV;