diff --git a/source/maths/Size2D.cpp b/source/maths/Size2D.cpp index 8f3d47e1dd..2e88f7244d 100644 --- a/source/maths/Size2D.cpp +++ b/source/maths/Size2D.cpp @@ -1,93 +1,91 @@ -/* 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 . - */ - -#include "precompiled.h" - -#include "Size2D.h" - -#include "ps/Shapes.h" - -CSize2D::CSize2D() = default; - -CSize2D::CSize2D(const CSize2D& size) : Width(size.Width), Height(size.Height) -{ -} - -CSize2D::CSize2D(const float width, const float height) : Width(width), Height(height) -{ -} - -CSize2D& CSize2D::operator=(const CSize2D& size) -{ - Width = size.Width; - Height = size.Height; - return *this; -} - -bool CSize2D::operator==(const CSize2D& size) const -{ - return Width == size.Width && Height == size.Height; -} - -bool CSize2D::operator!=(const CSize2D& size) const -{ - return !(*this == size); -} - -CSize2D CSize2D::operator+(const CSize2D& size) const -{ - return CSize2D(Width + size.Width, Height + size.Height); -} - -CSize2D CSize2D::operator-(const CSize2D& size) const -{ - return CSize2D(Width - size.Width, Height - size.Height); -} - -CSize2D CSize2D::operator/(const float a) const -{ - return CSize2D(Width / a, Height / a); -} - -CSize2D CSize2D::operator*(const float a) const -{ - return CSize2D(Width * a, Height * a); -} - -void CSize2D::operator+=(const CSize2D& size) -{ - Width += size.Width; - Height += size.Height; -} - -void CSize2D::operator-=(const CSize2D& size) -{ - Width -= size.Width; - Height -= size.Height; -} - -void CSize2D::operator/=(const float a) -{ - Width /= a; - Height /= a; -} - -void CSize2D::operator*=(const float a) -{ - Width *= a; - Height *= a; -} +/* 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 . + */ + +#include "precompiled.h" + +#include "Size2D.h" + +CSize2D::CSize2D() = default; + +CSize2D::CSize2D(const CSize2D& size) : Width(size.Width), Height(size.Height) +{ +} + +CSize2D::CSize2D(const float width, const float height) : Width(width), Height(height) +{ +} + +CSize2D& CSize2D::operator=(const CSize2D& size) +{ + Width = size.Width; + Height = size.Height; + return *this; +} + +bool CSize2D::operator==(const CSize2D& size) const +{ + return Width == size.Width && Height == size.Height; +} + +bool CSize2D::operator!=(const CSize2D& size) const +{ + return !(*this == size); +} + +CSize2D CSize2D::operator+(const CSize2D& size) const +{ + return CSize2D(Width + size.Width, Height + size.Height); +} + +CSize2D CSize2D::operator-(const CSize2D& size) const +{ + return CSize2D(Width - size.Width, Height - size.Height); +} + +CSize2D CSize2D::operator/(const float a) const +{ + return CSize2D(Width / a, Height / a); +} + +CSize2D CSize2D::operator*(const float a) const +{ + return CSize2D(Width * a, Height * a); +} + +void CSize2D::operator+=(const CSize2D& size) +{ + Width += size.Width; + Height += size.Height; +} + +void CSize2D::operator-=(const CSize2D& size) +{ + Width -= size.Width; + Height -= size.Height; +} + +void CSize2D::operator/=(const float a) +{ + Width /= a; + Height /= a; +} + +void CSize2D::operator*=(const float a) +{ + Width *= a; + Height *= a; +} diff --git a/source/maths/Size2D.h b/source/maths/Size2D.h index bb9a9c08dd..109991fb3c 100644 --- a/source/maths/Size2D.h +++ b/source/maths/Size2D.h @@ -1,52 +1,49 @@ -/* 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 . - */ - -#ifndef INCLUDED_SIZE2D -#define INCLUDED_SIZE2D - -class CPos; -class CRect; - -/* - * Provides an interface for a size - geometric property in R2. - */ -class CSize2D -{ -public: - CSize2D(); - CSize2D(const CSize2D& size); - CSize2D(const float width, const float height); - - CSize2D& operator=(const CSize2D& size); - bool operator==(const CSize2D& size) const; - bool operator!=(const CSize2D& size) const; - - CSize2D operator+(const CSize2D& size) const; - CSize2D operator-(const CSize2D& size) const; - CSize2D operator/(const float a) const; - CSize2D operator*(const float a) const; - - void operator+=(const CSize2D& a); - void operator-=(const CSize2D& a); - void operator/=(const float a); - void operator*=(const float a); - -public: - float Width = 0.0f, Height = 0.0f; -}; - -#endif // INCLUDED_SIZE2D +/* 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 . + */ + +#ifndef INCLUDED_SIZE2D +#define INCLUDED_SIZE2D + +/* + * Provides an interface for a size - geometric property in R2. + */ +class CSize2D +{ +public: + CSize2D(); + CSize2D(const CSize2D& size); + CSize2D(const float width, const float height); + + CSize2D& operator=(const CSize2D& size); + bool operator==(const CSize2D& size) const; + bool operator!=(const CSize2D& size) const; + + CSize2D operator+(const CSize2D& size) const; + CSize2D operator-(const CSize2D& size) const; + CSize2D operator/(const float a) const; + CSize2D operator*(const float a) const; + + void operator+=(const CSize2D& a); + void operator-=(const CSize2D& a); + void operator/=(const float a); + void operator*=(const float a); + +public: + float Width = 0.0f, Height = 0.0f; +}; + +#endif // INCLUDED_SIZE2D