Renamed files to follow our coding style.

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/*")

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"
 

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 <vector>
 
@@ -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);
 

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"

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/shadow_matrices.hpp"
-#include "graphics/stkanimatedmesh.hpp"
+#include "graphics/stk_animated_mesh.hpp"
-#include "graphics/stkbillboard.hpp"
+#include "graphics/stk_billboard.hpp"
-#include "graphics/stkmeshscenenode.hpp"
+#include "graphics/stk_mesh_scene_node.hpp"
-#include "graphics/stkscenemanager.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"

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;

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 <SParticle.h>
 #include <IParticleAffector.h>
@@ -36,6 +37,7 @@
 #include <IParticleSystemSceneNode.h>
 #include <IParticleBoxEmitter.h>
 #include <ISceneManager.h>
+
 #include <algorithm>
 
 class FadeAwayAffector : public scene::IParticleAffector

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"

src/graphics/render.cpp

@@ -20,25 +20,25 @@
 
 #include "config/user_config.hpp"
 #include "graphics/callbacks.hpp"
-#include "graphics/shared_gpu_objects.hpp"
+#include "graphics/central_settings.hpp"
-#include "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/shadow_matrices.hpp"
-#include "graphics/stkmeshscenenode.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))

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/shadow_matrices.hpp"
-#include "graphics/stkscenemanager.hpp"
+#include "graphics/stk_scene_manager.hpp"
 #include "modes/world.hpp"
 #include "utils/log.hpp"
 #include "utils/profiler.hpp"

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))

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
 

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 <assert.h>
 #include <IGPUProgrammingServices.h>
 

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<ViewFrustrumShader, video::SColor, int>
 {

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 <IMeshSceneNode.h>
 #include <SMesh.h>

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"

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 <ISceneManager.h>
-#include <IMaterialRenderer.h>
-#include <ISkinnedMesh.h>
-#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 <IMaterialRenderer.h>
+#include <ISceneManager.h>
+#include <ISkinnedMesh.h>
+
 using namespace irr;
 
 STKAnimatedMesh::STKAnimatedMesh(irr::scene::IAnimatedMesh* mesh, irr::scene::ISceneNode* parent,

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 <IAnimatedMesh.h>
 #include <irrTypes.h>
-#include "graphics/stkmesh.hpp"
-#include "utils/ptr_vector.hpp"
 
 class STKAnimatedMesh : public irr::scene::CAnimatedMeshSceneNode, public STKMeshCommon
 {

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"

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"

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 "graphics/stk_mesh_scene_node.hpp"
-#include "stkmeshscenenode.hpp"
+
-#include "stkmesh.hpp"
-#include "graphics/irr_driver.hpp"
-#include "graphics/glwrap.hpp"
-#include "tracks/track.hpp"
-#include <ISceneManager.h>
-#include <IMaterialRenderer.h>
 #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 <ISceneManager.h>
+#include <IMaterialRenderer.h>
 
 
 // ============================================================================

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
+#ifndef HEADER_STK_MESH_SCENE_NODE
-#define STKMESHSCENENODE_H
+#define HEADER_STK_MESH_SCENE_NODE
 
-#include "stkmesh.hpp"
+#include "graphics/stk_mesh.hpp"
 
 #include "graphics/shaders.hpp"
 #include "utils/ptr_vector.hpp"

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/shadow_matrices.hpp"
-#include "graphics/stkanimatedmesh.hpp"
+#include "graphics/stk_animated_mesh.hpp"
-#include "graphics/stkmesh.hpp"
+#include "graphics/stk_mesh.hpp"
-#include "graphics/stkmeshscenenode.hpp"
+#include "graphics/stk_mesh_scene_node.hpp"
 #include "modes/world.hpp"
 #include "tracks/track.hpp"
 #include "utils/cpp2011.hpp"

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<typename T>
 class CommandBuffer : public Singleton<T>

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/stk_billboard.hpp"
-#include "graphics/stkmeshscenenode.hpp"
+#include "graphics/stk_mesh_scene_node.hpp"
 #include "guiengine/engine.hpp"
 #include "guiengine/scalable_font.hpp"
 #include "glwrap.hpp"

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 <IBillboardSceneNode.h>
 #include <irrTypes.h>
 #include <IMesh.h>
-#include "graphics/stkmeshscenenode.hpp"
-#include "guiengine/scalable_font.hpp"
-#include "utils/cpp2011.hpp"
 
 class STKTextBillboardChar
 {

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"

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 "graphics/texture_manager.hpp"
-#include "texturemanager.hpp"
+
+#include "graphics/central_settings.hpp"
+#include "graphics/irr_driver.hpp"
+
+#include "../../lib/irrlicht/source/Irrlicht/COpenGLTexture.h"
+
 #include <fstream>
 #include <sstream>
-#include "../../lib/irrlicht/source/Irrlicht/COpenGLTexture.h"
-#include "irr_driver.hpp"
 
 
 GLuint getTextureGLuint(irr::video::ITexture *tex)

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 "graphics/vao_manager.hpp"
-#include "irr_driver.hpp"
+
-#include "stkmesh.hpp"
+#include "graphics/central_settings.hpp"
-#include "glwrap.hpp"
+#include "graphics/glwrap.hpp"
-#include "central_settings.hpp"
+#include "graphics/irr_driver.hpp"
+#include "graphics/stk_mesh.hpp"
 
 VAOManager::VAOManager()
 {

src/items/rubber_band.cpp

@@ -20,9 +20,10 @@
 
 #include <IMeshSceneNode.h>
 
+#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 <IMesh.h>
 

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"

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"