Remove glm

.gitignore

@@ -65,7 +65,7 @@ CTestTestfile.cmake
 _deps
 
 # Custom
-build
+/build/*
 .vscode
 
 assets/testworld/tileset.png

.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

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
+  ]
+}

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)

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

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.y -= distance; break;
-    case EntityDirection::Down: result.z += distance; break;
+    case EntityDirection::Up: result.y += distance; break;
     case EntityDirection::Left: result.x -= distance; break;
     case EntityDirection::Right: result.x += distance; break;
     default:

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;
 }