Carltonus/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Removes unused ogl/ogl_tex includes.

Browse Source 
This was SVN commit r26121.
This commit is contained in:
Vladislav Belov 2021-12-27 10:11:26 +00:00
parent 60a422b668
commit 9696df3c28
14 changed files with 63 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/graphics/Camera.cpp
View File

@ -26,7 +26,6 @@
#include "graphics/HFTracer.h"
#include "graphics/Terrain.h"
#include "lib/ogl.h"
#include "maths/MathUtil.h"
#include "maths/Vector2D.h"
#include "maths/Vector4D.h"

1
source/graphics/MaterialManager.cpp
View File

@ -20,7 +20,6 @@
#include "MaterialManager.h"
#include "graphics/PreprocessorWrapper.h"
#include "lib/ogl.h"
#include "maths/MathUtil.h"
#include "maths/Vector4D.h"
#include "ps/CLogger.h"

23
source/graphics/Model.cpp
View File

@ -15,33 +15,28 @@
* along with 0 A.D. If not, see <http://www.gnu.org/licenses/>.
*/
/*
* Mesh object with texture and skinning information
*/
#include "precompiled.h"
#include "Model.h"
#include "Decal.h"
#include "ModelDef.h"
#include "maths/Quaternion.h"
#include "graphics/Decal.h"
#include "graphics/MeshManager.h"
#include "graphics/ModelDef.h"
#include "graphics/ObjectEntry.h"
#include "graphics/SkeletonAnim.h"
#include "graphics/SkeletonAnimDef.h"
#include "graphics/SkeletonAnimManager.h"
#include "maths/BoundingBoxAligned.h"
#include "SkeletonAnim.h"
#include "SkeletonAnimDef.h"
#include "SkeletonAnimManager.h"
#include "MeshManager.h"
#include "ObjectEntry.h"
#include "lib/res/graphics/ogl_tex.h"
#include "maths/Quaternion.h"
#include "lib/res/h_mgr.h"
#include "lib/sysdep/rtl.h"
#include "ps/CLogger.h"
#include "ps/CStrInternStatic.h"
#include "ps/Profile.h"
#include "renderer/RenderingOptions.h"
#include "simulation2/Simulation2.h"
#include "simulation2/components/ICmpTerrain.h"
#include "simulation2/components/ICmpWaterManager.h"
#include "simulation2/Simulation2.h"
/////////////////////////////////////////////////////////////////////////////////////////////////////////////

24
source/graphics/Terrain.cpp
View File

@ -15,29 +15,23 @@
* along with 0 A.D. If not, see <http://www.gnu.org/licenses/>.
*/
/*
* Describes ground via heightmap and array of CPatch.
*/
#include "precompiled.h"
#include "lib/res/graphics/ogl_tex.h"
#include "graphics/Terrain.h"
#include "graphics/Patch.h"
#include "graphics/TerrainProperties.h"
#include "graphics/TerrainTextureEntry.h"
#include "graphics/TerrainTextureManager.h"
#include "lib/sysdep/cpu.h"
#include "renderer/Renderer.h"
#include "TerrainProperties.h"
#include "TerrainTextureEntry.h"
#include "TerrainTextureManager.h"
#include <string.h>
#include "Terrain.h"
#include "Patch.h"
#include "maths/FixedVector3D.h"
#include "maths/MathUtil.h"
#include "ps/CLogger.h"
#include "renderer/Renderer.h"
#include "simulation2/helpers/Pathfinding.h"
#include <string.h>
///////////////////////////////////////////////////////////////////////////////
// CTerrain constructor
CTerrain::CTerrain()

2
source/graphics/TerrainTextureManager.cpp
View File

@ -21,9 +21,7 @@
#include "graphics/TerrainTextureEntry.h"
#include "graphics/TerrainProperties.h"
#include "lib/ogl.h"
#include "lib/timer.h"
#include "lib/res/graphics/ogl_tex.h"
#include "ps/CLogger.h"
#include "ps/Filesystem.h"
#include "ps/XML/Xeromyces.h"

15
source/graphics/TerrainTextureManager.h
View File

@ -18,17 +18,16 @@
#ifndef INCLUDED_TERRAINTEXTUREMANAGER
#define INCLUDED_TERRAINTEXTUREMANAGER
#include <map>
#include <memory>
#include <vector>
#include "lib/res/graphics/ogl_tex.h"
#include "lib/res/handle.h"
#include "lib/file/vfs/vfs_path.h"
#include "lib/res/handle.h"
#include "ps/CStr.h"
#include "ps/Singleton.h"
#include "renderer/backend/gl/Texture.h"
#include <map>
#include <memory>
#include <vector>
// access to sole CTerrainTextureManager object
#define g_TexMan CTerrainTextureManager::GetSingleton()
@ -72,9 +71,9 @@ public:
struct TerrainAlpha
{
// ogl_tex handle of composite alpha map (all the alpha maps packed into one texture)
// Composite alpha map (all the alpha maps packed into one texture).
std::unique_ptr<Renderer::Backend::GL::CTexture> m_CompositeAlphaMap;
// coordinates of each (untransformed) alpha map within the packed texture
// Coordinates of each (untransformed) alpha map within the packed texture.
struct
{
float u0, u1, v0, v1;

29
source/ps/GameSetup/GameSetup.cpp
View File

@ -17,14 +17,7 @@
#include "precompiled.h"
#include "lib/app_hooks.h"
#include "lib/config2.h"
#include "lib/input.h"
#include "lib/ogl.h"
#include "lib/timer.h"
#include "lib/external_libraries/libsdl.h"
#include "lib/file/common/file_stats.h"
#include "lib/res/h_mgr.h"
#include "ps/GameSetup/GameSetup.h"
#include "graphics/Canvas2D.h"
#include "graphics/CinemaManager.h"
@ -32,25 +25,33 @@
#include "graphics/GameView.h"
#include "graphics/LightEnv.h"
#include "graphics/MapReader.h"
#include "graphics/ModelDef.h"
#include "graphics/MaterialManager.h"
#include "graphics/ModelDef.h"
#include "graphics/TerrainTextureManager.h"
#include "gui/CGUI.h"
#include "gui/GUIManager.h"
#include "i18n/L10n.h"
#include "lib/app_hooks.h"
#include "lib/config2.h"
#include "lib/external_libraries/libsdl.h"
#include "lib/file/common/file_stats.h"
#include "lib/input.h"
#include "lib/ogl.h"
#include "lib/res/graphics/ogl_tex.h"
#include "lib/res/h_mgr.h"
#include "lib/timer.h"
#include "lobby/IXmppClient.h"
#include "maths/MathUtil.h"
#include "network/NetServer.h"
#include "network/NetClient.h"
#include "network/NetMessage.h"
#include "network/NetMessages.h"
#include "ps/CConsole.h"
#include "ps/CLogger.h"
#include "ps/ConfigDB.h"
#include "ps/Filesystem.h"
#include "ps/Game.h"
#include "ps/GameSetup/Atlas.h"
#include "ps/GameSetup/GameSetup.h"
#include "ps/GameSetup/Paths.h"
#include "ps/GameSetup/Config.h"
#include "ps/GameSetup/CmdLineArgs.h"
@ -73,18 +74,16 @@
#include "ps/VideoMode.h"
#include "ps/VisualReplay.h"
#include "ps/World.h"
#include "renderer/ModelRenderer.h"
#include "renderer/Renderer.h"
#include "renderer/VertexBufferManager.h"
#include "renderer/ModelRenderer.h"
#include "scriptinterface/FunctionWrapper.h"
#include "scriptinterface/JSON.h"
#include "scriptinterface/ScriptInterface.h"
#include "scriptinterface/ScriptStats.h"
#include "scriptinterface/ScriptContext.h"
#include "scriptinterface/ScriptConversions.h"
#include "scriptinterface/JSON.h"
#include "simulation2/Simulation2.h"
#include "lobby/IXmppClient.h"
#include "soundmanager/scripting/JSInterface_Sound.h"
#include "soundmanager/ISoundManager.h"
#include "tools/atlas/GameInterface/GameLoop.h"

9
source/ps/GameSetup/GameSetup.h
View File

@ -18,6 +18,13 @@
#ifndef INCLUDED_GAMESETUP
#define INCLUDED_GAMESETUP
#include "ps/CStr.h"
#include <vector>
class CmdLineArgs;
class Paths;
//
// GUI integration
//
@ -74,8 +81,6 @@ enum ShutdownFlags
extern void RenderGui(bool RenderingState);
extern void RenderLogger(bool RenderingState);
class CmdLineArgs;
class Paths;
extern const std::vector<CStr>& GetMods(const CmdLineArgs& args, int flags);
/**

2
source/renderer/SkyManager.cpp
View File

@ -27,9 +27,9 @@
#include "graphics/ShaderManager.h"
#include "graphics/Terrain.h"
#include "graphics/TextureManager.h"
#include "lib/ogl.h"
#include "lib/tex/tex.h"
#include "lib/timer.h"
#include "lib/res/graphics/ogl_tex.h"
#include "maths/MathUtil.h"
#include "ps/CLogger.h"
#include "ps/ConfigDB.h"

2
source/renderer/VertexBuffer.h
View File

@ -22,7 +22,7 @@
#ifndef INCLUDED_VERTEXBUFFER
#define INCLUDED_VERTEXBUFFER
#include "lib/res/graphics/ogl_tex.h"
#include "lib/ogl.h"
#include <vector>

3
source/tools/atlas/GameInterface/Brushes.cpp
View File

@ -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
@ -21,7 +21,6 @@
#include "graphics/Color.h"
#include "graphics/Terrain.h"
#include "lib/ogl.h"
#include "maths/MathUtil.h"
#include "ps/Game.h"
#include "ps/World.h"

8
source/tools/atlas/GameInterface/Handlers/CinemaHandler.cpp
View File

@ -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
@ -32,12 +32,12 @@
#include "maths/Quaternion.h"
#include "maths/Vector2D.h"
#include "maths/Vector3D.h"
#include "lib/res/graphics/ogl_tex.h"
#include "simulation2/Simulation2.h"
#include "simulation2/components/ICmpCinemaManager.h"
namespace AtlasMessage {
namespace AtlasMessage
{
const float MINIMAL_SCREEN_DISTANCE = 5.f;
@ -541,4 +541,4 @@ MESSAGEHANDLER(ClearPathNodePreview)
g_AtlasGameLoop->view->SetParam(L"movetool", false);
}
}
} // namespace AtlasMessage

11
source/tools/atlas/GameInterface/Handlers/ObjectHandlers.cpp
View File

@ -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
@ -32,7 +32,6 @@
#include "graphics/ObjectManager.h"
#include "graphics/Terrain.h"
#include "graphics/Unit.h"
#include "lib/ogl.h"
#include "lib/utf8.h"
#include "maths/MathUtil.h"
#include "maths/Matrix3D.h"
@ -53,7 +52,8 @@
#include "simulation2/helpers/Selection.h"
#include "ps/XML/XMLWriter.h"
namespace AtlasMessage {
namespace AtlasMessage
{
namespace
{
@ -61,7 +61,7 @@ namespace
{
return wcscmp(a.name.c_str(), b.name.c_str()) < 0;
}
}
} // anonymous namespace
// Helpers for object constraints
bool CheckEntityObstruction(entity_id_t ent)
@ -1128,4 +1128,5 @@ QUERYHANDLER(GetSelectedObjectsTemplateNames)
std::sort(names.begin(), names.end());
msg->names = names;
}
}
} // namespace AtlasMessage

8
source/tools/atlas/GameInterface/Handlers/TerrainHandlers.cpp
View File

@ -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
@ -28,7 +28,6 @@
#include "ps/Game.h"
#include "ps/World.h"
#include "lib/ogl.h"
#include "lib/res/graphics/ogl_tex.h"
#include "simulation2/Simulation2.h"
#include "simulation2/components/ICmpPathfinder.h"
#include "simulation2/components/ICmpTerrain.h"
@ -40,7 +39,8 @@
#include <queue>
namespace AtlasMessage {
namespace AtlasMessage
{
QUERYHANDLER(GetTerrainGroups)
{
@ -546,4 +546,4 @@ BEGIN_COMMAND(FillTerrain)
};
END_COMMAND(FillTerrain)
}
} // namespace AtlasMessage