From 61a7a991a84a00872b679517de3d6a722d784946 Mon Sep 17 00:00:00 2001 From: Kayne Ruse Date: Sat, 3 Dec 2016 23:06:59 +1100 Subject: [PATCH] Removed duplicate files --- common/network/makefile | 2 +- common/network/packet_types/makefile | 2 +- common/utilities/bounding_box.hpp | 75 ------------------ common/utilities/vector2.hpp | 111 --------------------------- server/barriers/makefile | 2 +- server/battles/makefile | 2 +- server/characters/makefile | 2 +- server/creatures/makefile | 2 +- server/entities/makefile | 2 +- server/rooms/makefile | 2 +- server/triggers/makefile | 2 +- 11 files changed, 9 insertions(+), 195 deletions(-) delete mode 100644 common/utilities/bounding_box.hpp delete mode 100644 common/utilities/vector2.hpp diff --git a/common/network/makefile b/common/network/makefile index 6d8fa02..41a0042 100644 --- a/common/network/makefile +++ b/common/network/makefile @@ -1,5 +1,5 @@ #config -INCLUDES+=. packet_types ../global_defines ../utilities ../../TurtleMap +INCLUDES+=. packet_types ../global_defines ../utilities ../../TurtleGUI ../../TurtleMap LIBS+= CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES)) diff --git a/common/network/packet_types/makefile b/common/network/packet_types/makefile index a4a8a85..c95abb2 100644 --- a/common/network/packet_types/makefile +++ b/common/network/packet_types/makefile @@ -1,5 +1,5 @@ #config -INCLUDES+=. .. ../../global_defines ../../utilities ../../../TurtleMap +INCLUDES+=. .. ../../global_defines ../../utilities ../../../TurtleGUI ../../../TurtleMap LIBS+= CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES)) diff --git a/common/utilities/bounding_box.hpp b/common/utilities/bounding_box.hpp deleted file mode 100644 index 06747b0..0000000 --- a/common/utilities/bounding_box.hpp +++ /dev/null @@ -1,75 +0,0 @@ -/* Copyright: (c) Kayne Ruse 2013-2016 - * - * This software is provided 'as-is', without any express or implied - * warranty. In no event will the authors be held liable for any damages - * arising from the use of this software. - * - * Permission is granted to anyone to use this software for any purpose, - * including commercial applications, and to alter it and redistribute it - * freely, subject to the following restrictions: - * - * 1. The origin of this software must not be misrepresented; you must not - * claim that you wrote the original software. If you use this software - * in a product, an acknowledgment in the product documentation would be - * appreciated but is not required. - * - * 2. Altered source versions must be plainly marked as such, and must not be - * misrepresented as being the original software. - * - * 3. This notice may not be removed or altered from any source - * distribution. -*/ -#pragma once - -#include -#include - -class BoundingBox { -public: - //This is explicitly a POD - int x, y; - int w, h; - - BoundingBox() = default; - BoundingBox(int i, int j): x(i), y(j), w(0), h(0) {}; - BoundingBox(int i, int j, int k, int l): x(i), y(j), w(k), h(l) {}; - ~BoundingBox() = default; - BoundingBox& operator=(BoundingBox const&) = default; - - int Size() { - return std::max(w*h,0); - } - - bool CheckOverlap(BoundingBox rhs) { - return !( - x >= rhs.x + rhs.w || - y >= rhs.y + rhs.h || - rhs.x >= x + w || - rhs.y >= y + h); - } - - BoundingBox CalcOverlap(BoundingBox rhs) { - if (!CheckOverlap(rhs)) { - return {0, 0, 0, 0}; - } - BoundingBox ret; - ret.x = std::max(x, rhs.x); - ret.y = std::max(y, rhs.y); - ret.w = std::min(x+w, rhs.x+rhs.w) - ret.x; - ret.h = std::min(y+h, rhs.y+rhs.h) - ret.y; - return ret; - } -}; - -//This is explicitly a POD -static_assert(std::is_pod::value, "BoundingBox is not a POD"); - -#include "vector2.hpp" - -//operators -inline BoundingBox operator+(BoundingBox b, Vector2 v) { - return {b.x + (int)v.x, b.y + (int)v.y, b.w, b.h}; -} -inline BoundingBox operator+(Vector2 v, BoundingBox b) { - return b + v; -} diff --git a/common/utilities/vector2.hpp b/common/utilities/vector2.hpp deleted file mode 100644 index ad0b17f..0000000 --- a/common/utilities/vector2.hpp +++ /dev/null @@ -1,111 +0,0 @@ -/* Copyright: (c) Kayne Ruse 2013-2016 - * - * This software is provided 'as-is', without any express or implied - * warranty. In no event will the authors be held liable for any damages - * arising from the use of this software. - * - * Permission is granted to anyone to use this software for any purpose, - * including commercial applications, and to alter it and redistribute it - * freely, subject to the following restrictions: - * - * 1. The origin of this software must not be misrepresented; you must not - * claim that you wrote the original software. If you use this software - * in a product, an acknowledgment in the product documentation would be - * appreciated but is not required. - * - * 2. Altered source versions must be plainly marked as such, and must not be - * misrepresented as being the original software. - * - * 3. This notice may not be removed or altered from any source - * distribution. -*/ -#pragma once - -#include -#include -#include - -class Vector2 { -public: - double x, y; - - Vector2() = default; - Vector2(double i, double j): x(i), y(j) {}; - ~Vector2() = default; - Vector2& operator=(Vector2 const&) = default; - - double Length() const { - return sqrt(x*x+y*y); - } - double SquaredLength() const { - return x*x+y*y; - } - void Normalize() { - double l = Length(); - if (l == 0) - throw(std::domain_error("Divide by zero")); - x /= l; - y /= l; - } - - //Arithmetic operators - Vector2 operator+(Vector2 v) const { - Vector2 ret; - ret.x = x + v.x; - ret.y = y + v.y; - return ret; - } - Vector2 operator-(Vector2 v) const { - Vector2 ret; - ret.x = x - v.x; - ret.y = y - v.y; - return ret; - } - Vector2 operator*(Vector2 v) const { - Vector2 ret; - ret.x = x * v.x; - ret.y = y * v.y; - return ret; - } - Vector2 operator*(double d) const { - Vector2 ret; - ret.x = x * d; - ret.y = y * d; - return ret; - } - - Vector2 operator/(Vector2 v) { - if (!v.x || !v.y) - throw(std::domain_error("Divide by zero")); - Vector2 ret; - ret.x = x / v.x; - ret.y = y / v.y; - return ret; - } - Vector2 operator/(double d) { - if (!d) - throw(std::domain_error("Divide by zero")); - Vector2 ret; - ret.x = x / d; - ret.y = y / d; - return ret; - } - - //unary operators - Vector2 operator-() { return {-x, -y}; } - - //comparison operators - bool operator==(Vector2 v) { return (x == v.x && y == v.y); } - bool operator!=(Vector2 v) { return (x != v.x || y != v.y); } - - //member templates (curry the above operators) - template Vector2 operator+=(T t) { return *this = *this + t; } - template Vector2 operator-=(T t) { return *this = *this - t; } - template Vector2 operator*=(T t) { return *this = *this * t; } - template Vector2 operator/=(T t) { return *this = *this / t; } - template bool operator==(T t) { return (x == t && y == t); } - template bool operator!=(T t) { return (x != t || y != t); } -}; - -//This is explicitly a POD -static_assert(std::is_pod::value, "Vector2 is not a POD"); diff --git a/server/barriers/makefile b/server/barriers/makefile index 46aa154..6e85c54 100644 --- a/server/barriers/makefile +++ b/server/barriers/makefile @@ -1,5 +1,5 @@ #config -INCLUDES+=. .. ../characters ../creatures ../entities ../inventory ../../common/global_defines ../../common/utilities +INCLUDES+=. .. ../characters ../creatures ../entities ../inventory ../../common/global_defines ../../common/utilities ../../TurtleGUI LIBS+= CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES)) diff --git a/server/battles/makefile b/server/battles/makefile index 46aa154..6e85c54 100644 --- a/server/battles/makefile +++ b/server/battles/makefile @@ -1,5 +1,5 @@ #config -INCLUDES+=. .. ../characters ../creatures ../entities ../inventory ../../common/global_defines ../../common/utilities +INCLUDES+=. .. ../characters ../creatures ../entities ../inventory ../../common/global_defines ../../common/utilities ../../TurtleGUI LIBS+= CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES)) diff --git a/server/characters/makefile b/server/characters/makefile index dc3efde..8898f30 100644 --- a/server/characters/makefile +++ b/server/characters/makefile @@ -1,5 +1,5 @@ #config -INCLUDES+=. .. ../barriers ../battles ../creatures ../entities ../monsters ../inventory ../rooms ../triggers ../../common/global_defines ../../common/network ../../common/network/packet_types ../../common/utilities ../../TurtleMap +INCLUDES+=. .. ../barriers ../battles ../creatures ../entities ../monsters ../inventory ../rooms ../triggers ../../common/global_defines ../../common/network ../../common/network/packet_types ../../common/utilities ../../TurtleGUI ../../TurtleMap LIBS+= CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES)) diff --git a/server/creatures/makefile b/server/creatures/makefile index 872d58b..18a025e 100644 --- a/server/creatures/makefile +++ b/server/creatures/makefile @@ -1,5 +1,5 @@ #config -INCLUDES+=. .. ../entities ../../common/global_defines ../../common/utilities +INCLUDES+=. .. ../entities ../../common/global_defines ../../common/utilities ../../TurtleGUI LIBS+= CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES)) diff --git a/server/entities/makefile b/server/entities/makefile index 1b92ad0..ba0f08e 100644 --- a/server/entities/makefile +++ b/server/entities/makefile @@ -1,5 +1,5 @@ #config -INCLUDES+=. ../../common/utilities +INCLUDES+=. ../../common/utilities ../../TurtleGUI LIBS+= CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES)) diff --git a/server/rooms/makefile b/server/rooms/makefile index a226648..d0779e4 100644 --- a/server/rooms/makefile +++ b/server/rooms/makefile @@ -1,5 +1,5 @@ #config -INCLUDES+=. .. ../barriers ../battles ../characters ../creatures ../entities ../inventory ../monsters ../triggers ../../common/global_defines ../../common/network ../../common/network/packet_types ../../common/utilities ../../TurtleMap +INCLUDES+=. .. ../barriers ../battles ../characters ../creatures ../entities ../inventory ../monsters ../triggers ../../common/global_defines ../../common/network ../../common/network/packet_types ../../common/utilities ../../TurtleGUI ../../TurtleMap LIBS+= CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES)) diff --git a/server/triggers/makefile b/server/triggers/makefile index 211a55a..8d6d386 100644 --- a/server/triggers/makefile +++ b/server/triggers/makefile @@ -1,5 +1,5 @@ #config -INCLUDES+=. .. ../entities ../../common/utilities +INCLUDES+=. .. ../entities ../../common/utilities ../../TurtleGUI LIBS+= CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))