From df9a970a5109002f2eab7907718976dfb810803b Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 17 Feb 2018 22:03:30 +0300 Subject: Move vector class into resources directory. --- src/CMakeLists.txt | 4 +- src/Makefile.am | 4 +- src/being/actor.h | 4 +- src/resources/vector.cpp | 31 +++++++ src/resources/vector.h | 216 +++++++++++++++++++++++++++++++++++++++++++++++ src/vector.cpp | 31 ------- src/vector.h | 216 ----------------------------------------------- 7 files changed, 253 insertions(+), 253 deletions(-) create mode 100644 src/resources/vector.cpp create mode 100644 src/resources/vector.h delete mode 100644 src/vector.cpp delete mode 100644 src/vector.h diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index cc2d33a30..5c0a49bcf 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1427,8 +1427,8 @@ SET(SRCS input/touch/touchmanager.cpp input/touch/touchmanager.h variabledata.h - vector.cpp - vector.h + resources/vector.cpp + resources/vector.h resources/map/walklayer.cpp resources/map/walklayer.h events/actionevent.h diff --git a/src/Makefile.am b/src/Makefile.am index c4acb8f8e..9ba65e2f2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -905,8 +905,8 @@ BASE_SRC += client.h \ input/touch/touchmanager.cpp \ input/touch/touchmanager.h \ variabledata.h \ - vector.cpp \ - vector.h \ + resources/vector.cpp \ + resources/vector.h \ net/ipc.cpp \ net/ipc.h \ net/sdltcpnet.cpp \ diff --git a/src/being/actor.h b/src/being/actor.h index 19bcd1e1c..302d02bda 100644 --- a/src/being/actor.h +++ b/src/being/actor.h @@ -22,10 +22,10 @@ #ifndef BEING_ACTOR_H #define BEING_ACTOR_H -#include "vector.h" - #include "utils/cast.h" +#include "resources/vector.h" + #include #include "localconsts.h" diff --git a/src/resources/vector.cpp b/src/resources/vector.cpp new file mode 100644 index 000000000..258e0a72b --- /dev/null +++ b/src/resources/vector.cpp @@ -0,0 +1,31 @@ +/* + * The ManaPlus Client + * Copyright (C) 2007-2009 The Mana World Development Team + * Copyright (C) 2009-2010 The Mana Developers + * Copyright (C) 2011-2018 The ManaPlus Developers + * + * This file is part of The ManaPlus Client. + * + * This program 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 + * any later version. + * + * This program 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 this program. If not, see . + */ + +#include "resources/vector.h" + +#include "debug.h" + +std::ostream& operator <<(std::ostream &os, const Vector &v) +{ + os << "Vector(" << v.x << ", " << v.y << ", " << v.z << ")"; + return os; +} diff --git a/src/resources/vector.h b/src/resources/vector.h new file mode 100644 index 000000000..0b564d897 --- /dev/null +++ b/src/resources/vector.h @@ -0,0 +1,216 @@ +/* + * The ManaPlus Client + * Copyright (C) 2007-2009 The Mana World Development Team + * Copyright (C) 2009-2010 The Mana Developers + * Copyright (C) 2011-2018 The ManaPlus Developers + * + * This file is part of The ManaPlus Client. + * + * This program 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 + * any later version. + * + * This program 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 this program. If not, see . + */ + +#ifndef RESOURCES_VECTOR_H +#define RESOURCES_VECTOR_H + +#ifndef USE_SDL2 +#include +#endif // USE_SDL2 + +#include + +#include "localconsts.h" + +/** + * Vector class. Represents either a 3D point in space, a velocity or a force. + * Provides several convenient operator overloads. + */ +class Vector final +{ + public: + /** + * Constructor. + */ + Vector() : + x(0.0F), + y(0.0F), + z(0.0F) + {} + + /** + * Constructor. + */ + Vector(const float x0, + const float y0, + const float z0) : + x(x0), + y(y0), + z(z0) + {} + + /** + * Copy constructor. + */ + Vector(const Vector &v) : + x(v.x), + y(v.y), + z(v.z) + {} + + A_DEFAULT_COPY(Vector) + + /** + * Returns true if all coordinates are set to 0, otherwise returns + * false. + */ + bool isNull() const noexcept2 A_WARN_UNUSED + { + return x == 0.0F && y == 0.0F && z == 0.0F; + } + + Vector &operator=(const Vector &v) noexcept2 + { + x = v.x; + y = v.y; + z = v.z; + return *this; + } + + /** + * Scale vector operator. + */ + Vector operator*(const float c) const noexcept2 A_WARN_UNUSED + { + return Vector(x * c, + y * c, + z * c); + } + + /** + * In-place scale vector operator. + */ + Vector &operator*=(const float c) noexcept2 + { + x *= c; + y *= c; + z *= c; + return *this; + } + + /** + * Scale vector operator. + */ + Vector operator/(const float c) const noexcept2 A_WARN_UNUSED + { + return Vector(x / c, + y / c, + z / c); + } + + /** + * In-place scale vector operator. + */ + Vector &operator/=(const float c) noexcept2 A_WARN_UNUSED + { + x /= c; + y /= c; + z /= c; + return *this; + } + + /** + * Add vector operator. + */ + Vector operator+(const Vector &v) const noexcept2 A_WARN_UNUSED + { + return Vector(x + v.x, + y + v.y, + z + v.z); + } + + /** + * In-place add vector operator. + */ + Vector &operator+=(const Vector &v) noexcept2 + { + x += v.x; + y += v.y; + z += v.z; + return *this; + } + + /** + * Subtract vector operator. + */ + Vector operator-(const Vector &v) const noexcept2 A_WARN_UNUSED + { + return Vector(x - v.x, + y - v.y, + z - v.z); + } + + /** + * In-place subtract vector operator. + */ + Vector &operator-=(const Vector &v) noexcept2 + { + x -= v.x; + y -= v.y; + z -= v.z; + return *this; + } + + /** + * Returns the length of this vector. This method does a relatively + * slow square root. + */ + float length() const A_WARN_UNUSED + { + return sqrtf(x * x + y * y + z * z); + } + + /** + * Returns the squared length of this vector. Avoids the square root. + */ + float squaredLength() const noexcept2 A_WARN_UNUSED + { + return x * x + y * y + z * z; + } + + /** + * Returns the manhattan length of this vector. + */ + float manhattanLength() const A_WARN_UNUSED + { + return fabsf(x) + fabsf(y) + fabsf(z); + } + + /** + * Returns a normalized version of this vector. This is a unit vector + * running parallel to it. + */ + Vector normalized() const A_WARN_UNUSED + { + const float len = length(); + return Vector(x / len, y / len, z / len); + } + + float x, y, z; +}; + +/** + * Appends a string representation of a vector to the output stream. + */ +std::ostream& operator <<(std::ostream &os, const Vector &v); + +#endif // RESOURCES_VECTOR_H diff --git a/src/vector.cpp b/src/vector.cpp deleted file mode 100644 index be94198fd..000000000 --- a/src/vector.cpp +++ /dev/null @@ -1,31 +0,0 @@ -/* - * The ManaPlus Client - * Copyright (C) 2007-2009 The Mana World Development Team - * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011-2018 The ManaPlus Developers - * - * This file is part of The ManaPlus Client. - * - * This program 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 - * any later version. - * - * This program 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 this program. If not, see . - */ - -#include "vector.h" - -#include "debug.h" - -std::ostream& operator <<(std::ostream &os, const Vector &v) -{ - os << "Vector(" << v.x << ", " << v.y << ", " << v.z << ")"; - return os; -} diff --git a/src/vector.h b/src/vector.h deleted file mode 100644 index d17502f17..000000000 --- a/src/vector.h +++ /dev/null @@ -1,216 +0,0 @@ -/* - * The ManaPlus Client - * Copyright (C) 2007-2009 The Mana World Development Team - * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011-2018 The ManaPlus Developers - * - * This file is part of The ManaPlus Client. - * - * This program 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 - * any later version. - * - * This program 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 this program. If not, see . - */ - -#ifndef VECTOR_H -#define VECTOR_H - -#ifndef USE_SDL2 -#include -#endif // USE_SDL2 - -#include - -#include "localconsts.h" - -/** - * Vector class. Represents either a 3D point in space, a velocity or a force. - * Provides several convenient operator overloads. - */ -class Vector final -{ - public: - /** - * Constructor. - */ - Vector() : - x(0.0F), - y(0.0F), - z(0.0F) - {} - - /** - * Constructor. - */ - Vector(const float x0, - const float y0, - const float z0) : - x(x0), - y(y0), - z(z0) - {} - - /** - * Copy constructor. - */ - Vector(const Vector &v) : - x(v.x), - y(v.y), - z(v.z) - {} - - A_DEFAULT_COPY(Vector) - - /** - * Returns true if all coordinates are set to 0, otherwise returns - * false. - */ - bool isNull() const noexcept2 A_WARN_UNUSED - { - return x == 0.0F && y == 0.0F && z == 0.0F; - } - - Vector &operator=(const Vector &v) noexcept2 - { - x = v.x; - y = v.y; - z = v.z; - return *this; - } - - /** - * Scale vector operator. - */ - Vector operator*(const float c) const noexcept2 A_WARN_UNUSED - { - return Vector(x * c, - y * c, - z * c); - } - - /** - * In-place scale vector operator. - */ - Vector &operator*=(const float c) noexcept2 - { - x *= c; - y *= c; - z *= c; - return *this; - } - - /** - * Scale vector operator. - */ - Vector operator/(const float c) const noexcept2 A_WARN_UNUSED - { - return Vector(x / c, - y / c, - z / c); - } - - /** - * In-place scale vector operator. - */ - Vector &operator/=(const float c) noexcept2 A_WARN_UNUSED - { - x /= c; - y /= c; - z /= c; - return *this; - } - - /** - * Add vector operator. - */ - Vector operator+(const Vector &v) const noexcept2 A_WARN_UNUSED - { - return Vector(x + v.x, - y + v.y, - z + v.z); - } - - /** - * In-place add vector operator. - */ - Vector &operator+=(const Vector &v) noexcept2 - { - x += v.x; - y += v.y; - z += v.z; - return *this; - } - - /** - * Subtract vector operator. - */ - Vector operator-(const Vector &v) const noexcept2 A_WARN_UNUSED - { - return Vector(x - v.x, - y - v.y, - z - v.z); - } - - /** - * In-place subtract vector operator. - */ - Vector &operator-=(const Vector &v) noexcept2 - { - x -= v.x; - y -= v.y; - z -= v.z; - return *this; - } - - /** - * Returns the length of this vector. This method does a relatively - * slow square root. - */ - float length() const A_WARN_UNUSED - { - return sqrtf(x * x + y * y + z * z); - } - - /** - * Returns the squared length of this vector. Avoids the square root. - */ - float squaredLength() const noexcept2 A_WARN_UNUSED - { - return x * x + y * y + z * z; - } - - /** - * Returns the manhattan length of this vector. - */ - float manhattanLength() const A_WARN_UNUSED - { - return fabsf(x) + fabsf(y) + fabsf(z); - } - - /** - * Returns a normalized version of this vector. This is a unit vector - * running parallel to it. - */ - Vector normalized() const A_WARN_UNUSED - { - const float len = length(); - return Vector(x / len, y / len, z / len); - } - - float x, y, z; -}; - -/** - * Appends a string representation of a vector to the output stream. - */ -std::ostream& operator <<(std::ostream &os, const Vector &v); - -#endif // VECTOR_H -- cgit v1.2.3-70-g09d2