mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-06-21 01:29:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replaces CPos by more a consistent CVector2D, reduces geometry code duplication.

Browse Source 
Tested By: Freagarach, Langbart
Differential Revision: https://code.wildfiregames.com/D3759
This was SVN commit r25152.
This commit is contained in:
vladislavbelov
2021-03-28 21:55:13 +00:00
parent 0e7fafebe1
commit 969112b9c8
39 changed files with 340 additions and 412 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/maths/Vector2D.cpp
+58
View File
@@ -0,0 +1,58 @@
/* 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
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* 0 A.D. is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with 0 A.D. If not, see <http://www.gnu.org/licenses/>.
*/
#include "precompiled.h"
#include "Vector2D.h"
#include "maths/Size2D.h"
CVector2D::CVector2D(const CSize2D& size) : X(size.Width), Y(size.Height)
{
}
bool CVector2D::operator==(const CVector2D& v) const
{
return X == v.X && Y == v.Y;
}
bool CVector2D::operator!=(const CVector2D& v) const
{
return !(*this == v);
}
CVector2D CVector2D::operator+(const CSize2D& size) const
{
return CVector2D(X + size.Width, Y + size.Height);
}
CVector2D CVector2D::operator-(const CSize2D& size) const
{
return CVector2D(X - size.Width, Y - size.Height);
}
void CVector2D::operator+=(const CSize2D& size)
{
X += size.Width;
Y += size.Height;
}
void CVector2D::operator-=(const CSize2D& size)
{
X -= size.Width;
Y -= size.Height;
}
source/maths/Vector2D.h
+20 -14
View File
@@ -1,4 +1,4 @@
/* Copyright (C) 2011 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
@@ -15,24 +15,23 @@
* along with 0 A.D. If not, see <http://www.gnu.org/licenses/>.
*/
/*
* Provides an interface for a vector in R2 and allows vector and
* scalar operations on it
*/
#ifndef INCLUDED_MATHS_VECTOR2D
#define INCLUDED_MATHS_VECTOR2D
#ifndef INCLUDED_VECTOR2D
#define INCLUDED_VECTOR2D
#include <math.h>
///////////////////////////////////////////////////////////////////////////////
// CVector2D:
class CSize2D;
/*
* Provides an interface for a vector in R2 and allows vector and
* scalar operations on it.
*/
class CVector2D
{
public:
CVector2D() : X(0.0f), Y(0.0f) {}
CVector2D(float x, float y) : X(x), Y(y) {}
CVector2D(const CSize2D& size);
operator float*()
{
@@ -44,6 +43,9 @@ public:
return &X;
}
bool operator==(const CVector2D& v) const;
bool operator!=(const CVector2D& v) const;
CVector2D operator-() const
{
return CVector2D(-X, -Y);
@@ -153,10 +155,14 @@ public:
Y = newY;
}
CVector2D operator+(const CSize2D& size) const;
CVector2D operator-(const CSize2D& size) const;
void operator+=(const CSize2D& size);
void operator-=(const CSize2D& size);
public:
float X, Y;
};
//////////////////////////////////////////////////////////////////////////////////
#endif
#endif // INCLUDED_VECTOR2D