Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-07 22:00:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Rename server "free" functions to "free_rid" to match exposed API

Browse source
This commit is contained in:
Aaron Franke 2025-06-05 00:49:35 -07:00
parent 4d231b5bf8
commit 9fbf5808a0
No known key found for this signature in database
GPG key ID: 40A1750B977E56BF
158 changed files with 724 additions and 696 deletions
Download patch file Download diff file Expand all files Collapse all files

36
modules/gridmap/editor/grid_map_editor_plugin.cpp
View file

@ -507,7 +507,7 @@ void GridMapEditor::_clear_clipboard_data() {
if (E.instance.is_null()) {
continue;
}
RenderingServer::get_singleton()->free(E.instance);
RenderingServer::get_singleton()->free_rid(E.instance);
}
clipboard_items.clear();
@ -1172,16 +1172,16 @@ void GridMapEditor::_notification(int p_what) {
_clear_clipboard_data();
for (int i = 0; i < 3; i++) {
RS::get_singleton()->free(grid_instance[i]);
RS::get_singleton()->free(grid[i]);
RS::get_singleton()->free_rid(grid_instance[i]);
RS::get_singleton()->free_rid(grid[i]);
grid_instance[i] = RID();
grid[i] = RID();
RenderingServer::get_singleton()->free(selection_level_instance[i]);
RenderingServer::get_singleton()->free_rid(selection_level_instance[i]);
}
RenderingServer::get_singleton()->free(cursor_instance);
RenderingServer::get_singleton()->free(selection_instance);
RenderingServer::get_singleton()->free(paste_instance);
RenderingServer::get_singleton()->free_rid(cursor_instance);
RenderingServer::get_singleton()->free_rid(selection_instance);
RenderingServer::get_singleton()->free_rid(paste_instance);
cursor_instance = RID();
selection_instance = RID();
paste_instance = RID();
@ -1233,7 +1233,7 @@ void GridMapEditor::_update_cursor_instance() {
}
if (cursor_instance.is_valid()) {
RenderingServer::get_singleton()->free(cursor_instance);
RenderingServer::get_singleton()->free_rid(cursor_instance);
}
cursor_instance = RID();
@ -1721,32 +1721,32 @@ GridMapEditor::~GridMapEditor() {
for (int i = 0; i < 3; i++) {
if (grid[i].is_valid()) {
RenderingServer::get_singleton()->free(grid[i]);
RenderingServer::get_singleton()->free_rid(grid[i]);
}
if (grid_instance[i].is_valid()) {
RenderingServer::get_singleton()->free(grid_instance[i]);
RenderingServer::get_singleton()->free_rid(grid_instance[i]);
}
if (selection_level_instance[i].is_valid()) {
RenderingServer::get_singleton()->free(selection_level_instance[i]);
RenderingServer::get_singleton()->free_rid(selection_level_instance[i]);
}
if (selection_level_mesh[i].is_valid()) {
RenderingServer::get_singleton()->free(selection_level_mesh[i]);
RenderingServer::get_singleton()->free_rid(selection_level_mesh[i]);
}
}
RenderingServer::get_singleton()->free(cursor_mesh);
RenderingServer::get_singleton()->free_rid(cursor_mesh);
if (cursor_instance.is_valid()) {
RenderingServer::get_singleton()->free(cursor_instance);
RenderingServer::get_singleton()->free_rid(cursor_instance);
}
RenderingServer::get_singleton()->free(selection_mesh);
RenderingServer::get_singleton()->free_rid(selection_mesh);
if (selection_instance.is_valid()) {
RenderingServer::get_singleton()->free(selection_instance);
RenderingServer::get_singleton()->free_rid(selection_instance);
}
RenderingServer::get_singleton()->free(paste_mesh);
RenderingServer::get_singleton()->free_rid(paste_mesh);
if (paste_instance.is_valid()) {
RenderingServer::get_singleton()->free(paste_instance);
RenderingServer::get_singleton()->free_rid(paste_instance);
}
}

32
modules/gridmap/grid_map.cpp
View file

@ -618,11 +618,11 @@ bool GridMap::_octant_update(const OctantKey &p_key) {
//erase navigation
for (KeyValue<IndexKey, Octant::NavigationCell> &E : g.navigation_cell_ids) {
if (E.value.region.is_valid()) {
NavigationServer3D::get_singleton()->free(E.value.region);
NavigationServer3D::get_singleton()->free_rid(E.value.region);
E.value.region = RID();
}
if (E.value.navigation_mesh_debug_instance.is_valid()) {
RS::get_singleton()->free(E.value.navigation_mesh_debug_instance);
RS::get_singleton()->free_rid(E.value.navigation_mesh_debug_instance);
E.value.navigation_mesh_debug_instance = RID();
}
}
@ -632,8 +632,8 @@ bool GridMap::_octant_update(const OctantKey &p_key) {
//erase multimeshes
for (int i = 0; i < g.multimesh_instances.size(); i++) {
RS::get_singleton()->free(g.multimesh_instances[i].instance);
RS::get_singleton()->free(g.multimesh_instances[i].multimesh);
RS::get_singleton()->free_rid(g.multimesh_instances[i].instance);
RS::get_singleton()->free_rid(g.multimesh_instances[i].multimesh);
}
g.multimesh_instances.clear();
@ -945,11 +945,11 @@ void GridMap::_octant_exit_world(const OctantKey &p_key) {
#ifndef NAVIGATION_3D_DISABLED
for (KeyValue<IndexKey, Octant::NavigationCell> &F : g.navigation_cell_ids) {
if (F.value.region.is_valid()) {
NavigationServer3D::get_singleton()->free(F.value.region);
NavigationServer3D::get_singleton()->free_rid(F.value.region);
F.value.region = RID();
}
if (F.value.navigation_mesh_debug_instance.is_valid()) {
RS::get_singleton()->free(F.value.navigation_mesh_debug_instance);
RS::get_singleton()->free_rid(F.value.navigation_mesh_debug_instance);
F.value.navigation_mesh_debug_instance = RID();
}
}
@ -958,7 +958,7 @@ void GridMap::_octant_exit_world(const OctantKey &p_key) {
#ifdef DEBUG_ENABLED
if (bake_navigation) {
if (g.navigation_debug_edge_connections_instance.is_valid()) {
RenderingServer::get_singleton()->free(g.navigation_debug_edge_connections_instance);
RenderingServer::get_singleton()->free_rid(g.navigation_debug_edge_connections_instance);
g.navigation_debug_edge_connections_instance = RID();
}
if (g.navigation_debug_edge_connections_mesh.is_valid()) {
@ -982,23 +982,23 @@ void GridMap::_octant_clean_up(const OctantKey &p_key) {
#ifndef PHYSICS_3D_DISABLED
if (g.collision_debug.is_valid()) {
RS::get_singleton()->free(g.collision_debug);
RS::get_singleton()->free_rid(g.collision_debug);
}
if (g.collision_debug_instance.is_valid()) {
RS::get_singleton()->free(g.collision_debug_instance);
RS::get_singleton()->free_rid(g.collision_debug_instance);
}
PhysicsServer3D::get_singleton()->free(g.static_body);
PhysicsServer3D::get_singleton()->free_rid(g.static_body);
#endif // PHYSICS_3D_DISABLED
#ifndef NAVIGATION_3D_DISABLED
// Erase navigation
for (const KeyValue<IndexKey, Octant::NavigationCell> &E : g.navigation_cell_ids) {
if (E.value.region.is_valid()) {
NavigationServer3D::get_singleton()->free(E.value.region);
NavigationServer3D::get_singleton()->free_rid(E.value.region);
}
if (E.value.navigation_mesh_debug_instance.is_valid()) {
RS::get_singleton()->free(E.value.navigation_mesh_debug_instance);
RS::get_singleton()->free_rid(E.value.navigation_mesh_debug_instance);
}
}
g.navigation_cell_ids.clear();
@ -1007,7 +1007,7 @@ void GridMap::_octant_clean_up(const OctantKey &p_key) {
#ifdef DEBUG_ENABLED
if (bake_navigation) {
if (g.navigation_debug_edge_connections_instance.is_valid()) {
RenderingServer::get_singleton()->free(g.navigation_debug_edge_connections_instance);
RenderingServer::get_singleton()->free_rid(g.navigation_debug_edge_connections_instance);
g.navigation_debug_edge_connections_instance = RID();
}
if (g.navigation_debug_edge_connections_mesh.is_valid()) {
@ -1019,8 +1019,8 @@ void GridMap::_octant_clean_up(const OctantKey &p_key) {
//erase multimeshes
for (int i = 0; i < g.multimesh_instances.size(); i++) {
RS::get_singleton()->free(g.multimesh_instances[i].instance);
RS::get_singleton()->free(g.multimesh_instances[i].multimesh);
RS::get_singleton()->free_rid(g.multimesh_instances[i].instance);
RS::get_singleton()->free_rid(g.multimesh_instances[i].multimesh);
}
g.multimesh_instances.clear();
}
@ -1349,7 +1349,7 @@ Vector3 GridMap::_get_offset() const {
void GridMap::clear_baked_meshes() {
ERR_FAIL_NULL(RenderingServer::get_singleton());
for (int i = 0; i < baked_meshes.size(); i++) {
RS::get_singleton()->free(baked_meshes[i].instance);
RS::get_singleton()->free_rid(baked_meshes[i].instance);
}
baked_meshes.clear();