From 2dd425c19123b68d53b7949d03696567786cd846 Mon Sep 17 00:00:00 2001 From: anulax1225 Date: Wed, 17 Jan 2024 12:05:19 +0100 Subject: [PATCH] Tested premake config with code --- bakara/src/bakara.h | 2 ++ bakara/src/bakara.hpp | 0 bakara/src/bakara/math/math.h | 3 +++ bakara/src/bakara/math/mathpch.h | 4 ++++ bakara/src/bakara/math/vec.h | 28 ++++++++++++++++++++++++++++ bakara/src/bakara/test.cpp | 9 +++++---- bakara/src/bakara/test.h | 5 +++++ bakara/src/bakara/test.hpp | 6 ------ sandbox/src/main.cpp | 7 +++++-- 9 files changed, 52 insertions(+), 12 deletions(-) create mode 100644 bakara/src/bakara.h delete mode 100644 bakara/src/bakara.hpp create mode 100644 bakara/src/bakara/math/math.h create mode 100644 bakara/src/bakara/math/mathpch.h create mode 100644 bakara/src/bakara/math/vec.h create mode 100644 bakara/src/bakara/test.h delete mode 100644 bakara/src/bakara/test.hpp diff --git a/bakara/src/bakara.h b/bakara/src/bakara.h new file mode 100644 index 0000000..dcbc0a0 --- /dev/null +++ b/bakara/src/bakara.h @@ -0,0 +1,2 @@ +#pragma once +#include "bakara/math/math.h" \ No newline at end of file diff --git a/bakara/src/bakara.hpp b/bakara/src/bakara.hpp deleted file mode 100644 index e69de29..0000000 diff --git a/bakara/src/bakara/math/math.h b/bakara/src/bakara/math/math.h new file mode 100644 index 0000000..38b7e20 --- /dev/null +++ b/bakara/src/bakara/math/math.h @@ -0,0 +1,3 @@ +#pragma once + +#include "vec.h" \ No newline at end of file diff --git a/bakara/src/bakara/math/mathpch.h b/bakara/src/bakara/math/mathpch.h new file mode 100644 index 0000000..63405f1 --- /dev/null +++ b/bakara/src/bakara/math/mathpch.h @@ -0,0 +1,4 @@ +#pragma once + +#include +#include \ No newline at end of file diff --git a/bakara/src/bakara/math/vec.h b/bakara/src/bakara/math/vec.h new file mode 100644 index 0000000..fb1f469 --- /dev/null +++ b/bakara/src/bakara/math/vec.h @@ -0,0 +1,28 @@ +#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 diff --git a/bakara/src/bakara/test.cpp b/bakara/src/bakara/test.cpp index 0610e22..fb02ba3 100644 --- a/bakara/src/bakara/test.cpp +++ b/bakara/src/bakara/test.cpp @@ -1,6 +1,7 @@ -#include "test.hpp" -namespace BK::Math { - int add(int x, int y) { - return x + y; +#include "test.h" + +namespace Bk::Math { + int add(int n1, int n2) { + return n1 + n2; } } diff --git a/bakara/src/bakara/test.h b/bakara/src/bakara/test.h new file mode 100644 index 0000000..c2dcdce --- /dev/null +++ b/bakara/src/bakara/test.h @@ -0,0 +1,5 @@ +#pragma once + +namespace Bk::Math { + int add(int n1, int n2); +} \ No newline at end of file diff --git a/bakara/src/bakara/test.hpp b/bakara/src/bakara/test.hpp deleted file mode 100644 index c6b9f57..0000000 --- a/bakara/src/bakara/test.hpp +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef TEST_H -#define TEST_H -namespace BK::Math { - int add(int x, int y); -} -#endif \ No newline at end of file diff --git a/sandbox/src/main.cpp b/sandbox/src/main.cpp index f6c9881..75b68a8 100644 --- a/sandbox/src/main.cpp +++ b/sandbox/src/main.cpp @@ -1,6 +1,9 @@ #include -#include +#include +#include int main() { - std::cout << BK::Math::add(2, 2) << "\n"; + std::cout << Bk::Math::add(2,2) << "\n"; + Bk::Math::vec2 vec(2,2); + std::cout << vec.x << " " << vec.y <<"\n"; } \ No newline at end of file