forked from 0ad/0ad
Removes unused and outdated includes, replaces some includes by forward declarations.
This was SVN commit r25444.
This commit is contained in:
parent
41a29a590a
commit
5ff4fa19c0
@ -23,6 +23,7 @@
|
||||
#include "graphics/CinemaManager.h"
|
||||
|
||||
#include "graphics/Camera.h"
|
||||
#include "graphics/Color.h"
|
||||
#include "graphics/GameView.h"
|
||||
#include "lib/ogl.h"
|
||||
#include "maths/MathUtil.h"
|
||||
@ -41,6 +42,7 @@
|
||||
#include "simulation2/components/ICmpRangeManager.h"
|
||||
#include "simulation2/components/ICmpSelectable.h"
|
||||
#include "simulation2/components/ICmpTerritoryManager.h"
|
||||
#include "simulation2/helpers/CinemaPath.h"
|
||||
#include "simulation2/MessageTypes.h"
|
||||
#include "simulation2/system/ComponentManager.h"
|
||||
#include "simulation2/Simulation2.h"
|
||||
|
@ -18,11 +18,9 @@
|
||||
#ifndef INCLUDED_CINEMAMANAGER
|
||||
#define INCLUDED_CINEMAMANAGER
|
||||
|
||||
#include "lib/input.h" // InReaction - can't forward-declare enum
|
||||
#include "graphics/Color.h"
|
||||
#include "ps/CStr.h"
|
||||
#include "simulation2/helpers/CinemaPath.h"
|
||||
class RNSpline;
|
||||
|
||||
struct CColor;
|
||||
|
||||
/**
|
||||
* Class for in game playing of cinematics. Should only be instantiated in CGameView.
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 2013 Wildfire Games.
|
||||
/* Copyright (C) 2021 Wildfire Games.
|
||||
* This file is part of 0 A.D.
|
||||
*
|
||||
* 0 A.D. is free software: you can redistribute it and/or modify
|
||||
@ -20,7 +20,6 @@
|
||||
|
||||
#include "graphics/Material.h"
|
||||
#include "graphics/ModelAbstract.h"
|
||||
#include "graphics/Texture.h"
|
||||
|
||||
class CTerrain;
|
||||
|
||||
|
@ -17,10 +17,8 @@
|
||||
|
||||
#include "lib/ogl.h"
|
||||
|
||||
#include "maths/Matrix3D.h"
|
||||
|
||||
#include "graphics/ShaderManager.h"
|
||||
#include "graphics/ShaderTechniquePtr.h"
|
||||
#include "maths/Matrix3D.h"
|
||||
|
||||
class CLosQuerier;
|
||||
class CSimulation2;
|
||||
|
@ -18,13 +18,11 @@
|
||||
#ifndef INCLUDED_MAPGENERATOR
|
||||
#define INCLUDED_MAPGENERATOR
|
||||
|
||||
#include "lib/posix/posix_pthread.h"
|
||||
#include "ps/FileIo.h"
|
||||
#include "ps/TemplateLoader.h"
|
||||
#include "scriptinterface/StructuredClone.h"
|
||||
|
||||
#include <boost/random/linear_congruential.hpp>
|
||||
|
||||
#include <mutex>
|
||||
#include <set>
|
||||
#include <string>
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 2020 Wildfire Games.
|
||||
/* Copyright (C) 2021 Wildfire Games.
|
||||
* This file is part of 0 A.D.
|
||||
*
|
||||
* 0 A.D. is free software: you can redistribute it and/or modify
|
||||
@ -22,13 +22,12 @@
|
||||
#ifndef INCLUDED_MODEL
|
||||
#define INCLUDED_MODEL
|
||||
|
||||
#include <vector>
|
||||
|
||||
#include "graphics/Texture.h"
|
||||
#include "graphics/Material.h"
|
||||
#include "graphics/MeshManager.h"
|
||||
#include "graphics/ModelAbstract.h"
|
||||
|
||||
#include <vector>
|
||||
|
||||
struct SPropPoint;
|
||||
class CObjectEntry;
|
||||
class CSkeletonAnim;
|
||||
|
@ -22,13 +22,12 @@
|
||||
#ifndef INCLUDED_MODELDEF
|
||||
#define INCLUDED_MODELDEF
|
||||
|
||||
#include "ps/CStr.h"
|
||||
#include "maths/BoundingBoxAligned.h"
|
||||
#include "maths/Matrix3D.h"
|
||||
#include "maths/Vector2D.h"
|
||||
#include "maths/Vector3D.h"
|
||||
#include "maths/Quaternion.h"
|
||||
#include "maths/Vector3D.h"
|
||||
#include "lib/file/vfs/vfs_path.h"
|
||||
#include "ps/CStr.h"
|
||||
#include "renderer/VertexArray.h"
|
||||
|
||||
#include <cstring>
|
||||
|
@ -22,7 +22,6 @@
|
||||
#include "graphics/Texture.h"
|
||||
#include "maths/Vector2D.h"
|
||||
#include "maths/Vector3D.h"
|
||||
#include "maths/FixedVector3D.h"
|
||||
#include "ps/CStrIntern.h"
|
||||
|
||||
#include <vector>
|
||||
|
@ -20,7 +20,6 @@
|
||||
|
||||
#include "graphics/ModelAbstract.h"
|
||||
#include "graphics/ParticleEmitterType.h"
|
||||
#include "graphics/Texture.h"
|
||||
#include "maths/Quaternion.h"
|
||||
#include "renderer/VertexArray.h"
|
||||
|
||||
|
@ -29,13 +29,16 @@
|
||||
#include "ps/CStrIntern.h"
|
||||
#include "ps/Filesystem.h"
|
||||
#include "ps/Profile.h"
|
||||
#if USE_SHADER_XML_VALIDATION
|
||||
# include "ps/XML/RelaxNG.h"
|
||||
#endif
|
||||
#include "ps/XML/Xeromyces.h"
|
||||
#include "ps/XML/XMLWriter.h"
|
||||
#include "renderer/Renderer.h"
|
||||
|
||||
#define USE_SHADER_XML_VALIDATION 1
|
||||
|
||||
#if USE_SHADER_XML_VALIDATION
|
||||
# include "ps/XML/RelaxNG.h"
|
||||
#endif
|
||||
|
||||
TIMER_ADD_CLIENT(tc_ShaderValidation);
|
||||
|
||||
CShaderManager::CShaderManager()
|
||||
|
@ -18,19 +18,13 @@
|
||||
#ifndef INCLUDED_SHADERMANAGER
|
||||
#define INCLUDED_SHADERMANAGER
|
||||
|
||||
#define USE_SHADER_XML_VALIDATION 1
|
||||
|
||||
#include "graphics/ShaderDefines.h"
|
||||
#include "graphics/ShaderProgram.h"
|
||||
#include "graphics/ShaderTechnique.h"
|
||||
|
||||
#if USE_SHADER_XML_VALIDATION
|
||||
# include "ps/XML/RelaxNG.h"
|
||||
#endif
|
||||
|
||||
#include <unordered_map>
|
||||
#include <memory>
|
||||
#include <set>
|
||||
#include <unordered_map>
|
||||
|
||||
/**
|
||||
* Shader manager: loads and caches shader programs.
|
||||
|
@ -33,6 +33,7 @@
|
||||
#include "lib/sysdep/sysdep.h"
|
||||
#include "lib/timer.h"
|
||||
#include "lib/utf8.h"
|
||||
#include "maths/Size2D.h"
|
||||
#include "ps/CLogger.h"
|
||||
#include "ps/Filesystem.h"
|
||||
#include "ps/GameSetup/Config.h"
|
||||
|
@ -29,7 +29,6 @@
|
||||
#include "gui/SGUIStyle.h"
|
||||
#include "lib/input.h"
|
||||
#include "maths/Rect.h"
|
||||
#include "maths/Size2D.h"
|
||||
#include "maths/Vector2D.h"
|
||||
#include "ps/XML/Xeromyces.h"
|
||||
#include "scriptinterface/ScriptForward.h"
|
||||
|
@ -22,6 +22,7 @@
|
||||
#include "graphics/GameView.h"
|
||||
#include "graphics/LOSTexture.h"
|
||||
#include "graphics/MiniPatch.h"
|
||||
#include "graphics/ShaderManager.h"
|
||||
#include "graphics/Terrain.h"
|
||||
#include "graphics/TerrainTextureEntry.h"
|
||||
#include "graphics/TerrainTextureManager.h"
|
||||
|
@ -22,6 +22,7 @@
|
||||
#include "graphics/FontMetrics.h"
|
||||
#include "graphics/ShaderManager.h"
|
||||
#include "graphics/TextRenderer.h"
|
||||
#include "lib/os_path.h"
|
||||
#include "lib/timer.h"
|
||||
#include "lib/utf8.h"
|
||||
#include "ps/CConsole.h"
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 2020 Wildfire Games.
|
||||
/* Copyright (C) 2021 Wildfire Games.
|
||||
* This file is part of 0 A.D.
|
||||
*
|
||||
* 0 A.D. is free software: you can redistribute it and/or modify
|
||||
@ -18,20 +18,20 @@
|
||||
#ifndef INCLUDED_GAME
|
||||
#define INCLUDED_GAME
|
||||
|
||||
#include <vector>
|
||||
|
||||
#include "graphics/Color.h"
|
||||
#include "ps/CStr.h"
|
||||
#include "ps/Errors.h"
|
||||
#include "ps/Filesystem.h"
|
||||
#include "lib/os_path.h"
|
||||
#include "scriptinterface/ScriptTypes.h"
|
||||
#include "simulation2/helpers/Player.h"
|
||||
|
||||
class CWorld;
|
||||
class CSimulation2;
|
||||
#include <vector>
|
||||
|
||||
class CGameView;
|
||||
class CSimulation2;
|
||||
class CTurnManager;
|
||||
class CWorld;
|
||||
class IReplayLogger;
|
||||
struct CColor;
|
||||
|
||||
/**
|
||||
* The container that holds the rules, resources and attributes of the game.
|
||||
|
@ -23,6 +23,7 @@
|
||||
#include "network/NetClient.h"
|
||||
#include "network/NetServer.h"
|
||||
#include "ps/CLogger.h"
|
||||
#include "ps/Filesystem.h"
|
||||
#include "ps/Game.h"
|
||||
#include "ps/GameSetup/GameSetup.h"
|
||||
#include "ps/Replay.h"
|
||||
|
@ -19,7 +19,6 @@
|
||||
#define INCLUDED_DECALRDATA
|
||||
|
||||
#include "graphics/RenderableObject.h"
|
||||
#include "graphics/ShaderProgramPtr.h"
|
||||
#include "maths/Vector2D.h"
|
||||
#include "maths/Vector3D.h"
|
||||
#include "renderer/VertexBufferManager.h"
|
||||
|
@ -22,6 +22,7 @@
|
||||
#include "graphics/Camera.h"
|
||||
#include "graphics/LOSTexture.h"
|
||||
#include "graphics/Overlay.h"
|
||||
#include "graphics/ShaderManager.h"
|
||||
#include "graphics/Terrain.h"
|
||||
#include "graphics/TextureManager.h"
|
||||
#include "lib/hash.h"
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 2013 Wildfire Games.
|
||||
/* Copyright (C) 2021 Wildfire Games.
|
||||
* This file is part of 0 A.D.
|
||||
*
|
||||
* 0 A.D. is free software: you can redistribute it and/or modify
|
||||
@ -18,7 +18,7 @@
|
||||
#ifndef INCLUDED_OVERLAYRENDERER
|
||||
#define INCLUDED_OVERLAYRENDERER
|
||||
|
||||
#include "graphics/ShaderManager.h"
|
||||
#include "graphics/ShaderProgramPtr.h"
|
||||
|
||||
struct SOverlayLine;
|
||||
struct SOverlayTexturedLine;
|
||||
|
@ -20,7 +20,6 @@
|
||||
|
||||
#include "graphics/Patch.h"
|
||||
#include "graphics/RenderableObject.h"
|
||||
#include "graphics/SColor.h"
|
||||
#include "graphics/ShaderProgramPtr.h"
|
||||
#include "maths/Vector2D.h"
|
||||
#include "maths/Vector3D.h"
|
||||
|
@ -19,6 +19,7 @@
|
||||
|
||||
#include "TexturedLineRData.h"
|
||||
|
||||
#include "graphics/ShaderProgram.h"
|
||||
#include "graphics/Terrain.h"
|
||||
#include "maths/Frustum.h"
|
||||
#include "maths/MathUtil.h"
|
||||
|
@ -18,6 +18,7 @@
|
||||
#include "precompiled.h"
|
||||
#include "CCmpRallyPointRenderer.h"
|
||||
|
||||
#include "ps/Profile.h"
|
||||
#include "simulation2/components/ICmpRangeManager.h"
|
||||
#include "simulation2/helpers/Los.h"
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 2019 Wildfire Games.
|
||||
/* Copyright (C) 2021 Wildfire Games.
|
||||
* This file is part of 0 A.D.
|
||||
*
|
||||
* 0 A.D. is free software: you can redistribute it and/or modify
|
||||
@ -19,8 +19,11 @@
|
||||
#define INCLUDED_CCMPRALLYPOINTRENDERER
|
||||
|
||||
#include "ICmpRallyPointRenderer.h"
|
||||
|
||||
#include "graphics/Overlay.h"
|
||||
#include "graphics/TextureManager.h"
|
||||
#include "ps/CLogger.h"
|
||||
#include "renderer/Renderer.h"
|
||||
#include "simulation2/MessageTypes.h"
|
||||
#include "simulation2/components/ICmpFootprint.h"
|
||||
#include "simulation2/components/ICmpObstructionManager.h"
|
||||
@ -36,10 +39,6 @@
|
||||
#include "simulation2/helpers/Geometry.h"
|
||||
#include "simulation2/system/Component.h"
|
||||
|
||||
#include "ps/CLogger.h"
|
||||
#include "ps/Profile.h"
|
||||
#include "renderer/Renderer.h"
|
||||
|
||||
struct SVisibilitySegment
|
||||
{
|
||||
bool m_Visible;
|
||||
|
@ -23,8 +23,6 @@
|
||||
#include "simulation2/components/ICmpObstruction.h"
|
||||
#include "simulation2/helpers/Pathfinding.h"
|
||||
|
||||
#include "maths/FixedVector2D.h"
|
||||
|
||||
#include <map>
|
||||
|
||||
class IObstructionTestFilter;
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 2019 Wildfire Games.
|
||||
/* Copyright (C) 2021 Wildfire Games.
|
||||
* This file is part of 0 A.D.
|
||||
*
|
||||
* 0 A.D. is free software: you can redistribute it and/or modify
|
||||
@ -32,6 +32,7 @@
|
||||
#include "lib/timer.h"
|
||||
#include "maths/MathUtil.h"
|
||||
#include "ps/CConsole.h"
|
||||
#include "ps/Filesystem.h"
|
||||
#include "ps/Profile.h"
|
||||
#include "ps/Profiler2.h"
|
||||
#include "ps/Game.h"
|
||||
|
Loading…
Reference in New Issue
Block a user