From 5101a856be59e7ffb628ce80a924d25d88978a68 Mon Sep 17 00:00:00 2001
From: Dominic Masters <dominic@domsplace.com>
Date: Wed, 25 Sep 2024 15:01:26 -0400
Subject: [PATCH] Remove glm

---
 .gitignore                                       |  2 +-
 .gitmodules                                      |  3 ---
 assets/dawnrpg/maps/testmap.json                 | 11 +++++++++++
 lib/CMakeLists.txt                               | 15 ++++++++++++++-
 lib/glm                                          |  1 -
 src/dawn/CMakeLists.txt                          |  3 ++-
 src/dawnrpg/component/entity/EntityDirection.cpp |  4 ++--
 src/dawnrpg/component/world/Tile.cpp             |  2 +-
 8 files changed, 31 insertions(+), 10 deletions(-)
 create mode 100644 assets/dawnrpg/maps/testmap.json
 delete mode 160000 lib/glm

diff --git a/.gitignore b/.gitignore
index e13527be..560ad447 100644
--- a/.gitignore
+++ b/.gitignore
@@ -65,7 +65,7 @@ CTestTestfile.cmake
 _deps
 
 # Custom
-build
+/build/*
 .vscode
 
 assets/testworld/tileset.png
diff --git a/.gitmodules b/.gitmodules
index 35ee951e..75568b22 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,6 @@
 [submodule "lib/glfw"]
 	path = lib/glfw
 	url = https://github.com/glfw/glfw.git
-[submodule "lib/glm"]
-	path = lib/glm
-	url = https://github.com/g-truc/glm.git
 [submodule "lib/openal-soft"]
 	path = lib/openal-soft
 	url = https://github.com/kcat/openal-soft
diff --git a/assets/dawnrpg/maps/testmap.json b/assets/dawnrpg/maps/testmap.json
new file mode 100644
index 00000000..e34da1c8
--- /dev/null
+++ b/assets/dawnrpg/maps/testmap.json
@@ -0,0 +1,11 @@
+{
+  "name": "Some Map",
+  "width": 3,
+  "height": 3,
+  "depth": 3,
+  "tiles": [
+    0, 0, 0,
+    0, 0, 0,
+    0, 0, 0
+  ]
+}
\ No newline at end of file
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index af869a30..8fc80e12 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -3,7 +3,15 @@
 # This software is released under the MIT License.
 # https://opensource.org/licenses/MIT
 
-add_subdirectory(glm)
+include(FetchContent)
+
+# add_subdirectory(glm)
+FetchContent_Declare(
+  glm
+  GIT_REPOSITORY  https://github.com/g-truc/glm.git
+  GIT_TAG         bf71a834948186f4097caa076cd2663c69a10e1e
+)
+FetchContent_MakeAvailable(glm)
 
 if(DAWN_TARGET STREQUAL "linux-x64-glfw")
   add_subdirectory(glad)
@@ -14,6 +22,11 @@ else()
   message(FATAL_ERROR "Unknown target: ${DAWN_TARGET}")
 endif()
 
+# JSON
+
+FetchContent_Declare(json URL https://github.com/nlohmann/json/releases/download/v3.11.3/json.tar.xz)
+FetchContent_MakeAvailable(json)
+
 # if(DAWN_TARGET_OPENAL)
 #   set(LIBTYPE "STATIC")
 #   add_subdirectory(openal-soft)
diff --git a/lib/glm b/lib/glm
deleted file mode 160000
index 45008b22..00000000
--- a/lib/glm
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 45008b225e28eb700fa0f7d3ff69b7c1db94fadf
diff --git a/src/dawn/CMakeLists.txt b/src/dawn/CMakeLists.txt
index 67dbdae7..c6ea8a5b 100644
--- a/src/dawn/CMakeLists.txt
+++ b/src/dawn/CMakeLists.txt
@@ -6,9 +6,10 @@
 # Libraries
 target_link_libraries(${DAWN_TARGET_NAME}
   PUBLIC
-    glm
+    glm::glm
     archive_static
     freetype
+    nlohmann_json::nlohmann_json
 )
 
 # Includes
diff --git a/src/dawnrpg/component/entity/EntityDirection.cpp b/src/dawnrpg/component/entity/EntityDirection.cpp
index 7c493112..3f09ee01 100644
--- a/src/dawnrpg/component/entity/EntityDirection.cpp
+++ b/src/dawnrpg/component/entity/EntityDirection.cpp
@@ -27,8 +27,8 @@ struct EntityTilePosition entityDirectionGetRelativeTilePosition(
 ) {
   struct EntityTilePosition result = pos;
   switch(dir) {
-    case EntityDirection::Up: result.z -= distance; break;
-    case EntityDirection::Down: result.z += distance; break;
+    case EntityDirection::Down: result.y -= distance; break;
+    case EntityDirection::Up: result.y += distance; break;
     case EntityDirection::Left: result.x -= distance; break;
     case EntityDirection::Right: result.x += distance; break;
     default:
diff --git a/src/dawnrpg/component/world/Tile.cpp b/src/dawnrpg/component/world/Tile.cpp
index 223de85c..4345497b 100644
--- a/src/dawnrpg/component/world/Tile.cpp
+++ b/src/dawnrpg/component/world/Tile.cpp
@@ -8,6 +8,6 @@
 using namespace Dawn;
 
 bool_t Tile::isSolid() {
-  if(this->id == TileID::Null) return true;
+  if(this->id == TileID::Null) return false;
   return false;
 }
\ No newline at end of file