Moves CRect from ps to maths to related geometric primitives.
This was SVN commit r25165.
This commit is contained in:
parent
f50c98cfd1
commit
742b636f70
@ -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
|
||||
@ -21,8 +21,8 @@
|
||||
#include "graphics/Color.h"
|
||||
#include "graphics/ShaderProgramPtr.h"
|
||||
#include "maths/Matrix3D.h"
|
||||
#include "maths/Rect.h"
|
||||
#include "ps/CStrIntern.h"
|
||||
#include "ps/Shapes.h"
|
||||
|
||||
#include <list>
|
||||
|
||||
|
@ -28,9 +28,9 @@
|
||||
#include "gui/SGUIIcon.h"
|
||||
#include "gui/SGUIStyle.h"
|
||||
#include "lib/input.h"
|
||||
#include "maths/Rect.h"
|
||||
#include "maths/Size2D.h"
|
||||
#include "maths/Vector2D.h"
|
||||
#include "ps/Shapes.h"
|
||||
#include "ps/XML/Xeromyces.h"
|
||||
#include "scriptinterface/ScriptInterface.h"
|
||||
|
||||
|
@ -21,10 +21,10 @@
|
||||
#include "gui/CGUISprite.h"
|
||||
#include "gui/SettingTypes/CGUIColor.h"
|
||||
#include "gui/SettingTypes/EAlign.h"
|
||||
#include "maths/Rect.h"
|
||||
#include "maths/Size2D.h"
|
||||
#include "maths/Vector2D.h"
|
||||
#include "ps/CStrIntern.h"
|
||||
#include "ps/Shapes.h"
|
||||
|
||||
#include <array>
|
||||
#include <list>
|
||||
|
@ -22,7 +22,7 @@
|
||||
#include "graphics/ShaderTechniquePtr.h"
|
||||
#include "graphics/Texture.h"
|
||||
#include "lib/res/handle.h"
|
||||
#include "ps/Shapes.h"
|
||||
#include "maths/Rect.h"
|
||||
|
||||
#include <map>
|
||||
#include <vector>
|
||||
|
@ -30,7 +30,7 @@ GUI Object Base - Text Owner
|
||||
#ifndef INCLUDED_IGUITEXTOWNER
|
||||
#define INCLUDED_IGUITEXTOWNER
|
||||
|
||||
#include "ps/Shapes.h"
|
||||
#include "maths/Rect.h"
|
||||
|
||||
#include <vector>
|
||||
|
||||
|
@ -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
|
||||
@ -18,7 +18,7 @@
|
||||
#ifndef INCLUDED_CGUISIZE
|
||||
#define INCLUDED_CGUISIZE
|
||||
|
||||
#include "ps/Shapes.h"
|
||||
#include "maths/Rect.h"
|
||||
#include "scriptinterface/ScriptForward.h"
|
||||
|
||||
class CStr8;
|
||||
|
@ -17,7 +17,7 @@
|
||||
|
||||
#include "precompiled.h"
|
||||
|
||||
#include "Shapes.h"
|
||||
#include "Rect.h"
|
||||
|
||||
#include "maths/Size2D.h"
|
||||
#include "maths/Vector2D.h"
|
@ -15,8 +15,8 @@
|
||||
* along with 0 A.D. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#ifndef INCLUDED_SHAPES
|
||||
#define INCLUDED_SHAPES
|
||||
#ifndef INCLUDED_RECT
|
||||
#define INCLUDED_RECT
|
||||
|
||||
class CSize2D;
|
||||
class CVector2D;
|
||||
@ -118,4 +118,4 @@ public:
|
||||
float left, top, right, bottom;
|
||||
};
|
||||
|
||||
#endif // INCLUDED_SHAPES
|
||||
#endif // INCLUDED_RECT
|
@ -36,7 +36,6 @@
|
||||
#include "ps/LoaderThunks.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"
|
||||
|
@ -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
|
||||
@ -23,8 +23,8 @@
|
||||
#include "maths/Fixed.h"
|
||||
#include "maths/FixedVector2D.h"
|
||||
#include "maths/FixedVector3D.h"
|
||||
#include "maths/Rect.h"
|
||||
#include "ps/CLogger.h"
|
||||
#include "ps/Shapes.h"
|
||||
#include "ps/utf16string.h"
|
||||
#include "simulation2/helpers/CinemaPath.h"
|
||||
#include "simulation2/helpers/Grid.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
|
||||
@ -40,7 +40,6 @@
|
||||
#include "ps/Game.h"
|
||||
#include "ps/GameSetup/GameSetup.h"
|
||||
#include "ps/Loader.h"
|
||||
#include "ps/Shapes.h"
|
||||
#include "ps/World.h"
|
||||
#include "renderer/Renderer.h"
|
||||
#include "renderer/WaterManager.h"
|
||||
|
Loading…
Reference in New Issue
Block a user