Merge pull request #94893 from rune-scape/no-const-cast-mesh-storage

akien-mga · akien-mga · commit bc4c60c933c8 · 2024-09-10T09:51:22.000+02:00
Avoid `const_cast` in `mesh_storage.h`
diff --git a/drivers/gles3/storage/mesh_storage.cpp b/drivers/gles3/storage/mesh_storage.cpp
@@ -1769,14 +1769,14 @@ AABB MeshStorage::_multimesh_get_custom_aabb(RID p_multimesh) const {
 	return multimesh->custom_aabb;
 }
 
-AABB MeshStorage::_multimesh_get_aabb(RID p_multimesh) const {
+AABB MeshStorage::_multimesh_get_aabb(RID p_multimesh) {
 	MultiMesh *multimesh = multimesh_owner.get_or_null(p_multimesh);
 	ERR_FAIL_NULL_V(multimesh, AABB());
 	if (multimesh->custom_aabb != AABB()) {
 		return multimesh->custom_aabb;
 	}
 	if (multimesh->aabb_dirty) {
-		const_cast<MeshStorage *>(this)->_update_dirty_multimeshes();
+		_update_dirty_multimeshes();
 	}
 	return multimesh->aabb;
 }
diff --git a/drivers/gles3/storage/mesh_storage.h b/drivers/gles3/storage/mesh_storage.h
@@ -510,7 +510,7 @@ class MeshStorage : public RendererMeshStorage {
 	virtual RID _multimesh_get_mesh(RID p_multimesh) const override;
 	virtual void _multimesh_set_custom_aabb(RID p_multimesh, const AABB &p_aabb) override;
 	virtual AABB _multimesh_get_custom_aabb(RID p_multimesh) const override;
-	virtual AABB _multimesh_get_aabb(RID p_multimesh) const override;
+	virtual AABB _multimesh_get_aabb(RID p_multimesh) override;
 
 	virtual Transform3D _multimesh_instance_get_transform(RID p_multimesh, int p_index) const override;
 	virtual Transform2D _multimesh_instance_get_transform_2d(RID p_multimesh, int p_index) const override;
diff --git a/servers/rendering/dummy/storage/mesh_storage.h b/servers/rendering/dummy/storage/mesh_storage.h
@@ -163,7 +163,7 @@ class MeshStorage : public RendererMeshStorage {
 	virtual AABB _multimesh_get_custom_aabb(RID p_multimesh) const override { return AABB(); }
 
 	virtual RID _multimesh_get_mesh(RID p_multimesh) const override { return RID(); }
-	virtual AABB _multimesh_get_aabb(RID p_multimesh) const override { return AABB(); }
+	virtual AABB _multimesh_get_aabb(RID p_multimesh) override { return AABB(); }
 
 	virtual Transform3D _multimesh_instance_get_transform(RID p_multimesh, int p_index) const override { return Transform3D(); }
 	virtual Transform2D _multimesh_instance_get_transform_2d(RID p_multimesh, int p_index) const override { return Transform2D(); }
diff --git a/servers/rendering/renderer_rd/storage_rd/mesh_storage.cpp b/servers/rendering/renderer_rd/storage_rd/mesh_storage.cpp
@@ -2041,15 +2041,15 @@ AABB MeshStorage::_multimesh_get_custom_aabb(RID p_multimesh) const {
 	return multimesh->custom_aabb;
 }
 
-AABB MeshStorage::_multimesh_get_aabb(RID p_multimesh) const {
+AABB MeshStorage::_multimesh_get_aabb(RID p_multimesh) {
 	MultiMesh *multimesh = multimesh_owner.get_or_null(p_multimesh);
 	ERR_FAIL_NULL_V(multimesh, AABB());
 	if (multimesh->custom_aabb != AABB()) {
 		return multimesh->custom_aabb;
 	}
 
 	if (multimesh->aabb_dirty) {
-		const_cast<MeshStorage *>(this)->_update_dirty_multimeshes();
+		_update_dirty_multimeshes();
 	}
 	return multimesh->aabb;
 }
diff --git a/servers/rendering/renderer_rd/storage_rd/mesh_storage.h b/servers/rendering/renderer_rd/storage_rd/mesh_storage.h
@@ -652,7 +652,7 @@ class MeshStorage : public RendererMeshStorage {
 	virtual void _multimesh_set_custom_aabb(RID p_multimesh, const AABB &p_aabb) override;
 	virtual AABB _multimesh_get_custom_aabb(RID p_multimesh) const override;
 
-	virtual AABB _multimesh_get_aabb(RID p_multimesh) const override;
+	virtual AABB _multimesh_get_aabb(RID p_multimesh) override;
 
 	virtual MultiMeshInterpolator *_multimesh_get_interpolator(RID p_multimesh) const override;
 
diff --git a/servers/rendering/storage/mesh_storage.cpp b/servers/rendering/storage/mesh_storage.cpp
@@ -285,7 +285,7 @@ int RendererMeshStorage::multimesh_get_visible_instances(RID p_multimesh) const
 	return _multimesh_get_visible_instances(p_multimesh);
 }
 
-AABB RendererMeshStorage::multimesh_get_aabb(RID p_multimesh) const {
+AABB RendererMeshStorage::multimesh_get_aabb(RID p_multimesh) {
 	return _multimesh_get_aabb(p_multimesh);
 }
 
diff --git a/servers/rendering/storage/mesh_storage.h b/servers/rendering/storage/mesh_storage.h
@@ -151,7 +151,7 @@ class RendererMeshStorage {
 	virtual void multimesh_set_visible_instances(RID p_multimesh, int p_visible);
 	virtual int multimesh_get_visible_instances(RID p_multimesh) const;
 
-	virtual AABB multimesh_get_aabb(RID p_multimesh) const;
+	virtual AABB multimesh_get_aabb(RID p_multimesh);
 
 	virtual RID _multimesh_allocate() = 0;
 	virtual void _multimesh_initialize(RID p_rid) = 0;
@@ -183,7 +183,7 @@ class RendererMeshStorage {
 	virtual void _multimesh_set_visible_instances(RID p_multimesh, int p_visible) = 0;
 	virtual int _multimesh_get_visible_instances(RID p_multimesh) const = 0;
 
-	virtual AABB _multimesh_get_aabb(RID p_multimesh) const = 0;
+	virtual AABB _multimesh_get_aabb(RID p_multimesh) = 0;
 
 	// Multimesh is responsible for allocating / destroying a MultiMeshInterpolator object.
 	// This allows shared functionality for interpolation across backends.

Original file line number	Diff line number	Diff line change
`@@ -1769,14 +1769,14 @@ AABB MeshStorage::_multimesh_get_custom_aabb(RID p_multimesh) const {`
`1769`	`1769`	`return multimesh->custom_aabb;`
`1770`	`1770`	`}`
`1771`	`1771`
`1772`		`-AABB MeshStorage::_multimesh_get_aabb(RID p_multimesh) const {`
	`1772`	`+AABB MeshStorage::_multimesh_get_aabb(RID p_multimesh) {`
`1773`	`1773`	`MultiMesh *multimesh = multimesh_owner.get_or_null(p_multimesh);`
`1774`	`1774`	`ERR_FAIL_NULL_V(multimesh, AABB());`
`1775`	`1775`	`if (multimesh->custom_aabb != AABB()) {`
`1776`	`1776`	`return multimesh->custom_aabb;`
`1777`	`1777`	`}`
`1778`	`1778`	`if (multimesh->aabb_dirty) {`
`1779`		`- const_cast<MeshStorage *>(this)->_update_dirty_multimeshes();`
	`1779`	`+ _update_dirty_multimeshes();`
`1780`	`1780`	`}`
`1781`	`1781`	`return multimesh->aabb;`
`1782`	`1782`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2041,15 +2041,15 @@ AABB MeshStorage::_multimesh_get_custom_aabb(RID p_multimesh) const {`
`2041`	`2041`	`return multimesh->custom_aabb;`
`2042`	`2042`	`}`
`2043`	`2043`
`2044`		`-AABB MeshStorage::_multimesh_get_aabb(RID p_multimesh) const {`
	`2044`	`+AABB MeshStorage::_multimesh_get_aabb(RID p_multimesh) {`
`2045`	`2045`	`MultiMesh *multimesh = multimesh_owner.get_or_null(p_multimesh);`
`2046`	`2046`	`ERR_FAIL_NULL_V(multimesh, AABB());`
`2047`	`2047`	`if (multimesh->custom_aabb != AABB()) {`
`2048`	`2048`	`return multimesh->custom_aabb;`
`2049`	`2049`	`}`
`2050`	`2050`
`2051`	`2051`	`if (multimesh->aabb_dirty) {`
`2052`		`- const_cast<MeshStorage *>(this)->_update_dirty_multimeshes();`
	`2052`	`+ _update_dirty_multimeshes();`
`2053`	`2053`	`}`
`2054`	`2054`	`return multimesh->aabb;`
`2055`	`2055`	`}`
Original file line number	Diff line number	Diff line change
`@@ -285,7 +285,7 @@ int RendererMeshStorage::multimesh_get_visible_instances(RID p_multimesh) const`
`285`	`285`	`return _multimesh_get_visible_instances(p_multimesh);`
`286`	`286`	`}`
`287`	`287`
`288`		`-AABB RendererMeshStorage::multimesh_get_aabb(RID p_multimesh) const {`
	`288`	`+AABB RendererMeshStorage::multimesh_get_aabb(RID p_multimesh) {`
`289`	`289`	`return _multimesh_get_aabb(p_multimesh);`
`290`	`290`	`}`
`291`	`291`