From 3447f6096cbba5bf7076e1a028a92f804ac31549 Mon Sep 17 00:00:00 2001 From: anulax1225 Date: Wed, 17 Jan 2024 15:09:07 +0100 Subject: [PATCH] Warpper around glm --- bakara/src/bakara/math/math.h | 2 +- bakara/src/bakara/math/mathpch.h | 1 + bakara/src/bakara/math/type.h | 10 ++++++++++ bakara/src/bakara/math/vec.h | 28 ---------------------------- 4 files changed, 12 insertions(+), 29 deletions(-) create mode 100644 bakara/src/bakara/math/type.h delete mode 100644 bakara/src/bakara/math/vec.h diff --git a/bakara/src/bakara/math/math.h b/bakara/src/bakara/math/math.h index 38b7e20..c9b071e 100644 --- a/bakara/src/bakara/math/math.h +++ b/bakara/src/bakara/math/math.h @@ -1,3 +1,3 @@ #pragma once -#include "vec.h" \ No newline at end of file +#include "type.h" \ No newline at end of file diff --git a/bakara/src/bakara/math/mathpch.h b/bakara/src/bakara/math/mathpch.h index 63405f1..b292481 100644 --- a/bakara/src/bakara/math/mathpch.h +++ b/bakara/src/bakara/math/mathpch.h @@ -1,4 +1,5 @@ #pragma once +#include #include #include \ No newline at end of file diff --git a/bakara/src/bakara/math/type.h b/bakara/src/bakara/math/type.h new file mode 100644 index 0000000..bfbea39 --- /dev/null +++ b/bakara/src/bakara/math/type.h @@ -0,0 +1,10 @@ +#pragma once +#include "mathpch.h" + +namespace Bk::Math { + typedef glm::vec2 Vec2; + typedef glm::vec3 Vec3; + typedef glm::ve4 Vec4; + typedef glm::mat4 Mat4; + typedef glm::mat3 Mat3; +} diff --git a/bakara/src/bakara/math/vec.h b/bakara/src/bakara/math/vec.h deleted file mode 100644 index fb1f469..0000000 --- a/bakara/src/bakara/math/vec.h +++ /dev/null @@ -1,28 +0,0 @@ -#pragma once - -#include "mathpch.h" - -namespace Bk::Math { - class vec2 { - public: - float x; - float y; - - vec2() { - this->x = 0; - this->y = 0; - } - vec2(float x, float y) { - this->x = x; - this->y = y; - } - vec2(glm::vec2 vec) { - this->x = vec.x; - this->y = vec.y; - } - - glm::vec2 get_glm() { - return glm::vec2(this->x, this->y); - } - }; -} \ No newline at end of file