Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-08 06:09:55 +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

4
scene/2d/cpu_particles_2d.cpp
View file

@ -1696,6 +1696,6 @@ CPUParticles2D::CPUParticles2D() {
CPUParticles2D::~CPUParticles2D() {
ERR_FAIL_NULL(RenderingServer::get_singleton());
RS::get_singleton()->free(multimesh);
RS::get_singleton()->free(mesh);
RS::get_singleton()->free_rid(multimesh);
RS::get_singleton()->free_rid(mesh);
}

4
scene/2d/gpu_particles_2d.cpp
View file

@ -1011,6 +1011,6 @@ GPUParticles2D::GPUParticles2D() {
GPUParticles2D::~GPUParticles2D() {
ERR_FAIL_NULL(RenderingServer::get_singleton());
RS::get_singleton()->free(particles);
RS::get_singleton()->free(mesh);
RS::get_singleton()->free_rid(particles);
RS::get_singleton()->free_rid(mesh);
}

2
scene/2d/light_2d.cpp
View file

@ -335,7 +335,7 @@ Light2D::Light2D() {
Light2D::~Light2D() {
ERR_FAIL_NULL(RenderingServer::get_singleton());
RenderingServer::get_singleton()->free(canvas_light);
RenderingServer::get_singleton()->free_rid(canvas_light);
}
//////////////////////////////

4
scene/2d/light_occluder_2d.cpp
View file

@ -150,7 +150,7 @@ OccluderPolygon2D::OccluderPolygon2D() {
OccluderPolygon2D::~OccluderPolygon2D() {
ERR_FAIL_NULL(RenderingServer::get_singleton());
RS::get_singleton()->free(occ_polygon);
RS::get_singleton()->free_rid(occ_polygon);
}
void LightOccluder2D::_poly_changed() {
@ -310,5 +310,5 @@ LightOccluder2D::LightOccluder2D() {
LightOccluder2D::~LightOccluder2D() {
ERR_FAIL_NULL(RenderingServer::get_singleton());
RS::get_singleton()->free(occluder);
RS::get_singleton()->free_rid(occluder);
}

4
scene/2d/navigation/navigation_agent_2d.cpp
View file

@ -349,7 +349,7 @@ NavigationAgent2D::NavigationAgent2D() {
NavigationAgent2D::~NavigationAgent2D() {
ERR_FAIL_NULL(NavigationServer2D::get_singleton());
NavigationServer2D::get_singleton()->free(agent);
NavigationServer2D::get_singleton()->free_rid(agent);
agent = RID(); // Pointless
#ifdef DEBUG_ENABLED
@ -357,7 +357,7 @@ NavigationAgent2D::~NavigationAgent2D() {
ERR_FAIL_NULL(RenderingServer::get_singleton());
if (debug_path_instance.is_valid()) {
RenderingServer::get_singleton()->free(debug_path_instance);
RenderingServer::get_singleton()->free_rid(debug_path_instance);
}
#endif // DEBUG_ENABLED
}

2
scene/2d/navigation/navigation_link_2d.cpp
View file

@ -440,6 +440,6 @@ NavigationLink2D::NavigationLink2D() {
NavigationLink2D::~NavigationLink2D() {
ERR_FAIL_NULL(NavigationServer2D::get_singleton());
NavigationServer2D::get_singleton()->free(link);
NavigationServer2D::get_singleton()->free_rid(link);
link = RID();
}

6
scene/2d/navigation/navigation_obstacle_2d.cpp
View file

@ -198,16 +198,16 @@ NavigationObstacle2D::NavigationObstacle2D() {
NavigationObstacle2D::~NavigationObstacle2D() {
ERR_FAIL_NULL(NavigationServer2D::get_singleton());
NavigationServer2D::get_singleton()->free(obstacle);
NavigationServer2D::get_singleton()->free_rid(obstacle);
obstacle = RID();
#ifdef DEBUG_ENABLED
if (debug_mesh_rid.is_valid()) {
RenderingServer::get_singleton()->free(debug_mesh_rid);
RenderingServer::get_singleton()->free_rid(debug_mesh_rid);
debug_mesh_rid = RID();
}
if (debug_canvas_item.is_valid()) {
RenderingServer::get_singleton()->free(debug_canvas_item);
RenderingServer::get_singleton()->free_rid(debug_canvas_item);
debug_canvas_item = RID();
}
#endif // DEBUG_ENABLED

6
scene/2d/navigation/navigation_region_2d.cpp
View file

@ -394,16 +394,16 @@ NavigationRegion2D::NavigationRegion2D() {
NavigationRegion2D::~NavigationRegion2D() {
ERR_FAIL_NULL(NavigationServer2D::get_singleton());
NavigationServer2D::get_singleton()->free(region);
NavigationServer2D::get_singleton()->free_rid(region);
#ifdef DEBUG_ENABLED
NavigationServer2D::get_singleton()->disconnect(SNAME("map_changed"), callable_mp(this, &NavigationRegion2D::_navigation_map_changed));
NavigationServer2D::get_singleton()->disconnect(SNAME("navigation_debug_changed"), callable_mp(this, &NavigationRegion2D::_navigation_debug_changed));
if (debug_instance_rid.is_valid()) {
RS::get_singleton()->free(debug_instance_rid);
RS::get_singleton()->free_rid(debug_instance_rid);
}
if (debug_mesh_rid.is_valid()) {
RS::get_singleton()->free(debug_mesh_rid);
RS::get_singleton()->free_rid(debug_mesh_rid);
}
#endif // DEBUG_ENABLED
}

4
scene/2d/path_2d.cpp
View file

@ -127,11 +127,11 @@ void Path2D::_debug_free() {
ERR_FAIL_NULL(RS::get_singleton());
if (debug_instance.is_valid()) {
RS::get_singleton()->free(debug_instance);
RS::get_singleton()->free_rid(debug_instance);
debug_instance = RID();
}
if (debug_mesh_rid.is_valid()) {
RS::get_singleton()->free(debug_mesh_rid);
RS::get_singleton()->free_rid(debug_mesh_rid);
debug_mesh_rid = RID();
}
}

2
scene/2d/physics/collision_object_2d.cpp
View file

@ -682,5 +682,5 @@ CollisionObject2D::CollisionObject2D() {
CollisionObject2D::~CollisionObject2D() {
ERR_FAIL_NULL(PhysicsServer2D::get_singleton());
PhysicsServer2D::get_singleton()->free(rid);
PhysicsServer2D::get_singleton()->free_rid(rid);
}

2
scene/2d/physics/joints/joint_2d.cpp
View file

@ -253,5 +253,5 @@ Joint2D::Joint2D() {
Joint2D::~Joint2D() {
ERR_FAIL_NULL(PhysicsServer2D::get_singleton());
PhysicsServer2D::get_singleton()->free(joint);
PhysicsServer2D::get_singleton()->free_rid(joint);
}

2
scene/2d/polygon_2d.cpp
View file

@ -731,5 +731,5 @@ Polygon2D::~Polygon2D() {
// This will free the internally-allocated mesh instance, if allocated.
ERR_FAIL_NULL(RenderingServer::get_singleton());
RS::get_singleton()->canvas_item_attach_skeleton(get_canvas_item(), RID());
RS::get_singleton()->free(mesh);
RS::get_singleton()->free_rid(mesh);
}

4
scene/2d/skeleton_2d.cpp
View file

@ -504,7 +504,7 @@ Bone2D::~Bone2D() {
#ifdef TOOLS_ENABLED
if (!editor_gizmo_rid.is_null()) {
ERR_FAIL_NULL(RenderingServer::get_singleton());
RenderingServer::get_singleton()->free(editor_gizmo_rid);
RenderingServer::get_singleton()->free_rid(editor_gizmo_rid);
}
#endif // TOOLS_ENABLED
}
@ -838,5 +838,5 @@ Skeleton2D::Skeleton2D() {
Skeleton2D::~Skeleton2D() {
ERR_FAIL_NULL(RenderingServer::get_singleton());
RS::get_singleton()->free(skeleton);
RS::get_singleton()->free_rid(skeleton);
}

34
scene/2d/tile_map_layer.cpp
View file

@ -73,10 +73,10 @@ void TileMapLayer::_debug_update(bool p_force_cleanup) {
// Free the quadrant.
Ref<DebugQuadrant> &debug_quadrant = kv.value;
if (debug_quadrant->canvas_item.is_valid()) {
rs->free(debug_quadrant->canvas_item);
rs->free_rid(debug_quadrant->canvas_item);
}
if (debug_quadrant->physics_mesh.is_valid()) {
rs->free(debug_quadrant->physics_mesh);
rs->free_rid(debug_quadrant->physics_mesh);
}
}
debug_quadrant_map.clear();
@ -192,7 +192,7 @@ void TileMapLayer::_debug_update(bool p_force_cleanup) {
if (!debug_quadrant->drawn_to) {
// Free the quadrant.
if (ci.is_valid()) {
rs->free(ci);
rs->free_rid(ci);
}
debug_quadrant_map.erase(quadrant_coords);
}
@ -244,7 +244,7 @@ void TileMapLayer::_rendering_update(bool p_force_cleanup) {
for (const KeyValue<Vector2i, Ref<RenderingQuadrant>> &kv : rendering_quadrant_map) {
for (const RID &ci : kv.value->canvas_items) {
if (ci.is_valid()) {
rs->free(ci);
rs->free_rid(ci);
}
}
kv.value->cells.clear();
@ -291,7 +291,7 @@ void TileMapLayer::_rendering_update(bool p_force_cleanup) {
// First, clear the quadrant's canvas items.
for (RID &ci : rendering_quadrant->canvas_items) {
rs->free(ci);
rs->free_rid(ci);
}
rendering_quadrant->canvas_items.clear();
@ -387,7 +387,7 @@ void TileMapLayer::_rendering_update(bool p_force_cleanup) {
// Free the quadrant.
for (const RID &ci : rendering_quadrant->canvas_items) {
if (ci.is_valid()) {
rs->free(ci);
rs->free_rid(ci);
}
}
rendering_quadrant->cells.clear();
@ -601,7 +601,7 @@ void TileMapLayer::_rendering_occluders_clear_cell(CellData &r_cell_data) {
// Free the occluders.
for (const LocalVector<RID> &polygons : r_cell_data.occluders) {
for (const RID &rid : polygons) {
rs->free(rid);
rs->free_rid(rid);
}
}
r_cell_data.occluders.clear();
@ -614,7 +614,7 @@ void TileMapLayer::_rendering_occluders_update_cell(CellData &r_cell_data) {
for (uint32_t i = tile_set->get_occlusion_layers_count(); i < r_cell_data.occluders.size(); i++) {
for (const RID &occluder_id : r_cell_data.occluders[i]) {
if (occluder_id.is_valid()) {
rs->free(occluder_id);
rs->free_rid(occluder_id);
}
}
}
@ -649,7 +649,7 @@ void TileMapLayer::_rendering_occluders_update_cell(CellData &r_cell_data) {
for (uint32_t i = tile_data->get_occluder_polygons_count(occlusion_layer_index); i < r_cell_data.occluders[occlusion_layer_index].size(); i++) {
RID occluder_id = occluders[i];
if (occluder_id.is_valid()) {
rs->free(occluder_id);
rs->free_rid(occluder_id);
}
}
occluders.resize(tile_data->get_occluder_polygons_count(occlusion_layer_index));
@ -676,7 +676,7 @@ void TileMapLayer::_rendering_occluders_update_cell(CellData &r_cell_data) {
} else {
// Clear occluder.
if (occluder.is_valid()) {
rs->free(occluder);
rs->free_rid(occluder);
occluder = RID();
}
}
@ -764,7 +764,7 @@ void TileMapLayer::_physics_update(bool p_force_cleanup) {
for (KeyValue<PhysicsQuadrant::PhysicsBodyKey, PhysicsQuadrant::PhysicsBodyValue> &kvbody : kv.value->bodies) {
if (kvbody.value.body.is_valid()) {
bodies_coords.erase(kvbody.value.body);
ps->free(kvbody.value.body);
ps->free_rid(kvbody.value.body);
}
}
kv.value->bodies.clear();
@ -817,7 +817,7 @@ void TileMapLayer::_physics_update(bool p_force_cleanup) {
RID &body = kvbody.value.body;
if (body.is_valid()) {
bodies_coords.erase(body);
ps->free(body);
ps->free_rid(body);
body = RID();
}
}
@ -940,7 +940,7 @@ void TileMapLayer::_physics_update(bool p_force_cleanup) {
RID &body = kv.value.body;
if (body.is_valid()) {
bodies_coords.erase(body);
ps->free(body);
ps->free_rid(body);
}
}
physics_quadrant->bodies.clear();
@ -1296,7 +1296,7 @@ void TileMapLayer::_navigation_update(bool p_force_cleanup) {
if (tile_map_node) {
if (forced_cleanup) {
if (navigation_map_override.is_valid()) {
ns->free(navigation_map_override);
ns->free_rid(navigation_map_override);
navigation_map_override = RID();
}
} else {
@ -1367,7 +1367,7 @@ void TileMapLayer::_navigation_clear_cell(CellData &r_cell_data) {
const RID &region = r_cell_data.navigation_regions[i];
if (region.is_valid()) {
ns->region_set_map(region, RID());
ns->free(region);
ns->free_rid(region);
}
}
r_cell_data.navigation_regions.clear();
@ -1406,7 +1406,7 @@ void TileMapLayer::_navigation_update_cell(CellData &r_cell_data) {
RID &region = r_cell_data.navigation_regions[i];
if (region.is_valid()) {
ns->region_set_map(region, RID());
ns->free(region);
ns->free_rid(region);
region = RID();
}
}
@ -1434,7 +1434,7 @@ void TileMapLayer::_navigation_update_cell(CellData &r_cell_data) {
// Clear region.
if (region.is_valid()) {
ns->region_set_map(region, RID());
ns->free(region);
ns->free_rid(region);
region = RID();
}
}