Rename ps/Overlay(.h|.cpp) to ps/Shapes(.h|.cpp), fixes a TODO located in graphics/Overlay.h.

The file name did not match the content. Also little cleanup of some unnecessary includes. This was SVN commit r16431.
2015-03-15 18:06:32 +00:00 · 2015-03-15 18:06:32 +00:00 · caf89fa04e
commit caf89fa04e
parent f29d059617
35 changed files with 32 additions and 42 deletions
--- a/source/graphics/Material.h
+++ b/source/graphics/Material.h
@ -22,7 +22,7 @@
 #include "graphics/Texture.h"
 #include "ps/CStr.h"
 #include "ps/CStrIntern.h"
-#include "ps/Overlay.h"
+#include "ps/Shapes.h"
 #include "simulation2/helpers/Player.h"

 class CMaterial
--- a/source/graphics/Model.h
+++ b/source/graphics/Model.h
@ -28,7 +28,6 @@
 #include "graphics/Material.h"
 #include "graphics/MeshManager.h"
 #include "graphics/ModelAbstract.h"
-#include "ps/Overlay.h"

 struct SPropPoint;
 class CObjectEntry;
--- a/source/graphics/ModelAbstract.h
+++ b/source/graphics/ModelAbstract.h
@ -20,7 +20,7 @@

 #include "maths/BoundingBoxOriented.h"
 #include "graphics/RenderableObject.h"
-#include "ps/Overlay.h"
+#include "ps/Shapes.h"
 #include "simulation2/helpers/Player.h"

 class CModel;
--- a/source/graphics/ObjectEntry.h
+++ b/source/graphics/ObjectEntry.h
@ -31,7 +31,7 @@ struct SPropPoint;

 #include "lib/file/vfs/vfs_path.h"
 #include "ps/CStr.h"
-#include "ps/Overlay.h"
+#include "ps/Shapes.h"

 #include "graphics/ObjectBase.h"

--- a/source/graphics/Overlay.h
+++ b/source/graphics/Overlay.h
@ -22,7 +22,7 @@
 #include "maths/Vector2D.h"
 #include "maths/Vector3D.h"
 #include "maths/FixedVector3D.h"
-#include "ps/Overlay.h" // CColor  (TODO: that file has nothing to do with overlays, it should be renamed)
+#include "ps/Shapes.h"

 class CTerrain;
 class CSimContext;
--- a/source/graphics/ShaderProgram.cpp
+++ b/source/graphics/ShaderProgram.cpp
@ -26,8 +26,8 @@
 #include "maths/Vector3D.h"
 #include "ps/CLogger.h"
 #include "ps/Filesystem.h"
-#include "ps/Overlay.h"
 #include "ps/PreprocessorWrapper.h"
+#include "ps/Shapes.h"

 #if !CONFIG2_GLES

--- a/source/graphics/ShaderProgramFFP.cpp
+++ b/source/graphics/ShaderProgramFFP.cpp
@ -25,7 +25,6 @@
 #include "maths/Matrix3D.h"
 #include "maths/Vector3D.h"
 #include "ps/CLogger.h"
-#include "ps/Overlay.h"
 #include "renderer/Renderer.h"

 #if !CONFIG2_GLES
--- a/source/graphics/TerrainProperties.cpp
+++ b/source/graphics/TerrainProperties.cpp
@ -27,7 +27,7 @@
 #include "maths/MathUtil.h"
 #include "ps/CLogger.h"
 #include "ps/Filesystem.h"
-#include "ps/Overlay.h"
+#include "ps/Shapes.h"
 #include "ps/XML/XeroXMB.h"
 #include "ps/XML/Xeromyces.h"

--- a/source/graphics/TerritoryTexture.cpp
+++ b/source/graphics/TerritoryTexture.cpp
@ -21,8 +21,8 @@

 #include "graphics/Terrain.h"
 #include "lib/bits.h"
-#include "ps/Overlay.h"
 #include "ps/Profile.h"
+#include "ps/Shapes.h"
 #include "renderer/Renderer.h"
 #include "simulation2/Simulation2.h"
 #include "simulation2/components/ICmpPlayer.h"
--- a/source/graphics/TextRenderer.h
+++ b/source/graphics/TextRenderer.h
@ -21,7 +21,7 @@
 #include "graphics/ShaderProgramPtr.h"
 #include "maths/Matrix3D.h"
 #include "ps/CStrIntern.h"
-#include "ps/Overlay.h"
+#include "ps/Shapes.h"

 class CFont;

--- a/source/gui/CGUI.cpp
+++ b/source/gui/CGUI.cpp
@ -55,7 +55,6 @@ CGUI
 #include "ps/Filesystem.h"
 #include "ps/Hotkey.h"
 #include "ps/Globals.h"
-#include "ps/Overlay.h"
 #include "ps/Profile.h"
 #include "ps/Pyrogenesis.h"
 #include "ps/XML/Xeromyces.h"
--- a/source/gui/CGUI.h
+++ b/source/gui/CGUI.h
@ -42,7 +42,7 @@ CGUI
 #include "GUIbase.h"
 #include "scriptinterface/ScriptInterface.h"

-#include "ps/Overlay.h" // CPos and CRect
+#include "ps/Shapes.h"

 #include "lib/input.h"

--- a/source/gui/CGUISprite.h
+++ b/source/gui/CGUISprite.h
@ -42,7 +42,6 @@ A GUI Sprite
 //--------------------------------------------------------
 #include "GUIbase.h"

-#include "ps/Overlay.h"
 #include "lib/res/graphics/ogl_tex.h"

 //--------------------------------------------------------
--- a/source/gui/GUIRenderer.h
+++ b/source/gui/GUIRenderer.h
@ -21,8 +21,8 @@
 #include "graphics/ShaderTechnique.h"
 #include "graphics/Texture.h"
 #include "lib/res/handle.h"
-#include "ps/Overlay.h"
 #include "ps/CStr.h"
+#include "ps/Shapes.h"
 #include <vector>

 struct SGUIImageEffects;
--- a/source/gui/GUITooltip.h
+++ b/source/gui/GUITooltip.h
@ -22,7 +22,7 @@ class IGUIObject;
 class CGUI;

 #include "ps/CStr.h"
-#include "ps/Overlay.h"
+#include "ps/Shapes.h"

 class GUITooltip
 {
--- a/source/gui/GUIbase.h
+++ b/source/gui/GUIbase.h
@ -41,7 +41,7 @@ GUI Core, stuff that the whole GUI uses

 // I would like to just forward declare CSize, but it doesn't
 //  seem to be defined anywhere in the predefined header.
-#include "ps/Overlay.h"
+#include "ps/Shapes.h"

 #include "ps/CStr.h"

--- a/source/gui/GUIutil.h
+++ b/source/gui/GUIutil.h
@ -38,7 +38,6 @@ GUI util
 //--------------------------------------------------------
 #include "GUIbase.h"
 // TODO Gee: New
-#include "ps/Overlay.h"
 #include "CGUI.h"
 #include "CGUISprite.h"
 #include "IGUIObject.h"
--- a/source/gui/scripting/ScriptFunctions.cpp
+++ b/source/gui/scripting/ScriptFunctions.cpp
@ -47,7 +47,6 @@
 #include "ps/GameSetup/Config.h"
 #include "ps/Globals.h"	// g_frequencyFilter
 #include "ps/Hotkey.h"
-#include "ps/Overlay.h"
 #include "ps/ProfileViewer.h"
 #include "ps/Pyrogenesis.h"
 #include "ps/SavedGame.h"
--- a/source/ps/Game.cpp
+++ b/source/ps/Game.cpp
@ -35,9 +35,9 @@
 #include "ps/CStr.h"
 #include "ps/Loader.h"
 #include "ps/LoaderThunks.h"
-#include "ps/Overlay.h"
 #include "ps/Profile.h"
 #include "ps/Replay.h"
+#include "ps/Shapes.h"
 #include "ps/World.h"
 #include "ps/GameSetup/GameSetup.h"
 #include "renderer/Renderer.h"
--- a/source/ps/GameSetup/GameSetup.cpp
+++ b/source/ps/GameSetup/GameSetup.cpp
@ -66,7 +66,6 @@
 #include "ps/Joystick.h"
 #include "ps/Loader.h"
 #include "ps/Mod.h"
-#include "ps/Overlay.h"
 #include "ps/Profile.h"
 #include "ps/ProfileViewer.h"
 #include "ps/Profiler2.h"
--- a/source/ps/Overlay.cpp
+++ b/source/ps/Overlay.cpp
@ -16,14 +16,14 @@
 */

 /*
-Overlay.cpp
+Shapes.cpp
 */

 #include "precompiled.h"

 #include <string>

-#include "Overlay.h"
+#include "Shapes.h"
 #include "CLogger.h"
 #include "CStr.h"

--- a/source/ps/Overlay.h
+++ b/source/ps/Overlay.h
@ -1,4 +1,4 @@
-/* Copyright (C) 2014 Wildfire Games.
+/* Copyright (C) 2015 Wildfire Games.
 * This file is part of 0 A.D.
 *
 * 0 A.D. is free software: you can redistribute it and/or modify
@ -16,16 +16,18 @@
 */

 /*
-Overlay.h
+Shapes.h

 --Overview--

-	Class representing 2D screen overlays; includes functionality for overlay
-	position, color, texture and borders.
+	Classes mostly useful for representing 2D screen overlays;
+	includes functionality for overlay position, color, texture and borders.
+
+	CColor is used more widely for various game systems.
 */

-#ifndef INCLUDED_OVERLAY
-#define INCLUDED_OVERLAY
+#ifndef INCLUDED_SHAPES
+#define INCLUDED_SHAPES

 #include "graphics/SColor.h"

@ -235,4 +237,4 @@ public:
 };


-#endif
+#endif // INCLUDED_SHAPES
--- a/source/ps/tests/test_CColor.h
+++ b/source/ps/tests/test_CColor.h
@ -17,8 +17,8 @@

 #include "lib/self_test.h"

-#include "ps/Overlay.h"
 #include "ps/CLogger.h"
+#include "ps/Shapes.h"

 class TestCColor : public CxxTest::TestSuite 
 {
--- a/source/renderer/SilhouetteRenderer.h
+++ b/source/renderer/SilhouetteRenderer.h
@ -18,7 +18,6 @@
 #ifndef INCLUDED_SILHOUETTERENDERER
 #define INCLUDED_SILHOUETTERENDERER

-#include "ps/Overlay.h"
 #include "graphics/Overlay.h"
 #include "maths/BoundingBoxAligned.h"

--- a/source/renderer/TerrainOverlay.cpp
+++ b/source/renderer/TerrainOverlay.cpp
@ -24,8 +24,8 @@
 #include "lib/ogl.h"
 #include "maths/MathUtil.h"
 #include "ps/Game.h"
-#include "ps/Overlay.h"
 #include "ps/Profile.h"
+#include "ps/Shapes.h"
 #include "ps/World.h"
 #include "renderer/Renderer.h"
 #include "renderer/TerrainRenderer.h"
--- a/source/renderer/TimeManager.h
+++ b/source/renderer/TimeManager.h
@ -19,7 +19,6 @@
 #define INCLUDED_TIMEMANAGER

 #include "graphics/Texture.h"
-#include "ps/Overlay.h"
 #include "maths/Matrix3D.h"
 #include "lib/ogl.h"

--- a/source/renderer/WaterManager.h
+++ b/source/renderer/WaterManager.h
@ -26,7 +26,7 @@
 #include "lib/ogl.h"
 #include "maths/Matrix3D.h"
 #include "maths/Vector2D.h"
-#include "ps/Overlay.h"
+#include "ps/Shapes.h"
 #include "renderer/VertexBufferManager.h"

 class CSimulation2;
--- a/source/simulation2/components/CCmpMinimap.cpp
+++ b/source/simulation2/components/CCmpMinimap.cpp
@ -25,7 +25,7 @@
 #include "simulation2/components/ICmpOwnership.h"
 #include "simulation2/MessageTypes.h"

-#include "ps/Overlay.h"
+#include "ps/Shapes.h"

 class CCmpMinimap : public ICmpMinimap
 {
--- a/source/simulation2/components/CCmpObstructionManager.cpp
+++ b/source/simulation2/components/CCmpObstructionManager.cpp
@ -29,7 +29,6 @@
 #include "graphics/Overlay.h"
 #include "graphics/Terrain.h"
 #include "maths/MathUtil.h"
-#include "ps/Overlay.h"
 #include "ps/Profile.h"
 #include "renderer/Scene.h"
 #include "ps/CLogger.h"
--- a/source/simulation2/components/CCmpRangeManager.cpp
+++ b/source/simulation2/components/CCmpRangeManager.cpp
@ -38,7 +38,6 @@
 #include "graphics/Terrain.h"
 #include "lib/timer.h"
 #include "ps/CLogger.h"
-#include "ps/Overlay.h"
 #include "ps/Profile.h"
 #include "renderer/Scene.h"

--- a/source/simulation2/components/CCmpTerritoryManager.cpp
+++ b/source/simulation2/components/CCmpTerritoryManager.cpp
@ -26,7 +26,6 @@
 #include "graphics/TerritoryBoundary.h"
 #include "maths/MathUtil.h"
 #include "maths/Vector2D.h"
-#include "ps/Overlay.h"
 #include "renderer/Renderer.h"
 #include "renderer/Scene.h"
 #include "renderer/TerrainOverlay.h"
--- a/source/simulation2/components/ICmpPlayer.cpp
+++ b/source/simulation2/components/ICmpPlayer.cpp
@ -23,7 +23,7 @@
 #include "simulation2/system/InterfaceScripted.h"
 #include "simulation2/scripting/ScriptComponent.h"

-#include "ps/Overlay.h"
+#include "ps/Shapes.h"

 BEGIN_INTERFACE_WRAPPER(Player)
 END_INTERFACE_WRAPPER(Player)
--- a/source/simulation2/components/ICmpSelectable.cpp
+++ b/source/simulation2/components/ICmpSelectable.cpp
@ -21,7 +21,7 @@

 #include "simulation2/system/InterfaceScripted.h"

-#include "ps/Overlay.h"
+#include "ps/Shapes.h"

 BEGIN_INTERFACE_WRAPPER(Selectable)
 DEFINE_INTERFACE_METHOD_2("SetSelectionHighlight", void, ICmpSelectable, SetSelectionHighlight, CColor, bool)
--- a/source/simulation2/scripting/EngineScriptConversions.cpp
+++ b/source/simulation2/scripting/EngineScriptConversions.cpp
@ -24,7 +24,7 @@
 #include "maths/FixedVector2D.h"
 #include "maths/FixedVector3D.h"
 #include "ps/CLogger.h"
-#include "ps/Overlay.h"
+#include "ps/Shapes.h"
 #include "ps/utf16string.h"
 #include "simulation2/helpers/Grid.h"
 #include "simulation2/system/IComponent.h"
--- a/source/tools/atlas/GameInterface/Brushes.cpp
+++ b/source/tools/atlas/GameInterface/Brushes.cpp
@ -19,8 +19,8 @@

 #include "Brushes.h"

-#include "ps/Overlay.h"
 #include "ps/Game.h"
+#include "ps/Shapes.h"
 #include "ps/World.h"
 #include "graphics/Terrain.h"
 #include "lib/ogl.h"