From e5a7f27f19ea695a57ccc2c939eb04ccb0dd4ee1 Mon Sep 17 00:00:00 2001 From: hiker Date: Sat, 30 May 2015 12:16:11 +1000 Subject: [PATCH] Renamed files to follow our coding style. --- sources.cmake | 2 +- src/graphics/glwrap.cpp | 2 +- src/graphics/glwrap.hpp | 7 +++---- .../{gpuparticles.cpp => gpu_particles.cpp} | 2 +- .../{gpuparticles.hpp => gpu_particles.hpp} | 0 src/graphics/irr_driver.cpp | 12 +++++------ src/graphics/light.cpp | 4 ++-- src/graphics/particle_emitter.cpp | 6 ++++-- src/graphics/post_processing.cpp | 4 ++-- src/graphics/render.cpp | 14 ++++++------- src/graphics/render_geometry.cpp | 4 ++-- src/graphics/render_lighting.cpp | 8 ++++---- .../{screenquad.cpp => screen_quad.cpp} | 2 +- .../{screenquad.hpp => screen_quad.hpp} | 0 src/graphics/shaders.cpp | 5 +++-- ...hadow_matrixes.cpp => shadow_matrices.cpp} | 5 ++--- ...hadow_matrixes.hpp => shadow_matrices.hpp} | 0 src/graphics/skid_marks.cpp | 2 +- src/graphics/slip_stream.cpp | 2 +- ...animatedmesh.cpp => stk_animated_mesh.cpp} | 18 +++++++++-------- ...animatedmesh.hpp => stk_animated_mesh.hpp} | 5 +++-- .../{stkbillboard.cpp => stk_billboard.cpp} | 2 +- .../{stkbillboard.hpp => stk_billboard.hpp} | 0 src/graphics/{stkmesh.cpp => stk_mesh.cpp} | 2 +- src/graphics/{stkmesh.hpp => stk_mesh.hpp} | 0 ...hscenenode.cpp => stk_mesh_scene_node.cpp} | 20 ++++++++++--------- ...hscenenode.hpp => stk_mesh_scene_node.hpp} | 6 +++--- ...scenemanager.cpp => stk_scene_manager.cpp} | 10 +++++----- ...scenemanager.hpp => stk_scene_manager.hpp} | 10 +++++----- src/graphics/stk_text_billboard.cpp | 4 ++-- src/graphics/stk_text_billboard.hpp | 7 ++++--- src/graphics/sun.cpp | 2 +- ...texturemanager.cpp => texture_manager.cpp} | 11 ++++++---- ...texturemanager.hpp => texture_manager.hpp} | 0 .../{vaomanager.cpp => vao_manager.cpp} | 11 +++++----- .../{vaomanager.hpp => vao_manager.hpp} | 0 src/items/rubber_band.cpp | 6 ++---- src/tracks/quad_graph.cpp | 2 +- src/tracks/track_object_presentation.cpp | 5 +++-- 39 files changed, 106 insertions(+), 96 deletions(-) rename src/graphics/{gpuparticles.cpp => gpu_particles.cpp} (99%) rename src/graphics/{gpuparticles.hpp => gpu_particles.hpp} (100%) rename src/graphics/{screenquad.cpp => screen_quad.cpp} (97%) rename src/graphics/{screenquad.hpp => screen_quad.hpp} (100%) rename src/graphics/{shadow_matrixes.cpp => shadow_matrices.cpp} (99%) rename src/graphics/{shadow_matrixes.hpp => shadow_matrices.hpp} (100%) rename src/graphics/{stkanimatedmesh.cpp => stk_animated_mesh.cpp} (99%) rename src/graphics/{stkanimatedmesh.hpp => stk_animated_mesh.hpp} (98%) rename src/graphics/{stkbillboard.cpp => stk_billboard.cpp} (99%) rename src/graphics/{stkbillboard.hpp => stk_billboard.hpp} (100%) rename src/graphics/{stkmesh.cpp => stk_mesh.cpp} (99%) rename src/graphics/{stkmesh.hpp => stk_mesh.hpp} (100%) rename src/graphics/{stkmeshscenenode.cpp => stk_mesh_scene_node.cpp} (99%) rename src/graphics/{stkmeshscenenode.hpp => stk_mesh_scene_node.hpp} (96%) rename src/graphics/{stkscenemanager.cpp => stk_scene_manager.cpp} (99%) rename src/graphics/{stkscenemanager.hpp => stk_scene_manager.hpp} (93%) rename src/graphics/{texturemanager.cpp => texture_manager.cpp} (98%) rename src/graphics/{texturemanager.hpp => texture_manager.hpp} (100%) rename src/graphics/{vaomanager.cpp => vao_manager.cpp} (98%) rename src/graphics/{vaomanager.hpp => vao_manager.hpp} (100%) diff --git a/sources.cmake b/sources.cmake index 8f7f40bbb..c16c9c60c 100644 --- a/sources.cmake +++ b/sources.cmake @@ -1,5 +1,5 @@ # Modify this file to change the last-modified date when you add/remove a file. -# This will then trigger a new cmake run automatically. +# This will then trigger a new cmake run automatically. file(GLOB_RECURSE STK_HEADERS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "src/*.hpp") file(GLOB_RECURSE STK_SOURCES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "src/*.cpp") file(GLOB_RECURSE STK_SHADERS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "data/shaders/*") diff --git a/src/graphics/glwrap.cpp b/src/graphics/glwrap.cpp index f2141c22d..1b5ad28a7 100644 --- a/src/graphics/glwrap.cpp +++ b/src/graphics/glwrap.cpp @@ -22,7 +22,7 @@ #include "config/user_config.hpp" #include "graphics/central_settings.hpp" #include "graphics/shaders.hpp" -#include "graphics/stkmesh.hpp" +#include "graphics/stk_mesh.hpp" #include "utils/profiler.hpp" #include "utils/cpp2011.hpp" diff --git a/src/graphics/glwrap.hpp b/src/graphics/glwrap.hpp index 1b7ffdabc..e97e7284f 100644 --- a/src/graphics/glwrap.hpp +++ b/src/graphics/glwrap.hpp @@ -21,8 +21,10 @@ #include "graphics/gl_headers.hpp" #include "graphics/irr_driver.hpp" -#include "graphics/vaomanager.hpp" +#include "graphics/texture_manager.hpp" +#include "graphics/vao_manager.hpp" #include "utils/log.hpp" +#include "utils/vec3.hpp" #include @@ -143,9 +145,6 @@ public: } }; -#include "utils/vec3.hpp" -#include "texturemanager.hpp" - void draw3DLine(const core::vector3df& start, const core::vector3df& end, irr::video::SColor color); diff --git a/src/graphics/gpuparticles.cpp b/src/graphics/gpu_particles.cpp similarity index 99% rename from src/graphics/gpuparticles.cpp rename to src/graphics/gpu_particles.cpp index d668814f3..e63363de5 100644 --- a/src/graphics/gpuparticles.cpp +++ b/src/graphics/gpu_particles.cpp @@ -15,7 +15,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/gpuparticles.hpp" +#include "graphics/gpu_particles.hpp" #include "config/user_config.hpp" #include "graphics/glwrap.hpp" diff --git a/src/graphics/gpuparticles.hpp b/src/graphics/gpu_particles.hpp similarity index 100% rename from src/graphics/gpuparticles.hpp rename to src/graphics/gpu_particles.hpp diff --git a/src/graphics/irr_driver.cpp b/src/graphics/irr_driver.cpp index 7f21a42cd..dcf6f5661 100644 --- a/src/graphics/irr_driver.cpp +++ b/src/graphics/irr_driver.cpp @@ -31,14 +31,14 @@ #include "graphics/post_processing.hpp" #include "graphics/referee.hpp" #include "graphics/shaders.hpp" -#include "graphics/shadow_matrixes.hpp" -#include "graphics/stkanimatedmesh.hpp" -#include "graphics/stkbillboard.hpp" -#include "graphics/stkmeshscenenode.hpp" -#include "graphics/stkscenemanager.hpp" +#include "graphics/shadow_matrices.hpp" +#include "graphics/stk_animated_mesh.hpp" +#include "graphics/stk_billboard.hpp" +#include "graphics/stk_mesh_scene_node.hpp" +#include "graphics/stk_scene_manager.hpp" #include "graphics/sun.hpp" #include "graphics/rtts.hpp" -#include "graphics/texturemanager.hpp" +#include "graphics/texture_manager.hpp" #include "graphics/water.hpp" #include "graphics/wind.hpp" #include "guiengine/engine.hpp" diff --git a/src/graphics/light.cpp b/src/graphics/light.cpp index f3e7f1d5a..d271c68b2 100644 --- a/src/graphics/light.cpp +++ b/src/graphics/light.cpp @@ -21,11 +21,11 @@ #include "graphics/callbacks.hpp" #include "graphics/glwrap.hpp" #include "graphics/irr_driver.hpp" -#include "graphics/material_manager.hpp" #include "graphics/material.hpp" +#include "graphics/material_manager.hpp" #include "graphics/rtts.hpp" +#include "graphics/screen_quad.hpp" #include "graphics/shaders.hpp" -#include "graphics/screenquad.hpp" using namespace video; using namespace scene; diff --git a/src/graphics/particle_emitter.cpp b/src/graphics/particle_emitter.cpp index ecad6ece1..680741c8e 100644 --- a/src/graphics/particle_emitter.cpp +++ b/src/graphics/particle_emitter.cpp @@ -17,18 +17,19 @@ // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "graphics/particle_emitter.hpp" + #include "graphics/central_settings.hpp" +#include "graphics/gpu_particles.hpp" +#include "graphics/irr_driver.hpp" #include "graphics/material.hpp" #include "graphics/material_manager.hpp" #include "graphics/particle_kind.hpp" -#include "graphics/irr_driver.hpp" #include "graphics/shaders.hpp" #include "graphics/wind.hpp" #include "io/file_manager.hpp" #include "tracks/track.hpp" #include "utils/constants.hpp" #include "utils/helpers.hpp" -#include "graphics/gpuparticles.hpp" #include #include @@ -36,6 +37,7 @@ #include #include #include + #include class FadeAwayAffector : public scene::IParticleAffector diff --git a/src/graphics/post_processing.cpp b/src/graphics/post_processing.cpp index 87c0af4d0..a835e7f98 100644 --- a/src/graphics/post_processing.cpp +++ b/src/graphics/post_processing.cpp @@ -19,14 +19,14 @@ #include "config/user_config.hpp" #include "graphics/callbacks.hpp" -#include "central_settings.hpp" #include "graphics/camera.hpp" +#include "graphics/central_settings.hpp" #include "graphics/glwrap.hpp" #include "graphics/irr_driver.hpp" #include "graphics/mlaa_areamap.hpp" #include "graphics/shaders.hpp" #include "graphics/shared_gpu_objects.hpp" -#include "graphics/stkmeshscenenode.hpp" +#include "graphics/stk_mesh_scene_node.hpp" #include "io/file_manager.hpp" #include "karts/abstract_kart.hpp" #include "karts/kart_model.hpp" diff --git a/src/graphics/render.cpp b/src/graphics/render.cpp index c91e611ec..118f53e6f 100644 --- a/src/graphics/render.cpp +++ b/src/graphics/render.cpp @@ -20,25 +20,25 @@ #include "config/user_config.hpp" #include "graphics/callbacks.hpp" -#include "graphics/shared_gpu_objects.hpp" -#include "central_settings.hpp" +#include "graphics/central_settings.hpp" #include "graphics/glwrap.hpp" #include "graphics/graphics_restrictions.hpp" #include "graphics/lod_node.hpp" #include "graphics/post_processing.hpp" #include "graphics/referee.hpp" #include "graphics/rtts.hpp" -#include "graphics/screenquad.hpp" +#include "graphics/screen_quad.hpp" #include "graphics/shaders.hpp" -#include "graphics/shadow_matrixes.hpp" -#include "graphics/stkmeshscenenode.hpp" +#include "graphics/shadow_matrices.hpp" +#include "graphics/shared_gpu_objects.hpp" +#include "graphics/stk_mesh_scene_node.hpp" +#include "graphics/stk_scene_manager.hpp" #include "items/item_manager.hpp" +#include "items/powerup_manager.hpp" #include "modes/world.hpp" #include "physics/physics.hpp" #include "tracks/track.hpp" #include "utils/profiler.hpp" -#include "stkscenemanager.hpp" -#include "items/powerup_manager.hpp" #define MAX2(a, b) ((a) > (b) ? (a) : (b)) #define MIN2(a, b) ((a) > (b) ? (b) : (a)) diff --git a/src/graphics/render_geometry.cpp b/src/graphics/render_geometry.cpp index 8d93874e1..15fba47a5 100644 --- a/src/graphics/render_geometry.cpp +++ b/src/graphics/render_geometry.cpp @@ -24,8 +24,8 @@ #include "graphics/post_processing.hpp" #include "graphics/rtts.hpp" #include "graphics/shaders.hpp" -#include "graphics/shadow_matrixes.hpp" -#include "graphics/stkscenemanager.hpp" +#include "graphics/shadow_matrices.hpp" +#include "graphics/stk_scene_manager.hpp" #include "modes/world.hpp" #include "utils/log.hpp" #include "utils/profiler.hpp" diff --git a/src/graphics/render_lighting.cpp b/src/graphics/render_lighting.cpp index 3287c7707..ef2e274fa 100644 --- a/src/graphics/render_lighting.cpp +++ b/src/graphics/render_lighting.cpp @@ -16,20 +16,20 @@ // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -#include "graphics/irr_driver.hpp" -#include "central_settings.hpp" #include "config/user_config.hpp" +#include "graphics/callbacks.hpp" +#include "graphics/central_settings.hpp" #include "graphics/glwrap.hpp" +#include "graphics/irr_driver.hpp" #include "graphics/light.hpp" #include "graphics/post_processing.hpp" #include "graphics/rtts.hpp" #include "graphics/shaders.hpp" -#include "graphics/shadow_matrixes.hpp" +#include "graphics/shadow_matrices.hpp" #include "graphics/shared_gpu_objects.hpp" #include "modes/world.hpp" #include "tracks/track.hpp" #include "utils/profiler.hpp" -#include "callbacks.hpp" #define MAX2(a, b) ((a) > (b) ? (a) : (b)) #define MIN2(a, b) ((a) > (b) ? (b) : (a)) diff --git a/src/graphics/screenquad.cpp b/src/graphics/screen_quad.cpp similarity index 97% rename from src/graphics/screenquad.cpp rename to src/graphics/screen_quad.cpp index c855a283c..16c94a515 100644 --- a/src/graphics/screenquad.cpp +++ b/src/graphics/screen_quad.cpp @@ -15,7 +15,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/screenquad.hpp" +#include "graphics/screen_quad.hpp" // Just the static parts to our screenquad diff --git a/src/graphics/screenquad.hpp b/src/graphics/screen_quad.hpp similarity index 100% rename from src/graphics/screenquad.hpp rename to src/graphics/screen_quad.hpp diff --git a/src/graphics/shaders.cpp b/src/graphics/shaders.cpp index 9974098e9..654bff83f 100644 --- a/src/graphics/shaders.cpp +++ b/src/graphics/shaders.cpp @@ -96,12 +96,13 @@ #include "graphics/callbacks.hpp" #include "graphics/central_settings.hpp" +#include "graphics/glwrap.hpp" +#include "graphics/gpu_particles.hpp" #include "graphics/irr_driver.hpp" -#include "graphics/gpuparticles.hpp" #include "graphics/shared_gpu_objects.hpp" #include "io/file_manager.hpp" #include "utils/log.hpp" -#include "graphics/glwrap.hpp" + #include #include diff --git a/src/graphics/shadow_matrixes.cpp b/src/graphics/shadow_matrices.cpp similarity index 99% rename from src/graphics/shadow_matrixes.cpp rename to src/graphics/shadow_matrices.cpp index f4333909f..0b4dc1597 100644 --- a/src/graphics/shadow_matrixes.cpp +++ b/src/graphics/shadow_matrices.cpp @@ -15,7 +15,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/shadow_matrixes.hpp" +#include "graphics/shadow_matrices.hpp" #include "graphics/central_settings.hpp" #include "graphics/glwrap.hpp" @@ -37,6 +37,7 @@ #define MAX2(a, b) ((a) > (b) ? (a) : (b)) #define MIN2(a, b) ((a) > (b) ? (b) : (a)) +float ShadowMatrices:: m_shadow_split[5] = { 1., 5., 20., 50., 150 }; // ============================================================================ class LightspaceBoundingBoxShader @@ -79,8 +80,6 @@ public: }; // ShadowMatricesGenerationShader -float ShadowMatrices:: m_shadow_split[5] = { 1., 5., 20., 50., 150 }; - // ============================================================================ class ViewFrustrumShader : public Shader { diff --git a/src/graphics/shadow_matrixes.hpp b/src/graphics/shadow_matrices.hpp similarity index 100% rename from src/graphics/shadow_matrixes.hpp rename to src/graphics/shadow_matrices.hpp diff --git a/src/graphics/skid_marks.cpp b/src/graphics/skid_marks.cpp index 228ca3ad9..9d45af521 100644 --- a/src/graphics/skid_marks.cpp +++ b/src/graphics/skid_marks.cpp @@ -21,11 +21,11 @@ #include "config/stk_config.hpp" #include "graphics/irr_driver.hpp" +#include "graphics/stk_mesh_scene_node.hpp" #include "karts/controller/controller.hpp" #include "karts/abstract_kart.hpp" #include "karts/skidding.hpp" #include "physics/btKart.hpp" -#include "graphics/stkmeshscenenode.hpp" #include #include diff --git a/src/graphics/slip_stream.cpp b/src/graphics/slip_stream.cpp index 57a9c61f3..1cb52b9da 100644 --- a/src/graphics/slip_stream.cpp +++ b/src/graphics/slip_stream.cpp @@ -23,7 +23,7 @@ #include "graphics/irr_driver.hpp" #include "graphics/material.hpp" #include "graphics/material_manager.hpp" -#include "graphics/stkmeshscenenode.hpp" +#include "graphics/stk_mesh_scene_node.hpp" #include "io/file_manager.hpp" #include "karts/controller/controller.hpp" #include "karts/abstract_kart.hpp" diff --git a/src/graphics/stkanimatedmesh.cpp b/src/graphics/stk_animated_mesh.cpp similarity index 99% rename from src/graphics/stkanimatedmesh.cpp rename to src/graphics/stk_animated_mesh.cpp index 634f005d7..a251803f1 100644 --- a/src/graphics/stkanimatedmesh.cpp +++ b/src/graphics/stk_animated_mesh.cpp @@ -15,21 +15,23 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -#include "central_settings.hpp" #include "graphics/glwrap.hpp" -#include "graphics/stkanimatedmesh.hpp" -#include -#include -#include -#include "graphics/irr_driver.hpp" -#include "graphics/material_manager.hpp" + #include "config/user_config.hpp" +#include "central_settings.hpp" +#include "graphics/camera.hpp" +#include "graphics/irr_driver.hpp" +#include "graphics/stk_animated_mesh.hpp" +#include "graphics/material_manager.hpp" #include "modes/world.hpp" #include "tracks/track.hpp" -#include "graphics/camera.hpp" #include "utils/profiler.hpp" #include "utils/cpp2011.hpp" +#include +#include +#include + using namespace irr; STKAnimatedMesh::STKAnimatedMesh(irr::scene::IAnimatedMesh* mesh, irr::scene::ISceneNode* parent, diff --git a/src/graphics/stkanimatedmesh.hpp b/src/graphics/stk_animated_mesh.hpp similarity index 98% rename from src/graphics/stkanimatedmesh.hpp rename to src/graphics/stk_animated_mesh.hpp index 6eb23ac0c..68d6b50f9 100644 --- a/src/graphics/stkanimatedmesh.hpp +++ b/src/graphics/stk_animated_mesh.hpp @@ -18,11 +18,12 @@ #ifndef STKANIMATEDMESH_HPP #define STKANIMATEDMESH_HPP +#include "graphics/stk_mesh.hpp" +#include "utils/ptr_vector.hpp" + #include "../lib/irrlicht/source/Irrlicht/CAnimatedMeshSceneNode.h" #include #include -#include "graphics/stkmesh.hpp" -#include "utils/ptr_vector.hpp" class STKAnimatedMesh : public irr::scene::CAnimatedMeshSceneNode, public STKMeshCommon { diff --git a/src/graphics/stkbillboard.cpp b/src/graphics/stk_billboard.cpp similarity index 99% rename from src/graphics/stkbillboard.cpp rename to src/graphics/stk_billboard.cpp index ef0ac290f..35f5b492d 100644 --- a/src/graphics/stkbillboard.cpp +++ b/src/graphics/stk_billboard.cpp @@ -15,7 +15,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/stkbillboard.hpp" +#include "graphics/stk_billboard.hpp" #include "graphics/glwrap.hpp" #include "graphics/irr_driver.hpp" diff --git a/src/graphics/stkbillboard.hpp b/src/graphics/stk_billboard.hpp similarity index 100% rename from src/graphics/stkbillboard.hpp rename to src/graphics/stk_billboard.hpp diff --git a/src/graphics/stkmesh.cpp b/src/graphics/stk_mesh.cpp similarity index 99% rename from src/graphics/stkmesh.cpp rename to src/graphics/stk_mesh.cpp index 7c9372298..1c1532e25 100644 --- a/src/graphics/stkmesh.cpp +++ b/src/graphics/stk_mesh.cpp @@ -15,7 +15,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/stkmesh.hpp" +#include "graphics/stk_mesh.hpp" #include "config/user_config.hpp" #include "central_settings.hpp" diff --git a/src/graphics/stkmesh.hpp b/src/graphics/stk_mesh.hpp similarity index 100% rename from src/graphics/stkmesh.hpp rename to src/graphics/stk_mesh.hpp diff --git a/src/graphics/stkmeshscenenode.cpp b/src/graphics/stk_mesh_scene_node.cpp similarity index 99% rename from src/graphics/stkmeshscenenode.cpp rename to src/graphics/stk_mesh_scene_node.cpp index d2f43ed32..d2bd3c864 100644 --- a/src/graphics/stkmeshscenenode.cpp +++ b/src/graphics/stk_mesh_scene_node.cpp @@ -15,22 +15,24 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -#include "central_settings.hpp" -#include "stkmeshscenenode.hpp" -#include "stkmesh.hpp" -#include "graphics/irr_driver.hpp" -#include "graphics/glwrap.hpp" -#include "tracks/track.hpp" -#include -#include +#include "graphics/stk_mesh_scene_node.hpp" + #include "config/user_config.hpp" #include "graphics/callbacks.hpp" +#include "graphics/central_settings.hpp" #include "graphics/camera.hpp" +#include "graphics/glwrap.hpp" +#include "graphics/irr_driver.hpp" #include "graphics/material_manager.hpp" +#include "graphics/stk_mesh.hpp" +#include "tracks/track.hpp" #include "modes/world.hpp" +#include "utils/cpp2011.hpp" #include "utils/helpers.hpp" #include "utils/tuple.hpp" -#include "utils/cpp2011.hpp" + +#include +#include // ============================================================================ diff --git a/src/graphics/stkmeshscenenode.hpp b/src/graphics/stk_mesh_scene_node.hpp similarity index 96% rename from src/graphics/stkmeshscenenode.hpp rename to src/graphics/stk_mesh_scene_node.hpp index 8a7d54ee9..38ea151a5 100644 --- a/src/graphics/stkmeshscenenode.hpp +++ b/src/graphics/stk_mesh_scene_node.hpp @@ -15,10 +15,10 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -#ifndef STKMESHSCENENODE_H -#define STKMESHSCENENODE_H +#ifndef HEADER_STK_MESH_SCENE_NODE +#define HEADER_STK_MESH_SCENE_NODE -#include "stkmesh.hpp" +#include "graphics/stk_mesh.hpp" #include "graphics/shaders.hpp" #include "utils/ptr_vector.hpp" diff --git a/src/graphics/stkscenemanager.cpp b/src/graphics/stk_scene_manager.cpp similarity index 99% rename from src/graphics/stkscenemanager.cpp rename to src/graphics/stk_scene_manager.cpp index 32a500cde..009136859 100644 --- a/src/graphics/stkscenemanager.cpp +++ b/src/graphics/stk_scene_manager.cpp @@ -15,17 +15,17 @@ // 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/stkscenemanager.hpp" +#include "graphics/stk_scene_manager.hpp" #include "graphics/callbacks.hpp" #include "graphics/central_settings.hpp" #include "graphics/glwrap.hpp" #include "graphics/irr_driver.hpp" #include "graphics/lod_node.hpp" -#include "graphics/shadow_matrixes.hpp" -#include "graphics/stkanimatedmesh.hpp" -#include "graphics/stkmesh.hpp" -#include "graphics/stkmeshscenenode.hpp" +#include "graphics/shadow_matrices.hpp" +#include "graphics/stk_animated_mesh.hpp" +#include "graphics/stk_mesh.hpp" +#include "graphics/stk_mesh_scene_node.hpp" #include "modes/world.hpp" #include "tracks/track.hpp" #include "utils/cpp2011.hpp" diff --git a/src/graphics/stkscenemanager.hpp b/src/graphics/stk_scene_manager.hpp similarity index 93% rename from src/graphics/stkscenemanager.hpp rename to src/graphics/stk_scene_manager.hpp index bec913066..c57e55183 100644 --- a/src/graphics/stkscenemanager.hpp +++ b/src/graphics/stk_scene_manager.hpp @@ -22,12 +22,12 @@ #ifndef HEADER_STKSCENEMANAGER_HPP #define HEADER_STKSCENEMANAGER_HPP +#include "graphics/central_settings.hpp" +#include "graphics/gl_headers.hpp" +#include "graphics/gpu_particles.hpp" +#include "graphics/stk_billboard.hpp" +#include "graphics/stk_mesh.hpp" #include "utils/singleton.hpp" -#include "central_settings.hpp" -#include "gl_headers.hpp" -#include "stkmesh.hpp" -#include "gpuparticles.hpp" -#include "stkbillboard.hpp" template class CommandBuffer : public Singleton diff --git a/src/graphics/stk_text_billboard.cpp b/src/graphics/stk_text_billboard.cpp index fd2f0bcf4..b0340c216 100644 --- a/src/graphics/stk_text_billboard.cpp +++ b/src/graphics/stk_text_billboard.cpp @@ -19,8 +19,8 @@ #include "graphics/glwrap.hpp" #include "graphics/shaders.hpp" #include "graphics/irr_driver.hpp" -#include "graphics/stkbillboard.hpp" -#include "graphics/stkmeshscenenode.hpp" +#include "graphics/stk_billboard.hpp" +#include "graphics/stk_mesh_scene_node.hpp" #include "guiengine/engine.hpp" #include "guiengine/scalable_font.hpp" #include "glwrap.hpp" diff --git a/src/graphics/stk_text_billboard.hpp b/src/graphics/stk_text_billboard.hpp index 090f6166e..6bcce436f 100644 --- a/src/graphics/stk_text_billboard.hpp +++ b/src/graphics/stk_text_billboard.hpp @@ -18,13 +18,14 @@ #ifndef STK_TEXT_BILLBOARD_HPP #define STK_TEXT_BILLBOARD_HPP +#include "graphics/stk_mesh_scene_node.hpp" +#include "guiengine/scalable_font.hpp" +#include "utils/cpp2011.hpp" + #include "../lib/irrlicht/source/Irrlicht/CBillboardSceneNode.h" #include #include #include -#include "graphics/stkmeshscenenode.hpp" -#include "guiengine/scalable_font.hpp" -#include "utils/cpp2011.hpp" class STKTextBillboardChar { diff --git a/src/graphics/sun.cpp b/src/graphics/sun.cpp index 9481d760d..300316dac 100644 --- a/src/graphics/sun.cpp +++ b/src/graphics/sun.cpp @@ -24,7 +24,7 @@ #include "graphics/material_manager.hpp" #include "graphics/material.hpp" #include "graphics/rtts.hpp" -#include "graphics/screenquad.hpp" +#include "graphics/screen_quad.hpp" #include "graphics/shaders.hpp" #include "io/file_manager.hpp" #include "modes/world.hpp" diff --git a/src/graphics/texturemanager.cpp b/src/graphics/texture_manager.cpp similarity index 98% rename from src/graphics/texturemanager.cpp rename to src/graphics/texture_manager.cpp index 6a567f9f6..d4d87a44a 100644 --- a/src/graphics/texturemanager.cpp +++ b/src/graphics/texture_manager.cpp @@ -15,12 +15,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 "central_settings.hpp" -#include "texturemanager.hpp" +#include "graphics/texture_manager.hpp" + +#include "graphics/central_settings.hpp" +#include "graphics/irr_driver.hpp" + +#include "../../lib/irrlicht/source/Irrlicht/COpenGLTexture.h" + #include #include -#include "../../lib/irrlicht/source/Irrlicht/COpenGLTexture.h" -#include "irr_driver.hpp" GLuint getTextureGLuint(irr::video::ITexture *tex) diff --git a/src/graphics/texturemanager.hpp b/src/graphics/texture_manager.hpp similarity index 100% rename from src/graphics/texturemanager.hpp rename to src/graphics/texture_manager.hpp diff --git a/src/graphics/vaomanager.cpp b/src/graphics/vao_manager.cpp similarity index 98% rename from src/graphics/vaomanager.cpp rename to src/graphics/vao_manager.cpp index bf3360f9d..affeae782 100644 --- a/src/graphics/vaomanager.cpp +++ b/src/graphics/vao_manager.cpp @@ -15,11 +15,12 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -#include "vaomanager.hpp" -#include "irr_driver.hpp" -#include "stkmesh.hpp" -#include "glwrap.hpp" -#include "central_settings.hpp" +#include "graphics/vao_manager.hpp" + +#include "graphics/central_settings.hpp" +#include "graphics/glwrap.hpp" +#include "graphics/irr_driver.hpp" +#include "graphics/stk_mesh.hpp" VAOManager::VAOManager() { diff --git a/src/graphics/vaomanager.hpp b/src/graphics/vao_manager.hpp similarity index 100% rename from src/graphics/vaomanager.hpp rename to src/graphics/vao_manager.hpp diff --git a/src/items/rubber_band.cpp b/src/items/rubber_band.cpp index 88625d26e..0c000012b 100644 --- a/src/items/rubber_band.cpp +++ b/src/items/rubber_band.cpp @@ -20,9 +20,10 @@ #include +#include "graphics/glwrap.hpp" #include "graphics/irr_driver.hpp" #include "graphics/material_manager.hpp" -#include "graphics/stkmeshscenenode.hpp" +#include "graphics/stk_mesh_scene_node.hpp" #include "items/plunger.hpp" #include "items/projectile_manager.hpp" #include "karts/abstract_kart.hpp" @@ -32,9 +33,6 @@ #include "physics/physics.hpp" #include "race/race_manager.hpp" #include "utils/string_utils.hpp" -#include "graphics/glwrap.hpp" - -#include "utils/log.hpp" //TODO: remove after debugging is done #include diff --git a/src/tracks/quad_graph.cpp b/src/tracks/quad_graph.cpp index 7c4e7197b..ef78004df 100644 --- a/src/tracks/quad_graph.cpp +++ b/src/tracks/quad_graph.cpp @@ -26,7 +26,7 @@ #include "config/user_config.hpp" #include "graphics/callbacks.hpp" #include "graphics/irr_driver.hpp" -#include "graphics/screenquad.hpp" +#include "graphics/screen_quad.hpp" #include "graphics/shaders.hpp" #include "graphics/rtts.hpp" #include "io/file_manager.hpp" diff --git a/src/tracks/track_object_presentation.cpp b/src/tracks/track_object_presentation.cpp index 5e2ba515a..5b7a2dca8 100644 --- a/src/tracks/track_object_presentation.cpp +++ b/src/tracks/track_object_presentation.cpp @@ -17,17 +17,18 @@ // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "tracks/track_object_presentation.hpp" -#include "graphics/central_settings.hpp" + #include "audio/sfx_base.hpp" #include "audio/sfx_buffer.hpp" #include "challenges/unlock_manager.hpp" #include "config/user_config.hpp" +#include "graphics/central_settings.hpp" #include "graphics/irr_driver.hpp" #include "graphics/material_manager.hpp" #include "graphics/mesh_tools.hpp" #include "graphics/particle_emitter.hpp" #include "graphics/particle_kind_manager.hpp" -#include "graphics/stkmeshscenenode.hpp" +#include "graphics/stk_mesh_scene_node.hpp" #include "io/file_manager.hpp" #include "io/xml_node.hpp" #include "input/device_manager.hpp"