From f17498b0491abdd20b16a3e22d15db901babda75 Mon Sep 17 00:00:00 2001 From: wrrrzr <161970349+wrrrzr@users.noreply.github.com> Date: Sat, 1 Feb 2025 15:41:51 +0300 Subject: [PATCH] Delete irrlichttypes_extrabloated.h (#15723) Co-authored-by: cx384 --- src/client/content_cao.cpp | 3 +++ src/client/content_mapblock.cpp | 2 ++ src/client/joystick_controller.cpp | 1 - src/client/mapblock_mesh.cpp | 3 +++ src/client/render/anaglyph.cpp | 2 +- src/client/render/core.h | 4 +++- src/client/render/pipeline.h | 2 +- src/client/render/plain.cpp | 1 + src/client/render/secondstage.cpp | 1 + src/client/render/sidebyside.cpp | 3 ++- src/client/renderingengine.h | 1 - src/client/shader.cpp | 1 - src/client/shadows/dynamicshadowsrender.h | 3 ++- src/client/shadows/shadowsScreenQuad.h | 1 - src/client/shadows/shadowsshadercallbacks.h | 1 - src/client/wieldmesh.cpp | 3 +++ src/gui/guiAnimatedImage.h | 6 ++++-- src/gui/guiBackgroundImage.h | 7 +++++-- src/gui/guiBox.cpp | 1 + src/gui/guiBox.h | 6 ++++-- src/gui/guiChatConsole.h | 3 +-- src/gui/guiHyperText.h | 4 +++- src/gui/guiInventoryList.h | 7 +++++-- src/gui/guiItemImage.h | 6 ++++-- src/gui/guiKeyChangeMenu.cpp | 3 +-- src/gui/guiKeyChangeMenu.h | 3 +-- src/gui/guiMainMenu.h | 2 -- src/gui/guiOpenURL.h | 1 - src/gui/guiPasswordChange.h | 1 - src/gui/guiScene.cpp | 2 +- src/gui/guiScene.h | 4 +++- src/gui/guiScrollBar.h | 3 ++- src/gui/guiScrollContainer.h | 2 -- src/gui/guiTable.h | 2 -- src/gui/guiVolumeChange.h | 1 - src/gui/touchcontrols.cpp | 2 ++ src/gui/touchscreeneditor.cpp | 2 ++ src/irrlichttypes_extrabloated.h | 21 --------------------- src/script/lua_api/l_mainmenu.cpp | 1 + src/script/lua_api/l_util.cpp | 1 - 40 files changed, 62 insertions(+), 61 deletions(-) delete mode 100644 src/irrlichttypes_extrabloated.h diff --git a/src/client/content_cao.cpp b/src/client/content_cao.cpp index 5c044ddef..2136ab3a8 100644 --- a/src/client/content_cao.cpp +++ b/src/client/content_cao.cpp @@ -33,6 +33,9 @@ #include "client/shader.h" #include "client/minimap.h" #include +#include +#include +#include class Settings; struct ToolCapabilities; diff --git a/src/client/content_mapblock.cpp b/src/client/content_mapblock.cpp index d8f1ff3b6..77687931a 100644 --- a/src/client/content_mapblock.cpp +++ b/src/client/content_mapblock.cpp @@ -17,6 +17,8 @@ #include "client/renderingengine.h" #include "client.h" #include "noise.h" +#include +#include // Distance of light extrapolation (for oversized nodes) // After this distance, it gives up and considers light level constant diff --git a/src/client/joystick_controller.cpp b/src/client/joystick_controller.cpp index b8d93dcef..854bed925 100644 --- a/src/client/joystick_controller.cpp +++ b/src/client/joystick_controller.cpp @@ -3,7 +3,6 @@ // Copyright (C) 2016 est31, #include "joystick_controller.h" -#include "irrlichttypes_extrabloated.h" #include "keys.h" #include "settings.h" #include "gettime.h" diff --git a/src/client/mapblock_mesh.cpp b/src/client/mapblock_mesh.cpp index 6eabe4c2d..dadeaa0e2 100644 --- a/src/client/mapblock_mesh.cpp +++ b/src/client/mapblock_mesh.cpp @@ -21,6 +21,9 @@ #include #include #include "client/texturesource.h" +#include +#include +#include /* MeshMakeData diff --git a/src/client/render/anaglyph.cpp b/src/client/render/anaglyph.cpp index 833ad0114..51e12d752 100644 --- a/src/client/render/anaglyph.cpp +++ b/src/client/render/anaglyph.cpp @@ -6,7 +6,7 @@ #include "anaglyph.h" #include "client/camera.h" #include - +#include /// SetColorMaskStep step diff --git a/src/client/render/core.h b/src/client/render/core.h index bfb2cb25a..f9d92bee5 100644 --- a/src/client/render/core.h +++ b/src/client/render/core.h @@ -4,7 +4,9 @@ // Copyright (C) 2017 numzero, Lobachevskiy Vitaliy #pragma once -#include "irrlichttypes_extrabloated.h" + +#include "irr_v2d.h" +#include namespace irr { diff --git a/src/client/render/pipeline.h b/src/client/render/pipeline.h index 17bed8b7b..d91d523b9 100644 --- a/src/client/render/pipeline.h +++ b/src/client/render/pipeline.h @@ -3,7 +3,7 @@ // Copyright (C) 2022 x2048, Dmitry Kostenko #pragma once -#include "irrlichttypes_extrabloated.h" +#include "irrlichttypes_bloated.h" #include // used in all render/*.cpp #include // used in all render/*.cpp diff --git a/src/client/render/plain.cpp b/src/client/render/plain.cpp index c24ba8837..0f94e3ef0 100644 --- a/src/client/render/plain.cpp +++ b/src/client/render/plain.cpp @@ -11,6 +11,7 @@ #include "client/hud.h" #include "client/minimap.h" #include "client/shadows/dynamicshadowsrender.h" +#include /// Draw3D pipeline step void Draw3D::run(PipelineContext &context) diff --git a/src/client/render/secondstage.cpp b/src/client/render/secondstage.cpp index b8744f694..b00a54575 100644 --- a/src/client/render/secondstage.cpp +++ b/src/client/render/secondstage.cpp @@ -10,6 +10,7 @@ #include "client/tile.h" #include "settings.h" #include "mt_opengl.h" +#include PostProcessingStep::PostProcessingStep(u32 _shader_id, const std::vector &_texture_map) : shader_id(_shader_id), texture_map(_texture_map) diff --git a/src/client/render/sidebyside.cpp b/src/client/render/sidebyside.cpp index 57d5b474e..a26dbfdde 100644 --- a/src/client/render/sidebyside.cpp +++ b/src/client/render/sidebyside.cpp @@ -7,6 +7,7 @@ #include "client/client.h" #include "client/hud.h" #include "client/camera.h" +#include 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); } -} \ No newline at end of file +} diff --git a/src/client/renderingengine.h b/src/client/renderingengine.h index ce6647212..b99a71900 100644 --- a/src/client/renderingengine.h +++ b/src/client/renderingengine.h @@ -9,7 +9,6 @@ #include #include #include "client/inputhandler.h" -#include "irrlichttypes_extrabloated.h" #include "debug.h" #include "config.h" #include "client/shader.h" diff --git a/src/client/shader.cpp b/src/client/shader.cpp index 290e3a572..5924e935a 100644 --- a/src/client/shader.cpp +++ b/src/client/shader.cpp @@ -6,7 +6,6 @@ #include #include #include "shader.h" -#include "irrlichttypes_extrabloated.h" #include "irr_ptr.h" #include "debug.h" #include "filesys.h" diff --git a/src/client/shadows/dynamicshadowsrender.h b/src/client/shadows/dynamicshadowsrender.h index a12ba01e4..9bc4f6b94 100644 --- a/src/client/shadows/dynamicshadowsrender.h +++ b/src/client/shadows/dynamicshadowsrender.h @@ -7,8 +7,9 @@ #include #include #include -#include "irrlichttypes_extrabloated.h" #include "client/shadows/dynamicshadows.h" +#include +#include class ShadowDepthShaderCB; class shadowScreenQuad; diff --git a/src/client/shadows/shadowsScreenQuad.h b/src/client/shadows/shadowsScreenQuad.h index 561db19f6..fa7a73d79 100644 --- a/src/client/shadows/shadowsScreenQuad.h +++ b/src/client/shadows/shadowsScreenQuad.h @@ -3,7 +3,6 @@ // Copyright (C) 2021 Liso #pragma once -#include "irrlichttypes_extrabloated.h" #include #include #include "client/shader.h" diff --git a/src/client/shadows/shadowsshadercallbacks.h b/src/client/shadows/shadowsshadercallbacks.h index 882a13d0c..4fc462b11 100644 --- a/src/client/shadows/shadowsshadercallbacks.h +++ b/src/client/shadows/shadowsshadercallbacks.h @@ -3,7 +3,6 @@ // Copyright (C) 2021 Liso #pragma once -#include "irrlichttypes_extrabloated.h" #include #include #include "client/shader.h" diff --git a/src/client/wieldmesh.cpp b/src/client/wieldmesh.cpp index f03de2a5b..ddaca73fb 100644 --- a/src/client/wieldmesh.cpp +++ b/src/client/wieldmesh.cpp @@ -20,6 +20,9 @@ #include #include #include "client/renderingengine.h" +#include +#include +#include #define WIELD_SCALE_FACTOR 30.0f #define WIELD_SCALE_FACTOR_EXTRUDED 40.0f diff --git a/src/gui/guiAnimatedImage.h b/src/gui/guiAnimatedImage.h index 885aedece..8f42cd9f3 100644 --- a/src/gui/guiAnimatedImage.h +++ b/src/gui/guiAnimatedImage.h @@ -1,8 +1,10 @@ #pragma once -#include "irrlichttypes_extrabloated.h" #include -#include +#include +#include + +using namespace irr; class ISimpleTextureSource; diff --git a/src/gui/guiBackgroundImage.h b/src/gui/guiBackgroundImage.h index 71c5b5077..de12c48d7 100644 --- a/src/gui/guiBackgroundImage.h +++ b/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 +#include +#include "irr_v2d.h" + +using namespace irr; class ISimpleTextureSource; diff --git a/src/gui/guiBox.cpp b/src/gui/guiBox.cpp index e29389662..21d525774 100644 --- a/src/gui/guiBox.cpp +++ b/src/gui/guiBox.cpp @@ -4,6 +4,7 @@ #include "guiBox.h" #include +#include "irr_v2d.h" GUIBox::GUIBox(gui::IGUIEnvironment *env, gui::IGUIElement *parent, s32 id, const core::rect &rectangle, diff --git a/src/gui/guiBox.h b/src/gui/guiBox.h index 4d83eaace..49c3b8210 100644 --- a/src/gui/guiBox.h +++ b/src/gui/guiBox.h @@ -4,9 +4,11 @@ #pragma once -#include #include -#include "irrlichttypes_extrabloated.h" +#include +#include + +using namespace irr; class GUIBox : public gui::IGUIElement { diff --git a/src/gui/guiChatConsole.h b/src/gui/guiChatConsole.h index 9b1309a6e..69205d265 100644 --- a/src/gui/guiChatConsole.h +++ b/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 class Client; class GUIScrollBar; diff --git a/src/gui/guiHyperText.h b/src/gui/guiHyperText.h index d11e80dd7..abdd5de7b 100644 --- a/src/gui/guiHyperText.h +++ b/src/gui/guiHyperText.h @@ -8,7 +8,9 @@ #include #include #include -#include "irrlichttypes_extrabloated.h" +#include +#include +#include "irr_v3d.h" using namespace irr; diff --git a/src/gui/guiInventoryList.h b/src/gui/guiInventoryList.h index a4a53a48b..517dfe4c6 100644 --- a/src/gui/guiInventoryList.h +++ b/src/gui/guiInventoryList.h @@ -5,8 +5,11 @@ #pragma once #include "inventorymanager.h" -#include "irrlichttypes_extrabloated.h" -#include "util/string.h" +#include +#include +#include "irr_v2d.h" + +using namespace irr; class GUIFormSpecMenu; diff --git a/src/gui/guiItemImage.h b/src/gui/guiItemImage.h index 8d3dadfa7..9bf81de9f 100644 --- a/src/gui/guiItemImage.h +++ b/src/gui/guiItemImage.h @@ -4,8 +4,10 @@ #pragma once -#include "irrlichttypes_extrabloated.h" -#include "util/string.h" +#include +#include + +using namespace irr; class Client; diff --git a/src/gui/guiKeyChangeMenu.cpp b/src/gui/guiKeyChangeMenu.cpp index 6d3a0c531..0f343bbea 100644 --- a/src/gui/guiKeyChangeMenu.cpp +++ b/src/gui/guiKeyChangeMenu.cpp @@ -7,7 +7,6 @@ #include "guiKeyChangeMenu.h" #include "debug.h" #include "guiButton.h" -#include "serialization.h" #include #include #include @@ -16,7 +15,7 @@ #include #include #include "settings.h" -#include +#include "gettext.h" #include "mainmenumanager.h" // for g_gamecallback diff --git a/src/gui/guiKeyChangeMenu.h b/src/gui/guiKeyChangeMenu.h index 6544840cb..c858b2c93 100644 --- a/src/gui/guiKeyChangeMenu.h +++ b/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 #include +#include class ISimpleTextureSource; diff --git a/src/gui/guiMainMenu.h b/src/gui/guiMainMenu.h index c92787adb..5a635c596 100644 --- a/src/gui/guiMainMenu.h +++ b/src/gui/guiMainMenu.h @@ -4,10 +4,8 @@ #pragma once -#include "irrlichttypes_extrabloated.h" #include "gameparams.h" #include -#include struct MainMenuDataForScript { diff --git a/src/gui/guiOpenURL.h b/src/gui/guiOpenURL.h index 8f873c2fa..f48f1aaa5 100644 --- a/src/gui/guiOpenURL.h +++ b/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 diff --git a/src/gui/guiPasswordChange.h b/src/gui/guiPasswordChange.h index 8dc670cc2..4be5f81b7 100644 --- a/src/gui/guiPasswordChange.h +++ b/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 diff --git a/src/gui/guiScene.cpp b/src/gui/guiScene.cpp index 88865b384..269bc1658 100644 --- a/src/gui/guiScene.cpp +++ b/src/gui/guiScene.cpp @@ -7,10 +7,10 @@ #include #include #include +#include #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) diff --git a/src/gui/guiScene.h b/src/gui/guiScene.h index f9b6981c5..43902dad7 100644 --- a/src/gui/guiScene.h +++ b/src/gui/guiScene.h @@ -4,9 +4,11 @@ #pragma once -#include "irrlichttypes_extrabloated.h" #include "ICameraSceneNode.h" #include "StyleSpec.h" +#include +#include +#include using namespace irr; diff --git a/src/gui/guiScrollBar.h b/src/gui/guiScrollBar.h index af3bc4652..c485fbd83 100644 --- a/src/gui/guiScrollBar.h +++ b/src/gui/guiScrollBar.h @@ -12,8 +12,9 @@ the arrow buttons where there is insufficient space. #pragma once -#include "irrlichttypes_extrabloated.h" #include +#include +#include class ISimpleTextureSource; diff --git a/src/gui/guiScrollContainer.h b/src/gui/guiScrollContainer.h index 523d1cd42..ee09a16e5 100644 --- a/src/gui/guiScrollContainer.h +++ b/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 diff --git a/src/gui/guiTable.h b/src/gui/guiTable.h index 2d4ebbac4..63aeb0e8f 100644 --- a/src/gui/guiTable.h +++ b/src/gui/guiTable.h @@ -8,9 +8,7 @@ #include #include #include -#include -#include "irrlichttypes_extrabloated.h" #include "guiScrollBar.h" class ISimpleTextureSource; diff --git a/src/gui/guiVolumeChange.h b/src/gui/guiVolumeChange.h index ccdaca00b..04ba4860f 100644 --- a/src/gui/guiVolumeChange.h +++ b/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 diff --git a/src/gui/touchcontrols.cpp b/src/gui/touchcontrols.cpp index d18a69edc..8a829d90e 100644 --- a/src/gui/touchcontrols.cpp +++ b/src/gui/touchcontrols.cpp @@ -23,6 +23,8 @@ #include "IGUIFont.h" #include #include +#include +#include #include #include diff --git a/src/gui/touchscreeneditor.cpp b/src/gui/touchscreeneditor.cpp index 44c357841..4a8468ee5 100644 --- a/src/gui/touchscreeneditor.cpp +++ b/src/gui/touchscreeneditor.cpp @@ -15,6 +15,8 @@ #include "IGUIFont.h" #include "IGUIImage.h" #include "IGUIStaticText.h" +#include +#include GUITouchscreenLayout::GUITouchscreenLayout(gui::IGUIEnvironment* env, gui::IGUIElement* parent, s32 id, diff --git a/src/irrlichttypes_extrabloated.h b/src/irrlichttypes_extrabloated.h deleted file mode 100644 index 98c0e2cea..000000000 --- a/src/irrlichttypes_extrabloated.h +++ /dev/null @@ -1,21 +0,0 @@ -// Luanti -// SPDX-License-Identifier: LGPL-2.1-or-later -// Copyright (C) 2010-2013 celeron55, Perttu Ahola - -#pragma once - -#include "irrlichttypes_bloated.h" -#include "config.h" // IS_CLIENT_BUILD - -#if IS_CLIENT_BUILD -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#endif diff --git a/src/script/lua_api/l_mainmenu.cpp b/src/script/lua_api/l_mainmenu.cpp index f077a8cdc..43087c978 100644 --- a/src/script/lua_api/l_mainmenu.cpp +++ b/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) diff --git a/src/script/lua_api/l_util.cpp b/src/script/lua_api/l_util.cpp index f84835e8b..86d3de316 100644 --- a/src/script/lua_api/l_util.cpp +++ b/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 -#include "irrlichttypes_extrabloated.h" #include "lua_api/l_util.h" #include "lua_api/l_internal.h" #include "lua_api/l_settings.h"