From 08bc0363116e9a576ce72be95bff5f3cc4e513b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= <34514239+appgurueu@users.noreply.github.com> Date: Thu, 3 Jul 2025 17:32:35 +0200 Subject: [PATCH] Remove obsolete SMeshBuffer.h (#16308) --- irr/include/SMeshBuffer.h | 6 ------ irr/include/SkinnedMesh.h | 2 +- irr/src/CBillboardSceneNode.h | 2 +- irr/src/COBJMeshFileLoader.cpp | 2 +- irr/src/COBJMeshFileLoader.h | 2 +- src/client/clouds.h | 2 +- src/client/content_cao.cpp | 2 +- src/client/hud.h | 2 +- src/client/mapblock_mesh.cpp | 2 +- src/client/mapblock_mesh.h | 2 +- src/client/mesh.cpp | 2 +- src/client/minimap.h | 2 +- src/client/particles.cpp | 2 +- src/client/particles.h | 2 +- src/client/sky.h | 2 +- src/client/wieldmesh.cpp | 2 +- 16 files changed, 15 insertions(+), 21 deletions(-) delete mode 100644 irr/include/SMeshBuffer.h diff --git a/irr/include/SMeshBuffer.h b/irr/include/SMeshBuffer.h deleted file mode 100644 index c92669724..000000000 --- a/irr/include/SMeshBuffer.h +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright (C) 2002-2012 Nikolaus Gebhardt -// This file is part of the "Irrlicht Engine". -// For conditions of distribution and use, see copyright notice in irrlicht.h - -// replaced by template -#include "CMeshBuffer.h" // IWYU pragma: export diff --git a/irr/include/SkinnedMesh.h b/irr/include/SkinnedMesh.h index aa718c882..b540e288b 100644 --- a/irr/include/SkinnedMesh.h +++ b/irr/include/SkinnedMesh.h @@ -6,7 +6,7 @@ #include "IAnimatedMesh.h" #include "ISceneManager.h" -#include "SMeshBuffer.h" +#include "CMeshBuffer.h" #include "SSkinMeshBuffer.h" #include "aabbox3d.h" #include "irrMath.h" diff --git a/irr/src/CBillboardSceneNode.h b/irr/src/CBillboardSceneNode.h index 2b11cc8f4..9f23ae74a 100644 --- a/irr/src/CBillboardSceneNode.h +++ b/irr/src/CBillboardSceneNode.h @@ -5,7 +5,7 @@ #pragma once #include "IBillboardSceneNode.h" -#include "SMeshBuffer.h" +#include "CMeshBuffer.h" namespace irr { diff --git a/irr/src/COBJMeshFileLoader.cpp b/irr/src/COBJMeshFileLoader.cpp index bc51c10f2..d899f19da 100644 --- a/irr/src/COBJMeshFileLoader.cpp +++ b/irr/src/COBJMeshFileLoader.cpp @@ -6,7 +6,7 @@ #include "IMeshManipulator.h" #include "IVideoDriver.h" #include "SMesh.h" -#include "SMeshBuffer.h" +#include "CMeshBuffer.h" #include "IReadFile.h" #include "fast_atof.h" #include "coreutil.h" diff --git a/irr/src/COBJMeshFileLoader.h b/irr/src/COBJMeshFileLoader.h index 467392a3e..135be296a 100644 --- a/irr/src/COBJMeshFileLoader.h +++ b/irr/src/COBJMeshFileLoader.h @@ -8,7 +8,7 @@ #include "IMeshLoader.h" #include "ISceneManager.h" #include "irrString.h" -#include "SMeshBuffer.h" +#include "CMeshBuffer.h" namespace irr { diff --git a/src/client/clouds.h b/src/client/clouds.h index ea5c18394..4b39a8315 100644 --- a/src/client/clouds.h +++ b/src/client/clouds.h @@ -11,7 +11,7 @@ #include #include #include -#include +#include class IShaderSource; diff --git a/src/client/content_cao.cpp b/src/client/content_cao.cpp index ecfe0f2de..81f193e9b 100644 --- a/src/client/content_cao.cpp +++ b/src/client/content_cao.cpp @@ -37,7 +37,7 @@ #include #include #include -#include +#include class Settings; struct ToolCapabilities; diff --git a/src/client/hud.h b/src/client/hud.h index e2cf757de..313bbabbb 100644 --- a/src/client/hud.h +++ b/src/client/hud.h @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include "irr_ptr.h" #include "irr_aabb3d.h" #include "../hud.h" diff --git a/src/client/mapblock_mesh.cpp b/src/client/mapblock_mesh.cpp index 51d61b489..5aaa4d98a 100644 --- a/src/client/mapblock_mesh.cpp +++ b/src/client/mapblock_mesh.cpp @@ -23,7 +23,7 @@ #include "client/texturesource.h" #include #include -#include +#include /* MeshMakeData diff --git a/src/client/mapblock_mesh.h b/src/client/mapblock_mesh.h index aa0942cdd..698163589 100644 --- a/src/client/mapblock_mesh.h +++ b/src/client/mapblock_mesh.h @@ -7,7 +7,7 @@ #include "irrlichttypes.h" #include "irr_ptr.h" #include "IMesh.h" -#include "SMeshBuffer.h" +#include "CMeshBuffer.h" #include "util/numeric.h" #include "client/tile.h" diff --git a/src/client/mesh.cpp b/src/client/mesh.cpp index 45b665bba..b9e819236 100644 --- a/src/client/mesh.cpp +++ b/src/client/mesh.cpp @@ -13,7 +13,7 @@ #include #include "S3DVertex.h" #include -#include "SMeshBuffer.h" +#include "CMeshBuffer.h" inline static void applyShadeFactor(video::SColor& color, float factor) { diff --git a/src/client/minimap.h b/src/client/minimap.h index 8897f449f..d6c61f4ff 100644 --- a/src/client/minimap.h +++ b/src/client/minimap.h @@ -7,7 +7,7 @@ #include "irrlichttypes.h" #include "irr_ptr.h" #include "rect.h" -#include "SMeshBuffer.h" +#include "CMeshBuffer.h" #include "../hud.h" #include "mapnode.h" diff --git a/src/client/particles.cpp b/src/client/particles.cpp index 179c9c465..5411cc820 100644 --- a/src/client/particles.cpp +++ b/src/client/particles.cpp @@ -22,7 +22,7 @@ #include "settings.h" #include "profiler.h" -#include "SMeshBuffer.h" +#include "CMeshBuffer.h" using BlendMode = ParticleParamTypes::BlendMode; diff --git a/src/client/particles.h b/src/client/particles.h index fe7d68475..87a12d4a6 100644 --- a/src/client/particles.h +++ b/src/client/particles.h @@ -8,7 +8,7 @@ #include "irr_ptr.h" #include "ISceneNode.h" #include "S3DVertex.h" -#include "SMeshBuffer.h" +#include "CMeshBuffer.h" #include #include diff --git a/src/client/sky.h b/src/client/sky.h index 7d3cdba3d..aad855244 100644 --- a/src/client/sky.h +++ b/src/client/sky.h @@ -6,7 +6,7 @@ #include "irrlichttypes_bloated.h" #include -#include +#include #include #include "camera.h" // CameraMode #include "irr_ptr.h" diff --git a/src/client/wieldmesh.cpp b/src/client/wieldmesh.cpp index bdd24a727..a48d367c6 100644 --- a/src/client/wieldmesh.cpp +++ b/src/client/wieldmesh.cpp @@ -22,7 +22,7 @@ #include "client/renderingengine.h" #include #include -#include +#include #include "item_visuals_manager.h" #define WIELD_SCALE_FACTOR 30.0f