ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Header clean up

Browse Source 
Also move getUnicolorTexture to a better location
This commit is contained in:
Benau 2016-11-04 20:30:08 +08:00
parent 01c7576755
commit 7da108c8b1
45 changed files with 90 additions and 149 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sources.cmake
View File

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

6
src/graphics/2dutils.cpp
View File

@ -15,14 +15,16 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "2dutils.hpp"
#include "graphics/2dutils.hpp"
#include "graphics/central_settings.hpp"
#include "graphics/glwrap.hpp"
#include "graphics/irr_driver.hpp"
#include "graphics/shader.hpp"
#include "graphics/shaders.hpp"
#include "graphics/shared_gpu_objects.hpp"
#include "graphics/texture_manager.hpp"
#include "graphics/texture_shader.hpp"
#include "glwrap.hpp"
#include "utils/cpp2011.hpp"
#if defined(USE_GLES2)

1
src/graphics/geometry_passes.cpp
View File

@ -18,7 +18,6 @@
#include "graphics/geometry_passes.hpp"
#include "graphics/callbacks.hpp"
#include "graphics/draw_tools.hpp"
#include "graphics/glwrap.hpp"
#include "graphics/materials.hpp"
#include "graphics/post_processing.hpp"
#include "graphics/rtts.hpp"

2
src/graphics/glwrap.cpp
View File

@ -17,10 +17,10 @@
#include "graphics/glwrap.hpp"
#include "config/hardware_stats.hpp"
#include "config/user_config.hpp"
#include "graphics/central_settings.hpp"
#include "graphics/irr_driver.hpp"
#include "graphics/shaders.hpp"
#include "graphics/stk_mesh.hpp"
#include "utils/profiler.hpp"

6
src/graphics/glwrap.hpp
View File

@ -20,13 +20,12 @@
#include "graphics/gl_headers.hpp"
#include "graphics/irr_driver.hpp"
#include "graphics/texture_manager.hpp"
#include "graphics/vao_manager.hpp"
#include "utils/log.hpp"
#include "utils/leak_check.hpp"
#include "utils/no_copy.hpp"
#include "utils/vec3.hpp"
#include <irrlicht.h>
#include <vector>
namespace HardwareStats
@ -35,7 +34,6 @@ namespace HardwareStats
}
void initGL();
video::ITexture* getUnicolorTexture(const video::SColor &c);
class GPUTimer;

2
src/graphics/gpu_particles.cpp
View File

@ -18,11 +18,11 @@
#include "graphics/gpu_particles.hpp"
#include "config/user_config.hpp"
#include "graphics/glwrap.hpp"
#include "graphics/irr_driver.hpp"
#include "graphics/particle_emitter.hpp"
#include "graphics/shaders.hpp"
#include "graphics/shared_gpu_objects.hpp"
#include "graphics/texture_manager.hpp"
#include "graphics/texture_shader.hpp"
#include "guiengine/engine.hpp"
#include "io/file_manager.hpp"

9
src/graphics/irr_driver.cpp
View File

@ -22,30 +22,24 @@
#include "graphics/callbacks.hpp"
#include "graphics/camera.hpp"
#include "graphics/central_settings.hpp"
#include "graphics/glwrap.hpp"
#include "graphics/2dutils.hpp"
#include "graphics/fixed_pipeline_renderer.hpp"
#include "graphics/glwrap.hpp"
#include "graphics/graphics_restrictions.hpp"
#include "graphics/light.hpp"
#include "graphics/material_manager.hpp"
#include "graphics/particle_kind_manager.hpp"
#include "graphics/per_camera_node.hpp"
#include "graphics/referee.hpp"
#include "graphics/render_info.hpp"
#include "graphics/render_target.hpp"
#include "graphics/shader_based_renderer.hpp"
#include "graphics/shaders.hpp"
#include "graphics/shadow_matrices.hpp"
#include "graphics/spherical_harmonics.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/texture_manager.hpp"
#include "graphics/water.hpp"
#include "graphics/wind.hpp"
#include "guiengine/engine.hpp"
#include "guiengine/message_queue.hpp"
#include "guiengine/modaldialog.hpp"
@ -72,7 +66,6 @@
#include "utils/vs.hpp"
#include <irrlicht.h>
#include "../lib/irrlicht/source/Irrlicht/CSkinnedMesh.h"
/* Build-time check that the Irrlicht we're building against works for us.
* Should help prevent distros building against an incompatible library.

16
src/graphics/light.cpp
View File

@ -18,21 +18,9 @@
#include "graphics/light.hpp"
#include "graphics/callbacks.hpp"
#include "graphics/glwrap.hpp"
#include "graphics/irr_driver.hpp"
#include "graphics/material.hpp"
#include "graphics/material_manager.hpp"
#include "graphics/rtts.hpp"
#include "graphics/screen_quad.hpp"
#include "graphics/shaders.hpp"
using namespace video;
using namespace scene;
using namespace core;
aabbox3df LightNode::box;
#include <ISceneManager.h>
core::aabbox3df LightNode::box;
LightNode::LightNode(scene::ISceneManager* mgr, scene::ISceneNode* parent, float e, float d, float r, float g, float b):
ISceneNode(parent == NULL ? mgr->getRootSceneNode() : parent, mgr, -1)

3
src/graphics/lighting_passes.cpp
View File

@ -17,7 +17,8 @@
#include "graphics/lighting_passes.hpp"
#include "config/user_config.hpp"
#include "graphics/central_settings.hpp"
#include "graphics/central_settings.hpp"
#include "graphics/glwrap.hpp"
#include "graphics/irr_driver.hpp"
#include "graphics/light.hpp"
#include "graphics/post_processing.hpp"

5
src/graphics/lighting_passes.hpp
View File

@ -18,12 +18,15 @@
#ifndef HEADER_LIGHTING_PASSES_HPP
#define HEADER_LIGHTING_PASSES_HPP
#include "graphics/glwrap.hpp"
#include "graphics/gl_headers.hpp"
#include <irrlicht.h>
class FrameBuffer;
class PostProcessing;
class ShadowMatrices;
using namespace irr;
class LightingPasses
{
private:

2
src/graphics/material.cpp
View File

@ -30,10 +30,10 @@
#include "guiengine/engine.hpp"
#include "graphics/callbacks.hpp"
#include "graphics/central_settings.hpp"
#include "graphics/glwrap.hpp"
#include "graphics/irr_driver.hpp"
#include "graphics/particle_kind_manager.hpp"
#include "graphics/shaders.hpp"
#include "graphics/texture_manager.hpp"
#include "io/file_manager.hpp"
#include "io/xml_node.hpp"
#include "utils/string_utils.hpp"

5
src/graphics/post_processing.cpp
View File

@ -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 "post_processing.hpp"
#include "graphics/post_processing.hpp"
#include "config/user_config.hpp"
#include "graphics/callbacks.hpp"
@ -23,14 +23,13 @@
#include "graphics/central_settings.hpp"
#include "graphics/graphics_restrictions.hpp"
#include "graphics/glwrap.hpp"
#include "graphics/gl_headers.hpp"
#include "graphics/irr_driver.hpp"
#include "graphics/mlaa_areamap.hpp"
#include "graphics/render_target.hpp"
#include "graphics/rtts.hpp"
#include "graphics/shaders.hpp"
#include "graphics/shared_gpu_objects.hpp"
#include "graphics/stk_mesh_scene_node.hpp"
#include "graphics/texture_manager.hpp"
#include "graphics/weather.hpp"
#include "io/file_manager.hpp"
#include "karts/abstract_kart.hpp"

16
src/graphics/post_processing.hpp
View File

@ -18,20 +18,22 @@
#ifndef HEADER_POST_PROCESSING_HPP
#define HEADER_POST_PROCESSING_HPP
#include "IShaderConstantSetCallBack.h"
#include "S3DVertex.h"
#include "SMaterial.h"
#include "graphics/camera.hpp"
#include "graphics/glwrap.hpp"
class RTT;
#include "graphics/gl_headers.hpp"
#include <IReferenceCounted.h>
#include <S3DVertex.h>
#include <SMaterial.h>
#include <vector>
class FrameBuffer;
class RTT;
namespace irr
{
namespace video { class IVideoDriver; class ITexture; }
namespace scene { class ICameraSceneNode; }
}
using namespace irr;
/** \brief Handles post processing, eg motion blur

3
src/graphics/render_target.cpp
View File

@ -18,8 +18,7 @@
#include "graphics/render_target.hpp"
#include "graphics/2dutils.hpp"
#include "graphics/central_settings.hpp"
#include "graphics/graphics_restrictions.hpp"
#include "graphics/glwrap.hpp"
#include "graphics/rtts.hpp"
#include "graphics/shader_based_renderer.hpp"

27
src/graphics/render_target.hpp
View File

@ -18,12 +18,12 @@
#ifndef HEADER_RENDER_TARGET_HPP
#define HEADER_RENDER_TARGET_HPP
#include "graphics/glwrap.hpp"
#include <irrlicht.h>
#include <string>
class ShaderBasedRenderer;
class FrameBuffer;
class RTT;
class ShaderBasedRenderer;
class RenderTarget
{
@ -33,8 +33,8 @@ public:
virtual irr::core::dimension2du getTextureSize() const = 0;
virtual void renderToTexture(irr::scene::ICameraSceneNode* camera, float dt) = 0;
virtual void draw2DImage(const irr::core::rect<s32>& dest_rect,
const irr::core::rect<s32>* clip_rect,
virtual void draw2DImage(const irr::core::rect<irr::s32>& dest_rect,
const irr::core::rect<irr::s32>* clip_rect,
const irr::video::SColor &colors,
bool use_alpha_channel_of_texture) const = 0;
};
@ -45,24 +45,23 @@ private:
/** A pointer to texture on which a scene is rendered. Only used
* in between beginRenderToTexture() and endRenderToTexture calls. */
irr::video::ITexture *m_render_target_texture;
/** Main node of the RTT scene */
irr::scene::ISceneNode *m_rtt_main_node;
public:
GL1RenderTarget(const irr::core::dimension2du &dimension,
const std::string &name);
~GL1RenderTarget();
irr::core::dimension2du getTextureSize() const;
void renderToTexture(irr::scene::ICameraSceneNode* camera, float dt);
void draw2DImage(const irr::core::rect<s32>& dest_rect,
const irr::core::rect<s32>* clip_rect,
void draw2DImage(const irr::core::rect<irr::s32>& dest_rect,
const irr::core::rect<irr::s32>* clip_rect,
const irr::video::SColor &colors,
bool use_alpha_channel_of_texture) const;
};
class GL3RenderTarget: public RenderTarget
@ -78,8 +77,8 @@ public:
const std::string &name,
ShaderBasedRenderer *renderer);
~GL3RenderTarget();
void draw2DImage(const irr::core::rect<s32>& dest_rect,
const irr::core::rect<s32>* clip_rect,
void draw2DImage(const irr::core::rect<irr::s32>& dest_rect,
const irr::core::rect<irr::s32>* clip_rect,
const irr::video::SColor &colors,
bool use_alpha_channel_of_texture) const;
irr::core::dimension2du getTextureSize() const;

6
src/graphics/rtts.cpp
View File

@ -16,13 +16,11 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "graphics/rtts.hpp"
#include "central_settings.hpp"
#include "config/user_config.hpp"
#include "graphics/central_settings.hpp"
#include "graphics/glwrap.hpp"
#include "graphics/irr_driver.hpp"
#include "graphics/post_processing.hpp"
#include "utils/log.hpp"
#include <ISceneManager.h>
static GLuint generateRTT3D(GLenum target, size_t w, size_t h, size_t d, GLint internalFormat, GLint format, GLint type, unsigned mipmaplevel = 1)
{

1
src/graphics/shader_based_renderer.cpp
View File

@ -18,6 +18,7 @@
#include "graphics/shader_based_renderer.hpp"
#include "config/user_config.hpp"
#include "graphics/camera.hpp"
#include "graphics/central_settings.hpp"
#include "graphics/draw_policies.hpp"
#include "graphics/geometry_passes.hpp"

1
src/graphics/shadow_matrices.cpp
View File

@ -19,6 +19,7 @@
#include "config/user_config.hpp"
#include "graphics/central_settings.hpp"
#include "graphics/glwrap.hpp"
#include "graphics/irr_driver.hpp"
#include "graphics/post_processing.hpp"
#include "graphics/rtts.hpp"

9
src/graphics/shadow_matrices.hpp
View File

@ -19,13 +19,12 @@
#ifndef HEADER_SHADOW_MATRICES_HPP
#define HEADER_SHADOW_MATRICES_HPP
#include "graphics/glwrap.hpp"
#include "matrix4.h"
#include "vector3d.h"
#include "graphics/gl_headers.hpp"
#include <matrix4.h>
#include <tuple>
#include <vector>
#include <vector3d.h>
namespace irr
{
@ -34,6 +33,7 @@ namespace irr
using namespace irr;
class FrameBuffer;
class PostProcessing;
class ShadowMatrices
@ -104,7 +104,6 @@ public:
return m_shadow_scales;
}
// ------------------------------------------------------------------------
// ------------------------------------------------------------------------
}; // class ShadowMatrices

2
src/graphics/show_curve.cpp
View File

@ -18,8 +18,8 @@
#include "graphics/show_curve.hpp"
#include "graphics/glwrap.hpp"
#include "graphics/irr_driver.hpp"
#include "graphics/texture_manager.hpp"
#include "utils/vec3.hpp"
#include <IMeshSceneNode.h>

2
src/graphics/slip_stream.cpp
View File

@ -19,11 +19,11 @@
#include "graphics/slip_stream.hpp"
#include "graphics/central_settings.hpp"
#include "config/user_config.hpp"
#include "graphics/glwrap.hpp"
#include "graphics/irr_driver.hpp"
#include "graphics/material.hpp"
#include "graphics/material_manager.hpp"
#include "graphics/stk_mesh_scene_node.hpp"
#include "graphics/texture_manager.hpp"
#include "io/file_manager.hpp"
#include "karts/abstract_kart.hpp"
#include "karts/controller/controller.hpp"

14
src/graphics/stk_animated_mesh.cpp
View File

@ -15,19 +15,13 @@
// 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/glwrap.hpp"
#include "graphics/stk_animated_mesh.hpp"
#include "config/user_config.hpp"
#include "central_settings.hpp"
#include "graphics/camera.hpp"
#include "graphics/irr_driver.hpp"
#include "graphics/central_settings.hpp"
#include "graphics/material_manager.hpp"
#include "graphics/render_info.hpp"
#include "graphics/stk_animated_mesh.hpp"
#include "modes/world.hpp"
#include "tracks/track.hpp"
#include "utils/profiler.hpp"
#include "utils/cpp2011.hpp"
#include "graphics/stk_mesh.hpp"
#include "graphics/vao_manager.hpp"
#include <IMaterialRenderer.h>
#include <ISceneManager.h>

2
src/graphics/stk_billboard.cpp
View File

@ -17,12 +17,12 @@
#include "graphics/stk_billboard.hpp"
#include "graphics/glwrap.hpp"
#include "graphics/irr_driver.hpp"
#include "graphics/material.hpp"
#include "graphics/material_manager.hpp"
#include "graphics/shaders.hpp"
#include "graphics/shared_gpu_objects.hpp"
#include "graphics/texture_manager.hpp"
#include <ISceneManager.h>

10
src/graphics/stk_mesh.cpp
View File

@ -17,18 +17,12 @@
#include "graphics/stk_mesh.hpp"
#include "config/user_config.hpp"
#include "central_settings.hpp"
#include "graphics/callbacks.hpp"
#include "graphics/camera.hpp"
#include "graphics/glwrap.hpp"
#include "graphics/central_settings.hpp"
#include "graphics/irr_driver.hpp"
#include "graphics/material_manager.hpp"
#include "graphics/render_info.hpp"
#include "graphics/shaders.hpp"
#include "modes/world.hpp"
#include "tracks/track.hpp"
#include "utils/helpers.hpp"
#include "graphics/texture_manager.hpp"
#include <ISceneManager.h>
#include <IMaterialRenderer.h>

9
src/graphics/stk_mesh_scene_node.cpp
View File

@ -17,21 +17,16 @@
#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/render_info.hpp"
#include "graphics/rtts.hpp"
#include "graphics/stk_mesh.hpp"
#include "graphics/texture_manager.hpp"
#include "graphics/vao_manager.hpp"
#include "tracks/track.hpp"
#include "modes/world.hpp"
#include "utils/cpp2011.hpp"
#include "utils/helpers.hpp"
#include "utils/tuple.hpp"
#include <IMaterialRenderer.h>
#include <ISceneManager.h>

4
src/graphics/stk_text_billboard.cpp
View File

@ -16,13 +16,11 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "graphics/stk_text_billboard.hpp"
#include "graphics/glwrap.hpp"
#include "graphics/shaders.hpp"
#include "graphics/irr_driver.hpp"
#include "graphics/stk_billboard.hpp"
#include "graphics/stk_mesh_scene_node.hpp"
#include "guiengine/engine.hpp"
#include "glwrap.hpp"
#include "graphics/texture_manager.hpp"
#include <SMesh.h>
#include <SMeshBuffer.h>
#include <ISceneManager.h>

14
src/graphics/sun.cpp
View File

@ -18,21 +18,7 @@
#include "graphics/sun.hpp"
#include "graphics/callbacks.hpp"
#include "graphics/glwrap.hpp"
#include "graphics/irr_driver.hpp"
#include "graphics/material_manager.hpp"
#include "graphics/material.hpp"
#include "graphics/rtts.hpp"
#include "graphics/screen_quad.hpp"
#include "graphics/shaders.hpp"
#include "io/file_manager.hpp"
#include "modes/world.hpp"
#include "tracks/track.hpp"
using namespace video;
using namespace scene;
using namespace core;
SunNode::SunNode(scene::ISceneManager* mgr, scene::ISceneNode* parent,
float r, float g, float b)

9
src/graphics/texture_manager.hpp
View File

@ -16,11 +16,13 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#ifndef MEMORYMANAGER_HPP
#define MEMORYMANAGER_HPP
#ifndef HEADER_TEXTURE_MANAGER_HPP
#define HEADER_TEXTURE_MANAGER_HPP
#include "graphics/gl_headers.hpp"
#include "gl_headers.hpp"
#include <ITexture.h>
#include <SColor.h>
#include <string>
GLuint getTextureGLuint(irr::video::ITexture *tex);
@ -30,5 +32,6 @@ void cleanUnicolorTextures();
void compressTexture(irr::video::ITexture *tex, bool srgb, bool premul_alpha = false);
bool loadCompressedTexture(const std::string& compressed_tex);
void saveCompressedTexture(const std::string& compressed_tex);
irr::video::ITexture* getUnicolorTexture(const irr::video::SColor &c);
#endif

4
src/graphics/water.cpp
View File

@ -19,11 +19,7 @@
#include "graphics/water.hpp"
#include "graphics/callbacks.hpp"
#include "graphics/glwrap.hpp"
#include "graphics/irr_driver.hpp"
#include "graphics/material_manager.hpp"
#include "graphics/material.hpp"
#include "graphics/rtts.hpp"
#include "graphics/shaders.hpp"
using namespace video;

2
src/guiengine/engine.cpp
View File

@ -665,6 +665,7 @@ namespace GUIEngine
#include "input/input_manager.hpp"
#include "io/file_manager.hpp"
#include "graphics/2dutils.hpp"
#include "graphics/irr_driver.hpp"
#include "guiengine/event_handler.hpp"
#include "guiengine/modaldialog.hpp"
#include "guiengine/message_queue.hpp"
@ -681,7 +682,6 @@ namespace GUIEngine
#include <iostream>
#include <assert.h>
#include <irrlicht.h>
#include "graphics/glwrap.hpp"
using namespace irr::gui;
using namespace irr::video;

1
src/guiengine/skin.cpp
View File

@ -33,7 +33,6 @@
#include "io/file_manager.hpp"
#include "states_screens/state_manager.hpp"
#include "utils/log.hpp"
#include "graphics/glwrap.hpp"
using namespace GUIEngine;
using namespace irr;

14
src/guiengine/widgets/model_view_widget.cpp
View File

@ -21,7 +21,6 @@
#include "guiengine/engine.hpp"
#include "guiengine/widgets/model_view_widget.hpp"
#include "graphics/irr_driver.hpp"
#include "graphics/post_processing.hpp"
#include "graphics/render_target.hpp"
#include <IAnimatedMesh.h>
@ -108,7 +107,7 @@ void ModelViewWidget::addModel(irr::scene::IMesh* mesh, const Vec3& location,
m_model_scale.push_back(scale);
m_model_frames.push_back(frame);
m_model_render_info_affected.push_back(all_parts_colorized);
if (!CVS->isGLSL())
m_render_target = NULL;
}
@ -256,8 +255,8 @@ void ModelViewWidget::setupRTTScene()
irr_driver->setAmbientLight(video::SColor(255, 35, 35, 35));
const core::vector3df &spot_pos = core::vector3df(0, 30, 40);
if(!CVS->isGLSL())
if (!CVS->isGLSL())
{
scene::ILightSceneNode* light = irr_driver->getSceneManager()
->addLightSceneNode(NULL, spot_pos, video::SColorf(1.0f,1.0f,1.0f),
@ -266,7 +265,9 @@ void ModelViewWidget::setupRTTScene()
light->setRotation((core::vector3df(0, 10, 0) - spot_pos).getHorizontalAngle());
light->updateAbsolutePosition();
m_light = light;
} else {
}
else
{
m_light = irr_driver->addLight(spot_pos, 0.3f /* energy */, 10 /* distance */, 1.0f /* r */, 1.0f /* g */, 1.0f /* g*/, true, NULL);
}
@ -327,7 +328,7 @@ void ModelViewWidget::elementRemoved()
void ModelViewWidget::clearRttProvider()
{
m_render_target = NULL;;
m_render_target = NULL;
}
void ModelViewWidget::drawRTTScene(const irr::core::rect<s32>& dest_rect) const
@ -335,4 +336,3 @@ void ModelViewWidget::drawRTTScene(const irr::core::rect<s32>& dest_rect) const
if(m_render_target != NULL)
m_render_target->draw2DImage(dest_rect, NULL, video::SColor(255, 255, 255, 255), true);
}

2
src/items/rubber_band.cpp
View File

@ -20,10 +20,10 @@
#include <IMeshSceneNode.h>
#include "graphics/glwrap.hpp"
#include "graphics/irr_driver.hpp"
#include "graphics/material_manager.hpp"
#include "graphics/stk_mesh_scene_node.hpp"
#include "graphics/texture_manager.hpp"
#include "items/plunger.hpp"
#include "items/projectile_manager.hpp"
#include "karts/abstract_kart.hpp"

1
src/karts/controller/local_player_controller.cpp
View File

@ -25,7 +25,6 @@
#include "config/user_config.hpp"
#include "graphics/camera.hpp"
#include "graphics/irr_driver.hpp"
#include "graphics/post_processing.hpp"
#include "input/input_manager.hpp"
#include "items/attachment.hpp"
#include "items/item.hpp"

2
src/karts/controller/player_controller.cpp
View File

@ -20,8 +20,6 @@
#include "karts/controller/player_controller.hpp"
#include "config/user_config.hpp"
#include "graphics/irr_driver.hpp"
#include "graphics/post_processing.hpp"
#include "input/input_manager.hpp"
#include "items/attachment.hpp"
#include "items/item.hpp"

2
src/karts/controller/skidding_ai.cpp
View File

@ -22,8 +22,8 @@
#include "karts/controller/skidding_ai.hpp"
#ifdef AI_DEBUG
# include "graphics/glwrap.hpp"
# include "graphics/irr_driver.hpp"
# include "graphics/texture_manager.hpp"
#endif
#include "graphics/show_curve.hpp"
#include "graphics/slip_stream.hpp"

2
src/karts/controller/test_ai.cpp
View File

@ -22,8 +22,8 @@
#include "karts/controller/test_ai.hpp"
#ifdef AI_DEBUG
# include "graphics/glwrap.hpp"
# include "graphics/irr_driver.hpp"
# include "graphics/texture_manager.hpp"
#endif
#include "graphics/show_curve.hpp"
#include "graphics/slip_stream.hpp"

2
src/karts/kart_properties.cpp
View File

@ -21,9 +21,9 @@
#include "addons/addon.hpp"
#include "config/stk_config.hpp"
#include "config/player_manager.hpp"
#include "graphics/glwrap.hpp"
#include "graphics/irr_driver.hpp"
#include "graphics/material_manager.hpp"
#include "graphics/texture_manager.hpp"
#include "io/file_manager.hpp"
#include "karts/cached_characteristic.hpp"
#include "karts/combined_characteristic.hpp"

2
src/states_screens/race_gui.cpp
View File

@ -27,7 +27,7 @@ using namespace irr;
#include "config/user_config.hpp"
#include "graphics/camera.hpp"
#include "graphics/2dutils.hpp"
#include "graphics/glwrap.hpp"
#include "graphics/irr_driver.hpp"
#include "graphics/material_manager.hpp"
#include "guiengine/engine.hpp"
#include "guiengine/modaldialog.hpp"

1
src/states_screens/race_gui_base.cpp
View File

@ -28,7 +28,6 @@
#include "graphics/irr_driver.hpp"
#include "graphics/material.hpp"
#include "graphics/material_manager.hpp"
#include "graphics/post_processing.hpp"
#include "graphics/referee.hpp"
#include "guiengine/scalable_font.hpp"
#include "io/file_manager.hpp"

2
src/states_screens/race_gui_overworld.cpp
View File

@ -25,7 +25,7 @@
#include "config/user_config.hpp"
#include "graphics/camera.hpp"
#include "graphics/2dutils.hpp"
#include "graphics/glwrap.hpp"
#include "graphics/irr_driver.hpp"
#include "graphics/material_manager.hpp"
#include "guiengine/engine.hpp"
#include "guiengine/modaldialog.hpp"

2
src/tracks/check_line.cpp
View File

@ -20,7 +20,7 @@
#include "config/user_config.hpp"
#include "graphics/irr_driver.hpp"
#include "graphics/glwrap.hpp"
#include "graphics/texture_manager.hpp"
#include "io/xml_node.hpp"
#include "karts/abstract_kart.hpp"
#include "modes/linear_world.hpp"

8
src/tracks/graph.cpp
View File

@ -18,16 +18,12 @@
#include "tracks/graph.hpp"
#include <ICameraSceneNode.h>
#include <IMesh.h>
#include <IMeshSceneNode.h>
#include <ISceneManager.h>
#include "config/user_config.hpp"
#include "graphics/irr_driver.hpp"
#include "graphics/glwrap.hpp"
#include "graphics/shaders.hpp"
#include "graphics/render_target.hpp"
#include "graphics/texture_manager.hpp"
#include "graphics/vao_manager.hpp"
#include "modes/profile_world.hpp"
#include "tracks/arena_node_3d.hpp"
#include "tracks/drive_node_2d.hpp"

3
src/tracks/track.cpp
View File

@ -29,7 +29,6 @@
#include "graphics/camera_end.hpp"
#include "graphics/CBatchingMesh.hpp"
#include "graphics/central_settings.hpp"
#include "graphics/glwrap.hpp"
#include "graphics/irr_driver.hpp"
#include "graphics/lod_node.hpp"
#include "graphics/material.hpp"
@ -40,6 +39,8 @@
#include "graphics/particle_kind.hpp"
#include "graphics/particle_kind_manager.hpp"
#include "graphics/render_target.hpp"
#include "graphics/texture_manager.hpp"
#include "graphics/vao_manager.hpp"
#include "io/file_manager.hpp"
#include "io/xml_node.hpp"
#include "items/item.hpp"

1
src/utils/profiler.cpp
View File

@ -20,6 +20,7 @@
#include "graphics/2dutils.hpp"
#include "guiengine/event_handler.hpp"
#include "guiengine/engine.hpp"
#include "graphics/irr_driver.hpp"
#include "guiengine/scalable_font.hpp"
#include "utils/vs.hpp"