summaryrefslogtreecommitdiffstats
path: root/src/utility
diff options
context:
space:
mode:
authorLaG1924 <12997935+LaG1924@users.noreply.github.com>2017-06-21 16:26:25 +0200
committerLaG1924 <12997935+LaG1924@users.noreply.github.com>2017-06-21 16:26:25 +0200
commitf5aa7827af55342a1ec714d366944b3e3f3129b2 (patch)
tree4f4885d2ae0f46004a22e7d4dc34f80c11ecee0c /src/utility
parent2017-06-20 (diff)
downloadAltCraft-f5aa7827af55342a1ec714d366944b3e3f3129b2.tar
AltCraft-f5aa7827af55342a1ec714d366944b3e3f3129b2.tar.gz
AltCraft-f5aa7827af55342a1ec714d366944b3e3f3129b2.tar.bz2
AltCraft-f5aa7827af55342a1ec714d366944b3e3f3129b2.tar.lz
AltCraft-f5aa7827af55342a1ec714d366944b3e3f3129b2.tar.xz
AltCraft-f5aa7827af55342a1ec714d366944b3e3f3129b2.tar.zst
AltCraft-f5aa7827af55342a1ec714d366944b3e3f3129b2.zip
Diffstat (limited to 'src/utility')
-rw-r--r--src/utility/Vector.hpp123
-rw-r--r--src/utility/utility.cpp66
-rw-r--r--src/utility/utility.h16
3 files changed, 0 insertions, 205 deletions
diff --git a/src/utility/Vector.hpp b/src/utility/Vector.hpp
deleted file mode 100644
index 9d6c1be..0000000
--- a/src/utility/Vector.hpp
+++ /dev/null
@@ -1,123 +0,0 @@
-#pragma once
-
-#include <glm/vec3.hpp>
-#include <ostream>
-#include <cmath>
-#include <tuple>
-
-template<class T>
-class Vector3 {
- T x, y, z;
-public:
- Vector3(T X = 0, T Y = 0, T Z = 0) : x(X), y(Y), z(Z) {}
-
- Vector3(const Vector3 &rhs) : x(rhs.x), y(rhs.y), z(rhs.z) {}
-
- ~Vector3() = default;
-
- void SetX(T X) { x = X; }
-
- void SetY(T Y) { y = Y; }
-
- void SetZ(T Z) { z = Z; }
-
- T GetX() const { return x; }
-
- T GetY() const { return y; }
-
- T GetZ() const { return z; }
-
- double GetMagnitude() const { return std::sqrt(std::pow(x, 2) + std::pow(y, 2) + std::pow(z, 2)); }
-
- operator glm::vec3() const {
- return glm::vec3(x, y, z);
- }
-
- void swap(Vector3 &rhs) {
- std::swap(x, rhs.x);
- std::swap(y, rhs.y);
- std::swap(z, rhs.z);
- }
-
- Vector3 &operator=(Vector3 rhs) {
- rhs.swap(*this);
- return *this;
- }
-
- Vector3 operator*(T rhs) const {
- return Vector3<T>(
- x * rhs,
- y * rhs,
- z * rhs
- );
- }
-
- Vector3 operator/(T rhs) const {
- return Vector3<T>(
- x / rhs,
- y / rhs,
- z / rhs
- );
- }
-
- Vector3 operator+(const Vector3 &rhs) const {
- return Vector3<T>(
- x + rhs.x,
- y + rhs.y,
- z + rhs.z
- );
- }
-
- Vector3 operator-(const Vector3 &rhs) const {
- return Vector3<T>(
- x - rhs.x,
- y - rhs.y,
- z - rhs.z
- );
- }
-
- Vector3 operator*(const Vector3 &rhs) const {
- return Vector3<T>(
- x * rhs.x,
- y * rhs.y,
- z * rhs.z
- );
- }
-
- Vector3 operator/(const Vector3 &rhs) const {
- return Vector3<T>(
- x / rhs.x,
- y / rhs.y,
- z / rhs.z
- );
- }
-
- bool operator==(const Vector3 &rhs) const {
- return (x == rhs.x && y == rhs.y && z == rhs.z);
- }
-
- bool operator!=(const Vector3 &rhs) const {
- return !(*this == rhs);
- }
-
- bool operator<(const Vector3 &rhs) const {
- //return (x < rhs.x || y < rhs.y ||z z < rhs.z);
- /*if (x < rhs.x)
- return true;
- else if (z < rhs.z)
- return true;
- else if (y < rhs.y)
- return true;
- return false;*/
- return std::tie(x, y, z) < std::tie(rhs.x, rhs.y, rhs.z);
- }
-
-
- friend std::ostream &operator<<(std::ostream &os, const Vector3 &vector3) {
- os << vector3.x << ", " << vector3.y << ", " << vector3.z;
- return os;
- }
-};
-
-typedef Vector3<double> VectorF;
-typedef Vector3<signed long long> Vector; \ No newline at end of file
diff --git a/src/utility/utility.cpp b/src/utility/utility.cpp
deleted file mode 100644
index aa50e9f..0000000
--- a/src/utility/utility.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
-#include "utility.h"
-
-int VarIntRead(unsigned char *data, size_t &readed) {
- readed = 0;
- int result = 0;
- char read;
- do {
- read = data[readed];
- int value = (read & 0b01111111);
- result |= (value << (7 * readed));
-
- readed++;
- if (readed > 5) {
- throw "VarInt is too big";
- }
- } while ((read & 0b10000000) != 0);
-
- return result;
-}
-
-size_t VarIntWrite(unsigned int value, unsigned char *data) {
- size_t len = 0;
- do {
- unsigned char temp = (unsigned char) (value & 0b01111111);
- value >>= 7;
- if (value != 0) {
- temp |= 0b10000000;
- }
- data[len] = temp;
- len++;
- } while (value != 0);
- return len;
-}
-
-long long int ReadVarLong(unsigned char *data, int &readed) {
- readed = 0;
- long long result = 0;
- unsigned char read;
- do {
- read = data[readed];
- long long value = (read & 0b01111111);
- result |= (value << (7 * readed));
-
- readed++;
- if (readed > 10) {
- throw "VarLong is too big";
- }
- } while ((read & 0b10000000) != 0);
- return result;
-}
-
-unsigned char *WriteVarLong(unsigned long long int value, int &len) {
- unsigned char *data = new unsigned char[10];
- len = 0;
- do {
- unsigned char temp = (unsigned char) (value & 0b01111111);
- value >>= 7;
- if (value != 0) {
- temp |= 0b10000000;
- }
- data[len] = temp;
- len++;
- } while (value != 0);
-
- return data;
-} \ No newline at end of file
diff --git a/src/utility/utility.h b/src/utility/utility.h
deleted file mode 100644
index 32120cb..0000000
--- a/src/utility/utility.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#pragma once
-#include <algorithm>
-
-int VarIntRead(unsigned char *data, size_t &readed);
-
-size_t VarIntWrite(unsigned int value, unsigned char *data);
-
-long long int ReadVarLong(unsigned char *data, int &readed);
-
-unsigned char *WriteVarLong(unsigned long long int value, int &len);
-
-template<class T>
-void endswap(T *objp) {
- unsigned char *memp = reinterpret_cast<unsigned char *>(objp);
- std::reverse(memp, memp + sizeof(T));
-} \ No newline at end of file