From 97faf4a492975646915c6d40bf81fe620eea2950 Mon Sep 17 00:00:00 2001 From: Alayan <25536748+Alayan-stk-2@users.noreply.github.com> Date: Mon, 20 May 2024 12:07:06 +0200 Subject: [PATCH] Move the camera files in a subfolder --- src/graphics/{ => camera}/camera.cpp | 10 +++++----- src/graphics/{ => camera}/camera.hpp | 0 src/graphics/{ => camera}/camera_debug.cpp | 2 +- src/graphics/{ => camera}/camera_debug.hpp | 2 +- src/graphics/{ => camera}/camera_end.cpp | 2 +- src/graphics/{ => camera}/camera_end.hpp | 2 +- src/graphics/{ => camera}/camera_fps.cpp | 2 +- src/graphics/{ => camera}/camera_fps.hpp | 2 +- src/graphics/{ => camera}/camera_normal.cpp | 2 +- src/graphics/{ => camera}/camera_normal.hpp | 2 +- src/graphics/fixed_pipeline_renderer.cpp | 2 +- src/graphics/irr_driver.cpp | 2 +- src/graphics/lod_node.cpp | 2 +- src/graphics/post_processing.cpp | 2 +- src/graphics/shader_based_renderer.cpp | 2 +- src/input/input_manager.cpp | 2 +- src/karts/controller/ai_base_controller.cpp | 2 +- src/karts/controller/ghost_controller.cpp | 2 +- src/karts/controller/local_player_controller.cpp | 2 +- src/karts/controller/network_ai_controller.cpp | 2 +- src/karts/controller/soccer_ai.cpp | 2 +- src/karts/explosion_animation.cpp | 2 +- src/karts/kart.cpp | 2 +- src/main.cpp | 4 ++-- src/modes/cutscene_world.cpp | 2 +- src/modes/follow_the_leader.cpp | 2 +- src/modes/profile_world.cpp | 2 +- src/modes/three_strikes_battle.cpp | 2 +- src/modes/world.cpp | 2 +- src/network/protocols/client_lobby.cpp | 2 +- src/states_screens/options/options_screen_display.cpp | 2 +- src/states_screens/options/options_screen_ui.cpp | 4 ++-- src/states_screens/race_gui.cpp | 2 +- src/states_screens/race_gui_base.cpp | 2 +- src/states_screens/race_gui_multitouch.cpp | 4 ++-- src/states_screens/race_gui_overworld.cpp | 2 +- src/tracks/track.cpp | 2 +- src/tracks/track_object_presentation.cpp | 2 +- src/utils/debug.cpp | 4 ++-- 39 files changed, 46 insertions(+), 46 deletions(-) rename src/graphics/{ => camera}/camera.cpp (98%) rename src/graphics/{ => camera}/camera.hpp (100%) rename src/graphics/{ => camera}/camera_debug.cpp (99%) rename src/graphics/{ => camera}/camera_debug.hpp (98%) rename src/graphics/{ => camera}/camera_end.cpp (99%) rename src/graphics/{ => camera}/camera_end.hpp (98%) rename src/graphics/{ => camera}/camera_fps.cpp (99%) rename src/graphics/{ => camera}/camera_fps.hpp (99%) rename src/graphics/{ => camera}/camera_normal.cpp (99%) rename src/graphics/{ => camera}/camera_normal.hpp (98%) diff --git a/src/graphics/camera.cpp b/src/graphics/camera/camera.cpp similarity index 98% rename from src/graphics/camera.cpp rename to src/graphics/camera/camera.cpp index 2c37711be..e20f645c2 100644 --- a/src/graphics/camera.cpp +++ b/src/graphics/camera/camera.cpp @@ -17,15 +17,15 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -#include "graphics/camera.hpp" +#include "graphics/camera/camera.hpp" #include "audio/sfx_manager.hpp" #include "config/stk_config.hpp" #include "config/user_config.hpp" -#include "graphics/camera_debug.hpp" -#include "graphics/camera_end.hpp" -#include "graphics/camera_fps.hpp" -#include "graphics/camera_normal.hpp" +#include "graphics/camera/camera_debug.hpp" +#include "graphics/camera/camera_end.hpp" +#include "graphics/camera/camera_fps.hpp" +#include "graphics/camera/camera_normal.hpp" #include "graphics/irr_driver.hpp" #include "io/xml_node.hpp" #include "karts/abstract_kart.hpp" diff --git a/src/graphics/camera.hpp b/src/graphics/camera/camera.hpp similarity index 100% rename from src/graphics/camera.hpp rename to src/graphics/camera/camera.hpp diff --git a/src/graphics/camera_debug.cpp b/src/graphics/camera/camera_debug.cpp similarity index 99% rename from src/graphics/camera_debug.cpp rename to src/graphics/camera/camera_debug.cpp index 1e6af945f..f722d66f7 100644 --- a/src/graphics/camera_debug.cpp +++ b/src/graphics/camera/camera_debug.cpp @@ -17,7 +17,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -#include "graphics/camera_debug.hpp" +#include "graphics/camera/camera_debug.hpp" #include "config/stk_config.hpp" #include "config/user_config.hpp" diff --git a/src/graphics/camera_debug.hpp b/src/graphics/camera/camera_debug.hpp similarity index 98% rename from src/graphics/camera_debug.hpp rename to src/graphics/camera/camera_debug.hpp index d0ad128f2..0c9ed5422 100644 --- a/src/graphics/camera_debug.hpp +++ b/src/graphics/camera/camera_debug.hpp @@ -21,7 +21,7 @@ #ifndef HEADER_CAMERA_DEBUG_HPP #define HEADER_CAMERA_DEBUG_HPP -#include "graphics/camera_normal.hpp" +#include "graphics/camera/camera_normal.hpp" class AbstractKart; diff --git a/src/graphics/camera_end.cpp b/src/graphics/camera/camera_end.cpp similarity index 99% rename from src/graphics/camera_end.cpp rename to src/graphics/camera/camera_end.cpp index d98a8ca7e..c71af0666 100644 --- a/src/graphics/camera_end.cpp +++ b/src/graphics/camera/camera_end.cpp @@ -16,7 +16,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -#include "graphics/camera_end.hpp" +#include "graphics/camera/camera_end.hpp" #include "config/user_config.hpp" #include "karts/abstract_kart.hpp" diff --git a/src/graphics/camera_end.hpp b/src/graphics/camera/camera_end.hpp similarity index 98% rename from src/graphics/camera_end.hpp rename to src/graphics/camera/camera_end.hpp index b1bd51de3..71eac2153 100644 --- a/src/graphics/camera_end.hpp +++ b/src/graphics/camera/camera_end.hpp @@ -21,7 +21,7 @@ #ifndef HEADER_CAMERA_END_HPP #define HEADER_CAMERA_END_HPP -#include "graphics/camera_normal.hpp" +#include "graphics/camera/camera_normal.hpp" #include "utils/cpp2011.hpp" diff --git a/src/graphics/camera_fps.cpp b/src/graphics/camera/camera_fps.cpp similarity index 99% rename from src/graphics/camera_fps.cpp rename to src/graphics/camera/camera_fps.cpp index f978bb365..7ac6639b8 100644 --- a/src/graphics/camera_fps.cpp +++ b/src/graphics/camera/camera_fps.cpp @@ -17,7 +17,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -#include "graphics/camera_fps.hpp" +#include "graphics/camera/camera_fps.hpp" #include "config/stk_config.hpp" #include "config/user_config.hpp" diff --git a/src/graphics/camera_fps.hpp b/src/graphics/camera/camera_fps.hpp similarity index 99% rename from src/graphics/camera_fps.hpp rename to src/graphics/camera/camera_fps.hpp index 9d24d3d04..0682cbd18 100644 --- a/src/graphics/camera_fps.hpp +++ b/src/graphics/camera/camera_fps.hpp @@ -21,7 +21,7 @@ #ifndef HEADER_CAMERA_FPS_HPP #define HEADER_CAMERA_FPS_HPP -#include "graphics/camera.hpp" +#include "graphics/camera/camera.hpp" #include "utils/cpp2011.hpp" diff --git a/src/graphics/camera_normal.cpp b/src/graphics/camera/camera_normal.cpp similarity index 99% rename from src/graphics/camera_normal.cpp rename to src/graphics/camera/camera_normal.cpp index d58762a72..a10569850 100644 --- a/src/graphics/camera_normal.cpp +++ b/src/graphics/camera/camera_normal.cpp @@ -17,7 +17,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -#include "graphics/camera_normal.hpp" +#include "graphics/camera/camera_normal.hpp" #include "audio/sfx_manager.hpp" #include "config/stk_config.hpp" diff --git a/src/graphics/camera_normal.hpp b/src/graphics/camera/camera_normal.hpp similarity index 98% rename from src/graphics/camera_normal.hpp rename to src/graphics/camera/camera_normal.hpp index b6b458db2..af1d343ba 100644 --- a/src/graphics/camera_normal.hpp +++ b/src/graphics/camera/camera_normal.hpp @@ -21,7 +21,7 @@ #ifndef HEADER_CAMERA_NORMAL_HPP #define HEADER_CAMERA_NORMAL_HPP -#include "graphics/camera.hpp" +#include "graphics/camera/camera.hpp" #include "utils/cpp2011.hpp" diff --git a/src/graphics/fixed_pipeline_renderer.cpp b/src/graphics/fixed_pipeline_renderer.cpp index a3c688201..136c454c5 100644 --- a/src/graphics/fixed_pipeline_renderer.cpp +++ b/src/graphics/fixed_pipeline_renderer.cpp @@ -18,7 +18,7 @@ #ifndef SERVER_ONLY #include "graphics/fixed_pipeline_renderer.hpp" #include "config/user_config.hpp" -#include "graphics/camera.hpp" +#include "graphics/camera/camera.hpp" #include "graphics/irr_driver.hpp" #include "graphics/render_target.hpp" #include "modes/world.hpp" diff --git a/src/graphics/irr_driver.cpp b/src/graphics/irr_driver.cpp index c99fabdc5..da4fc1aea 100644 --- a/src/graphics/irr_driver.cpp +++ b/src/graphics/irr_driver.cpp @@ -26,7 +26,7 @@ #include "font/regular_face.hpp" #include "graphics/2dutils.hpp" #include "graphics/b3d_mesh_loader.hpp" -#include "graphics/camera.hpp" +#include "graphics/camera/camera.hpp" #include "graphics/central_settings.hpp" #include "graphics/fixed_pipeline_renderer.hpp" #include "graphics/glwrap.hpp" diff --git a/src/graphics/lod_node.cpp b/src/graphics/lod_node.cpp index 559c5333a..773ec5788 100644 --- a/src/graphics/lod_node.cpp +++ b/src/graphics/lod_node.cpp @@ -16,7 +16,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -#include "graphics/camera.hpp" +#include "graphics/camera/camera.hpp" #include "graphics/central_settings.hpp" #include "graphics/irr_driver.hpp" #include "graphics/lod_node.hpp" diff --git a/src/graphics/post_processing.cpp b/src/graphics/post_processing.cpp index 6084fdbce..092dfeaf1 100644 --- a/src/graphics/post_processing.cpp +++ b/src/graphics/post_processing.cpp @@ -20,7 +20,7 @@ #include "graphics/post_processing.hpp" #include "config/user_config.hpp" -#include "graphics/camera.hpp" +#include "graphics/camera/camera.hpp" #include "graphics/central_settings.hpp" #include "graphics/frame_buffer.hpp" #include "graphics/graphics_restrictions.hpp" diff --git a/src/graphics/shader_based_renderer.cpp b/src/graphics/shader_based_renderer.cpp index 043b6e5fa..943b8348f 100644 --- a/src/graphics/shader_based_renderer.cpp +++ b/src/graphics/shader_based_renderer.cpp @@ -20,7 +20,7 @@ #include "graphics/shader_based_renderer.hpp" #include "config/user_config.hpp" -#include "graphics/camera.hpp" +#include "graphics/camera/camera.hpp" #include "graphics/central_settings.hpp" #include "graphics/cpu_particle_manager.hpp" #include "graphics/frame_buffer_layer.hpp" diff --git a/src/input/input_manager.cpp b/src/input/input_manager.cpp index 5abc01469..99cff967f 100644 --- a/src/input/input_manager.cpp +++ b/src/input/input_manager.cpp @@ -19,7 +19,7 @@ #include "input/input_manager.hpp" #include "config/user_config.hpp" -#include "graphics/camera_fps.hpp" +#include "graphics/camera/camera_fps.hpp" #include "graphics/irr_driver.hpp" #include "graphics/shader_based_renderer.hpp" #include "graphics/sp/sp_base.hpp" diff --git a/src/karts/controller/ai_base_controller.cpp b/src/karts/controller/ai_base_controller.cpp index 4f0003b72..32c3fb59d 100644 --- a/src/karts/controller/ai_base_controller.cpp +++ b/src/karts/controller/ai_base_controller.cpp @@ -20,7 +20,7 @@ #include "karts/controller/ai_base_controller.hpp" #include "config/user_config.hpp" -#include "graphics/camera.hpp" +#include "graphics/camera/camera.hpp" #include "karts/abstract_kart.hpp" #include "karts/kart_properties.hpp" #include "karts/controller/ai_properties.hpp" diff --git a/src/karts/controller/ghost_controller.cpp b/src/karts/controller/ghost_controller.cpp index 65701fd98..0d8c6ad5b 100644 --- a/src/karts/controller/ghost_controller.cpp +++ b/src/karts/controller/ghost_controller.cpp @@ -16,7 +16,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -#include "graphics/camera_fps.hpp" +#include "graphics/camera/camera_fps.hpp" #include "karts/controller/ghost_controller.hpp" #include "karts/controller/kart_control.hpp" #include "modes/world.hpp" diff --git a/src/karts/controller/local_player_controller.cpp b/src/karts/controller/local_player_controller.cpp index 246578928..88395be61 100644 --- a/src/karts/controller/local_player_controller.cpp +++ b/src/karts/controller/local_player_controller.cpp @@ -23,7 +23,7 @@ #include "config/player_manager.hpp" #include "config/stk_config.hpp" #include "config/user_config.hpp" -#include "graphics/camera.hpp" +#include "graphics/camera/camera.hpp" #include "graphics/irr_driver.hpp" #include "graphics/particle_emitter.hpp" #include "graphics/particle_kind.hpp" diff --git a/src/karts/controller/network_ai_controller.cpp b/src/karts/controller/network_ai_controller.cpp index 122a19160..d2d9eac1d 100644 --- a/src/karts/controller/network_ai_controller.cpp +++ b/src/karts/controller/network_ai_controller.cpp @@ -17,7 +17,7 @@ // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "karts/controller/network_ai_controller.hpp" -#include "graphics/camera.hpp" +#include "graphics/camera/camera.hpp" #include "guiengine/engine.hpp" #include "karts/abstract_kart.hpp" #include "karts/controller/kart_control.hpp" diff --git a/src/karts/controller/soccer_ai.cpp b/src/karts/controller/soccer_ai.cpp index dc29bd9a4..49801bde5 100644 --- a/src/karts/controller/soccer_ai.cpp +++ b/src/karts/controller/soccer_ai.cpp @@ -32,7 +32,7 @@ #endif #ifdef BALL_AIM_DEBUG -#include "graphics/camera.hpp" +#include "graphics/camera/camera.hpp" #endif SoccerAI::SoccerAI(AbstractKart *kart) diff --git a/src/karts/explosion_animation.cpp b/src/karts/explosion_animation.cpp index fc7f2c4a3..852012409 100644 --- a/src/karts/explosion_animation.cpp +++ b/src/karts/explosion_animation.cpp @@ -19,7 +19,7 @@ #include "karts/explosion_animation.hpp" #include "audio/sfx_manager.hpp" -#include "graphics/camera.hpp" +#include "graphics/camera/camera.hpp" #include "graphics/stars.hpp" #include "guiengine/engine.hpp" #include "items/attachment.hpp" diff --git a/src/karts/kart.cpp b/src/karts/kart.cpp index e72e6ac4b..68356b7f5 100644 --- a/src/karts/kart.cpp +++ b/src/karts/kart.cpp @@ -27,7 +27,7 @@ #include "config/user_config.hpp" #include "font/bold_face.hpp" #include "font/font_manager.hpp" -#include "graphics/camera.hpp" +#include "graphics/camera/camera.hpp" #include "graphics/central_settings.hpp" #include "graphics/explosion.hpp" #include "graphics/irr_driver.hpp" diff --git a/src/main.cpp b/src/main.cpp index 9a34b24af..c69a7bd60 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -211,8 +211,8 @@ extern "C" { #include "config/stk_config.hpp" #include "config/user_config.hpp" #include "font/font_manager.hpp" -#include "graphics/camera.hpp" -#include "graphics/camera_debug.hpp" +#include "graphics/camera/camera.hpp" +#include "graphics/camera/camera_debug.hpp" #include "graphics/central_settings.hpp" #include "graphics/graphics_restrictions.hpp" #include "graphics/irr_driver.hpp" diff --git a/src/modes/cutscene_world.cpp b/src/modes/cutscene_world.cpp index 37cb54e1e..d702df740 100644 --- a/src/modes/cutscene_world.cpp +++ b/src/modes/cutscene_world.cpp @@ -23,7 +23,7 @@ #include "audio/sfx_manager.hpp" #include "challenges/unlock_manager.hpp" #include "config/player_manager.hpp" -#include "graphics/camera.hpp" +#include "graphics/camera/camera.hpp" #include "graphics/irr_driver.hpp" #include "io/file_manager.hpp" #include "karts/abstract_kart.hpp" diff --git a/src/modes/follow_the_leader.cpp b/src/modes/follow_the_leader.cpp index af0abd69b..48990c30f 100644 --- a/src/modes/follow_the_leader.cpp +++ b/src/modes/follow_the_leader.cpp @@ -20,7 +20,7 @@ #include "audio/music_manager.hpp" #include "challenges/unlock_manager.hpp" #include "config/user_config.hpp" -#include "graphics/camera.hpp" +#include "graphics/camera/camera.hpp" #include "items/powerup_manager.hpp" #include "karts/abstract_kart.hpp" #include "karts/controller/controller.hpp" diff --git a/src/modes/profile_world.cpp b/src/modes/profile_world.cpp index 29589702d..1c6f6d198 100644 --- a/src/modes/profile_world.cpp +++ b/src/modes/profile_world.cpp @@ -19,7 +19,7 @@ #include "modes/profile_world.hpp" #include "main_loop.hpp" -#include "graphics/camera.hpp" +#include "graphics/camera/camera.hpp" #include "graphics/irr_driver.hpp" #include "karts/kart_with_stats.hpp" #include "karts/controller/controller.hpp" diff --git a/src/modes/three_strikes_battle.cpp b/src/modes/three_strikes_battle.cpp index fb4b9cb83..4029f68aa 100644 --- a/src/modes/three_strikes_battle.cpp +++ b/src/modes/three_strikes_battle.cpp @@ -20,7 +20,7 @@ #include "main_loop.hpp" #include "audio/music_manager.hpp" #include "config/user_config.hpp" -#include "graphics/camera.hpp" +#include "graphics/camera/camera.hpp" #include "graphics/irr_driver.hpp" #include #include "io/file_manager.hpp" diff --git a/src/modes/world.cpp b/src/modes/world.cpp index 9416af16f..a4a85fe6d 100644 --- a/src/modes/world.cpp +++ b/src/modes/world.cpp @@ -24,7 +24,7 @@ #include "config/player_manager.hpp" #include "challenges/unlock_manager.hpp" #include "config/user_config.hpp" -#include "graphics/camera.hpp" +#include "graphics/camera/camera.hpp" #include "graphics/central_settings.hpp" #include "graphics/irr_driver.hpp" #include "graphics/material.hpp" diff --git a/src/network/protocols/client_lobby.cpp b/src/network/protocols/client_lobby.cpp index be9e3745d..38f29d671 100644 --- a/src/network/protocols/client_lobby.cpp +++ b/src/network/protocols/client_lobby.cpp @@ -23,7 +23,7 @@ #include "audio/sfx_manager.hpp" #include "config/user_config.hpp" #include "config/player_manager.hpp" -#include "graphics/camera.hpp" +#include "graphics/camera/camera.hpp" #include "guiengine/engine.hpp" #include "guiengine/modaldialog.hpp" #include "guiengine/message_queue.hpp" diff --git a/src/states_screens/options/options_screen_display.cpp b/src/states_screens/options/options_screen_display.cpp index acdae0a7a..68f1bc814 100644 --- a/src/states_screens/options/options_screen_display.cpp +++ b/src/states_screens/options/options_screen_display.cpp @@ -19,7 +19,7 @@ // Manages includes common to all or most options screens #include "states_screens/options/options_common.hpp" -#include "graphics/camera.hpp" +#include "graphics/camera/camera.hpp" #include "graphics/irr_driver.hpp" #include "modes/world.hpp" diff --git a/src/states_screens/options/options_screen_ui.cpp b/src/states_screens/options/options_screen_ui.cpp index c8f90195b..1b92b9a6c 100644 --- a/src/states_screens/options/options_screen_ui.cpp +++ b/src/states_screens/options/options_screen_ui.cpp @@ -18,8 +18,8 @@ // Manages includes common to all options screens #include "states_screens/options/options_common.hpp" -#include "graphics/camera.hpp" -#include "graphics/camera_normal.hpp" +#include "graphics/camera/camera.hpp" +#include "graphics/camera/camera_normal.hpp" #include "challenges/story_mode_timer.hpp" #include "config/player_manager.hpp" #include "font/font_manager.hpp" diff --git a/src/states_screens/race_gui.cpp b/src/states_screens/race_gui.cpp index b70b6bf98..a57a852d7 100644 --- a/src/states_screens/race_gui.cpp +++ b/src/states_screens/race_gui.cpp @@ -28,7 +28,7 @@ using namespace irr; #include "challenges/unlock_manager.hpp" #include "config/user_config.hpp" #include "font/font_drawer.hpp" -#include "graphics/camera.hpp" +#include "graphics/camera/camera.hpp" #include "graphics/central_settings.hpp" #include "graphics/2dutils.hpp" #ifndef SERVER_ONLY diff --git a/src/states_screens/race_gui_base.cpp b/src/states_screens/race_gui_base.cpp index 3bf00d277..b1c59e0ae 100644 --- a/src/states_screens/race_gui_base.cpp +++ b/src/states_screens/race_gui_base.cpp @@ -23,7 +23,7 @@ #include "audio/music_manager.hpp" #include "config/user_config.hpp" #include "graphics/2dutils.hpp" -#include "graphics/camera.hpp" +#include "graphics/camera/camera.hpp" #include "graphics/central_settings.hpp" #include "graphics/irr_driver.hpp" #include "graphics/material.hpp" diff --git a/src/states_screens/race_gui_multitouch.cpp b/src/states_screens/race_gui_multitouch.cpp index 64a679cfa..0004b3252 100644 --- a/src/states_screens/race_gui_multitouch.cpp +++ b/src/states_screens/race_gui_multitouch.cpp @@ -22,8 +22,8 @@ using namespace irr; #include #include "config/user_config.hpp" -#include "graphics/camera.hpp" -#include "graphics/camera_debug.hpp" +#include "graphics/camera/camera.hpp" +#include "graphics/camera/camera_debug.hpp" #include "graphics/2dutils.hpp" #include "graphics/irr_driver.hpp" #include "graphics/material.hpp" diff --git a/src/states_screens/race_gui_overworld.cpp b/src/states_screens/race_gui_overworld.cpp index b57932b21..a82c5dd95 100644 --- a/src/states_screens/race_gui_overworld.cpp +++ b/src/states_screens/race_gui_overworld.cpp @@ -24,7 +24,7 @@ #include "challenges/unlock_manager.hpp" #include "config/player_manager.hpp" #include "config/user_config.hpp" -#include "graphics/camera.hpp" +#include "graphics/camera/camera.hpp" #include "graphics/2dutils.hpp" #ifndef SERVER_ONLY #include "graphics/glwrap.hpp" diff --git a/src/tracks/track.cpp b/src/tracks/track.cpp index 48653e7f1..ce13b321e 100644 --- a/src/tracks/track.cpp +++ b/src/tracks/track.cpp @@ -26,7 +26,7 @@ #include "config/player_manager.hpp" #include "config/stk_config.hpp" #include "config/user_config.hpp" -#include "graphics/camera_end.hpp" +#include "graphics/camera/camera_end.hpp" #include "graphics/CBatchingMesh.hpp" #include "graphics/central_settings.hpp" #include "graphics/cpu_particle_manager.hpp" diff --git a/src/tracks/track_object_presentation.cpp b/src/tracks/track_object_presentation.cpp index 2b8a74cc3..ea659824e 100644 --- a/src/tracks/track_object_presentation.cpp +++ b/src/tracks/track_object_presentation.cpp @@ -22,7 +22,7 @@ #include "audio/sfx_buffer.hpp" #include "challenges/unlock_manager.hpp" #include "config/user_config.hpp" -#include "graphics/camera.hpp" +#include "graphics/camera/camera.hpp" #include "graphics/central_settings.hpp" #include "graphics/irr_driver.hpp" #include "graphics/light.hpp" diff --git a/src/utils/debug.cpp b/src/utils/debug.cpp index 4421c68dc..bc1aae7af 100644 --- a/src/utils/debug.cpp +++ b/src/utils/debug.cpp @@ -23,8 +23,8 @@ #include "font/digit_face.hpp" #include "font/font_manager.hpp" #include "font/regular_face.hpp" -#include "graphics/camera_debug.hpp" -#include "graphics/camera_fps.hpp" +#include "graphics/camera/camera_debug.hpp" +#include "graphics/camera/camera_fps.hpp" #include "graphics/central_settings.hpp" #include "graphics/shader_based_renderer.hpp" #include "graphics/sp/sp_base.hpp"