Move the camera files in a subfolder

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"

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"

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;
 

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"

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"
 

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"

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"
 

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"

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"
 

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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)

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"

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"

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"

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"

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"

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"

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 <ge_render_info.hpp>
 #include "io/file_manager.hpp"

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"

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"

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"
 

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"

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

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"

src/states_screens/race_gui_multitouch.cpp

@@ -22,8 +22,8 @@ using namespace irr;
 #include <algorithm>
 
 #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"

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"

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"

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"

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"