Delete irrlichttypes_extrabloated.h (#15723)

Co-authored-by: cx384 <cx384@proton.me>

src/client/content_cao.cpp

@@ -33,6 +33,9 @@
 #include "client/shader.h"
 #include "client/minimap.h"
 #include <quaternion.h>
+#include <SMesh.h>
+#include <IMeshBuffer.h>
+#include <SMeshBuffer.h>
 
 class Settings;
 struct ToolCapabilities;

src/client/content_mapblock.cpp

@@ -17,6 +17,8 @@
 #include "client/renderingengine.h"
 #include "client.h"
 #include "noise.h"
+#include <SMesh.h>
+#include <IMeshBuffer.h>
 
 // Distance of light extrapolation (for oversized nodes)
 // After this distance, it gives up and considers light level constant

src/client/joystick_controller.cpp

@@ -3,7 +3,6 @@
 // Copyright (C) 2016 est31, <MTest31@outlook.com>
 
 #include "joystick_controller.h"
-#include "irrlichttypes_extrabloated.h"
 #include "keys.h"
 #include "settings.h"
 #include "gettime.h"

src/client/mapblock_mesh.cpp

@@ -21,6 +21,9 @@
 #include <algorithm>
 #include <cmath>
 #include "client/texturesource.h"
+#include <SMesh.h>
+#include <IMeshBuffer.h>
+#include <SMeshBuffer.h>
 
 /*
 	MeshMakeData

src/client/render/anaglyph.cpp

@@ -6,7 +6,7 @@
 #include "anaglyph.h"
 #include "client/camera.h"
 #include <IrrlichtDevice.h>
-
+#include <ISceneManager.h>
 
 /// SetColorMaskStep step
 

src/client/render/core.h

@@ -4,7 +4,9 @@
 // Copyright (C) 2017 numzero, Lobachevskiy Vitaliy <numzer0@yandex.ru>
 
 #pragma once
-#include "irrlichttypes_extrabloated.h"
+
+#include "irr_v2d.h"
+#include <SColor.h>
 
 namespace irr
 {

src/client/render/pipeline.h

@@ -3,7 +3,7 @@
 // Copyright (C) 2022 x2048, Dmitry Kostenko <codeforsmile@gmail.com>
 #pragma once
 
-#include "irrlichttypes_extrabloated.h"
+#include "irrlichttypes_bloated.h"
 #include <IrrlichtDevice.h> // used in all render/*.cpp
 #include <IVideoDriver.h> // used in all render/*.cpp
 

src/client/render/plain.cpp

@@ -11,6 +11,7 @@
 #include "client/hud.h"
 #include "client/minimap.h"
 #include "client/shadows/dynamicshadowsrender.h"
+#include <IGUIEnvironment.h>
 
 /// Draw3D pipeline step
 void Draw3D::run(PipelineContext &context)

src/client/render/secondstage.cpp

@@ -10,6 +10,7 @@
 #include "client/tile.h"
 #include "settings.h"
 #include "mt_opengl.h"
+#include <ISceneManager.h>
 
 PostProcessingStep::PostProcessingStep(u32 _shader_id, const std::vector<u8> &_texture_map) :
 	shader_id(_shader_id), texture_map(_texture_map)

src/client/render/sidebyside.cpp

@@ -7,6 +7,7 @@
 #include "client/client.h"
 #include "client/hud.h"
 #include "client/camera.h"
+#include <ISceneManager.h>
 
 DrawImageStep::DrawImageStep(u8 texture_index, v2f _offset) :
 	texture_index(texture_index), offset(_offset)
@@ -82,4 +83,4 @@ void populateSideBySidePipeline(RenderPipeline *pipeline, Client *client, bool h
 		step->setRenderSource(buffer);
 		step->setRenderTarget(screen);
 	}
-}
+}

src/client/renderingengine.h

@@ -9,7 +9,6 @@
 #include <memory>
 #include <string>
 #include "client/inputhandler.h"
-#include "irrlichttypes_extrabloated.h"
 #include "debug.h"
 #include "config.h"
 #include "client/shader.h"

src/client/shader.cpp

@@ -6,7 +6,6 @@
 #include <fstream>
 #include <iterator>
 #include "shader.h"
-#include "irrlichttypes_extrabloated.h"
 #include "irr_ptr.h"
 #include "debug.h"
 #include "filesys.h"

src/client/shadows/dynamicshadowsrender.h

@@ -7,8 +7,9 @@
 #include <string>
 #include <vector>
 #include <IrrlichtDevice.h>
-#include "irrlichttypes_extrabloated.h"
 #include "client/shadows/dynamicshadows.h"
+#include <ISceneNode.h>
+#include <ISceneManager.h>
 
 class ShadowDepthShaderCB;
 class shadowScreenQuad;

src/client/shadows/shadowsScreenQuad.h

@@ -3,7 +3,6 @@
 // Copyright (C) 2021 Liso <anlismon@gmail.com>
 
 #pragma once
-#include "irrlichttypes_extrabloated.h"
 #include <IMaterialRendererServices.h>
 #include <IShaderConstantSetCallBack.h>
 #include "client/shader.h"

src/client/shadows/shadowsshadercallbacks.h

@@ -3,7 +3,6 @@
 // Copyright (C) 2021 Liso <anlismon@gmail.com>
 
 #pragma once
-#include "irrlichttypes_extrabloated.h"
 #include <IMaterialRendererServices.h>
 #include <IShaderConstantSetCallBack.h>
 #include "client/shader.h"

src/client/wieldmesh.cpp

@@ -20,6 +20,9 @@
 #include <map>
 #include <IMeshManipulator.h>
 #include "client/renderingengine.h"
+#include <SMesh.h>
+#include <IMeshBuffer.h>
+#include <SMeshBuffer.h>
 
 #define WIELD_SCALE_FACTOR 30.0f
 #define WIELD_SCALE_FACTOR_EXTRUDED 40.0f

src/gui/guiAnimatedImage.h

@@ -1,8 +1,10 @@
 #pragma once
 
-#include "irrlichttypes_extrabloated.h"
 #include <algorithm>
-#include <string>
+#include <IGUIElement.h>
+#include <IGUIEnvironment.h>
+
+using namespace irr;
 
 class ISimpleTextureSource;
 

src/gui/guiBackgroundImage.h

@@ -17,8 +17,11 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #pragma once
 
-#include "irrlichttypes_extrabloated.h"
-#include "util/string.h"
+#include <IGUIElement.h>
+#include <IGUIEnvironment.h>
+#include "irr_v2d.h"
+
+using namespace irr;
 
 class ISimpleTextureSource;
 

src/gui/guiBox.cpp

@@ -4,6 +4,7 @@
 
 #include "guiBox.h"
 #include <IVideoDriver.h>
+#include "irr_v2d.h"
 
 GUIBox::GUIBox(gui::IGUIEnvironment *env, gui::IGUIElement *parent, s32 id,
 	const core::rect<s32> &rectangle,

src/gui/guiBox.h

@@ -4,9 +4,11 @@
 
 #pragma once
 
-#include <vector>
 #include <array>
-#include "irrlichttypes_extrabloated.h"
+#include <IGUIElement.h>
+#include <IGUIEnvironment.h>
+
+using namespace irr;
 
 class GUIBox : public gui::IGUIElement
 {

src/gui/guiChatConsole.h

@@ -4,11 +4,10 @@
 
 #pragma once
 
-#include "irrlichttypes_extrabloated.h"
 #include "modalMenu.h"
 #include "chat.h"
-#include "config.h"
 #include "irr_ptr.h"
+#include <IGUIEnvironment.h>
 
 class Client;
 class GUIScrollBar;

src/gui/guiHyperText.h

@@ -8,7 +8,9 @@
 #include <list>
 #include <unordered_map>
 #include <string>
-#include "irrlichttypes_extrabloated.h"
+#include <IGUIElement.h>
+#include <IGUIEnvironment.h>
+#include "irr_v3d.h"
 
 using namespace irr;
 

src/gui/guiInventoryList.h

@@ -5,8 +5,11 @@
 #pragma once
 
 #include "inventorymanager.h"
-#include "irrlichttypes_extrabloated.h"
-#include "util/string.h"
+#include <IGUIElement.h>
+#include <IGUIEnvironment.h>
+#include "irr_v2d.h"
+
+using namespace irr;
 
 class GUIFormSpecMenu;
 

src/gui/guiItemImage.h

@@ -4,8 +4,10 @@
 
 #pragma once
 
-#include "irrlichttypes_extrabloated.h"
-#include "util/string.h"
+#include <IGUIElement.h>
+#include <IGUIEnvironment.h>
+
+using namespace irr;
 
 class Client;
 

src/gui/guiKeyChangeMenu.cpp

@@ -7,7 +7,6 @@
 #include "guiKeyChangeMenu.h"
 #include "debug.h"
 #include "guiButton.h"
-#include "serialization.h"
 #include <string>
 #include <IGUICheckBox.h>
 #include <IGUIEditBox.h>
@@ -16,7 +15,7 @@
 #include <IGUIFont.h>
 #include <IVideoDriver.h>
 #include "settings.h"
-#include <algorithm>
+#include "gettext.h"
 
 #include "mainmenumanager.h"  // for g_gamecallback
 

src/gui/guiKeyChangeMenu.h

@@ -6,12 +6,11 @@
 
 #pragma once
 
-#include "irrlichttypes_extrabloated.h"
 #include "modalMenu.h"
-#include "gettext.h"
 #include "client/keycode.h"
 #include <string>
 #include <vector>
+#include <IGUIEnvironment.h>
 
 class ISimpleTextureSource;
 

src/gui/guiMainMenu.h

@@ -4,10 +4,8 @@
 
 #pragma once
 
-#include "irrlichttypes_extrabloated.h"
 #include "gameparams.h"
 #include <string>
-#include <list>
 
 struct MainMenuDataForScript {
 

src/gui/guiOpenURL.h

@@ -17,7 +17,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #pragma once
 
-#include "irrlichttypes_extrabloated.h"
 #include "modalMenu.h"
 #include <string>
 

src/gui/guiPasswordChange.h

@@ -18,7 +18,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #pragma once
 
-#include "irrlichttypes_extrabloated.h"
 #include "modalMenu.h"
 #include <string>
 

src/gui/guiScene.cpp

@@ -7,10 +7,10 @@
 #include <SViewFrustum.h>
 #include <IAnimatedMeshSceneNode.h>
 #include <IVideoDriver.h>
+#include <ISceneManager.h>
 #include "IAttributes.h"
 #include "porting.h"
 #include "client/mesh.h"
-#include "settings.h"
 
 GUIScene::GUIScene(gui::IGUIEnvironment *env, scene::ISceneManager *smgr,
 		   gui::IGUIElement *parent, core::recti rect, s32 id)

src/gui/guiScene.h

@@ -4,9 +4,11 @@
 
 #pragma once
 
-#include "irrlichttypes_extrabloated.h"
 #include "ICameraSceneNode.h"
 #include "StyleSpec.h"
+#include <IAnimatedMeshSceneNode.h>
+#include <IGUIElement.h>
+#include <IGUIEnvironment.h>
 
 using namespace irr;
 

src/gui/guiScrollBar.h

@@ -12,8 +12,9 @@ the arrow buttons where there is insufficient space.
 
 #pragma once
 
-#include "irrlichttypes_extrabloated.h"
 #include <optional>
+#include <IGUIElement.h>
+#include <IGUIEnvironment.h>
 
 class ISimpleTextureSource;
 

src/gui/guiScrollContainer.h

@@ -4,8 +4,6 @@
 
 #pragma once
 
-#include "irrlichttypes_extrabloated.h"
-#include "util/string.h"
 #include "guiScrollBar.h"
 
 class GUIScrollContainer : public gui::IGUIElement

src/gui/guiTable.h

@@ -8,9 +8,7 @@
 #include <set>
 #include <string>
 #include <vector>
-#include <iostream>
 
-#include "irrlichttypes_extrabloated.h"
 #include "guiScrollBar.h"
 
 class ISimpleTextureSource;

src/gui/guiVolumeChange.h

@@ -19,7 +19,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #pragma once
 
-#include "irrlichttypes_extrabloated.h"
 #include "modalMenu.h"
 #include <string>
 

src/gui/touchcontrols.cpp

@@ -23,6 +23,8 @@
 #include "IGUIFont.h"
 #include <IrrlichtDevice.h>
 #include <ISceneCollisionManager.h>
+#include <IGUIElement.h>
+#include <IGUIEnvironment.h>
 
 #include <iostream>
 #include <algorithm>

src/gui/touchscreeneditor.cpp

@@ -15,6 +15,8 @@
 #include "IGUIFont.h"
 #include "IGUIImage.h"
 #include "IGUIStaticText.h"
+#include <IGUIElement.h>
+#include <IGUIEnvironment.h>
 
 GUITouchscreenLayout::GUITouchscreenLayout(gui::IGUIEnvironment* env,
 		gui::IGUIElement* parent, s32 id,

src/irrlichttypes_extrabloated.h

@@ -1,21 +0,0 @@
-// Luanti
-// SPDX-License-Identifier: LGPL-2.1-or-later
-// Copyright (C) 2010-2013 celeron55, Perttu Ahola <celeron55@gmail.com>
-
-#pragma once
-
-#include "irrlichttypes_bloated.h"
-#include "config.h" // IS_CLIENT_BUILD
-
-#if IS_CLIENT_BUILD
-#include <IMesh.h>
-#include <IImage.h>
-#include <IMeshSceneNode.h>
-#include <IDummyTransformationSceneNode.h>
-#include <SMesh.h>
-#include <ISceneManager.h>
-#include <IMeshBuffer.h>
-#include <SMeshBuffer.h>
-#include <IGUIElement.h>
-#include <IGUIEnvironment.h>
-#endif

src/script/lua_api/l_mainmenu.cpp

@@ -29,6 +29,7 @@
 #include "threading/mutex_auto_lock.h"
 #include "common/c_converter.h"
 #include "gui/guiOpenURL.h"
+#include "gettext.h"
 
 /******************************************************************************/
 std::string ModApiMainMenu::getTextData(lua_State *L, const std::string &name)

src/script/lua_api/l_util.cpp

@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: LGPL-2.1-or-later
 // Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
 
-#include "irrlichttypes_extrabloated.h"
 #include "lua_api/l_util.h"
 #include "lua_api/l_internal.h"
 #include "lua_api/l_settings.h"