From 7ccbee816cf7a21cb158eada4d54d3f1791dfb88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nils=20Petter=20Sk=C3=A5lerud?= <np_skalerud@hotmail.com>
Date: Thu, 21 Mar 2019 12:56:51 +0100
Subject: [PATCH] Made progress to use submodules in project. Updated to latest
 DMath submodule (21.03.2019) Project should now compile again.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Nils Petter Skålerud <np_skalerud@hotmail.com>
---
 CMakeLists.txt                             |  4 ++++
 external/CMakeLists.txt                    | 19 +++++++++++++++++++
 external/DMath                             |  2 +-
 src/Engine/Asset.cpp                       |  2 +-
 src/Engine/Components/BoxCollider2D.cpp    |  2 +-
 src/Engine/Components/BoxCollider2D.hpp    |  4 ++--
 src/Engine/Components/Camera.cpp           |  2 +-
 src/Engine/Components/Camera.hpp           |  2 +-
 src/Engine/Components/CircleCollider2D.cpp |  2 +-
 src/Engine/Components/CircleCollider2D.hpp |  2 +-
 src/Engine/Components/MeshRenderer.cpp     |  2 +-
 src/Engine/Components/MeshRenderer.hpp     |  6 +++---
 src/Engine/Components/RigidBody2D.hpp      |  2 +-
 src/Engine/Components/SpriteRenderer.cpp   |  2 +-
 src/Engine/Components/SpriteRenderer.hpp   |  4 ++--
 src/Engine/Engine.cpp                      |  2 +-
 src/Engine/Input/InputRaw.cpp              |  2 +-
 src/Engine/Input/InputRaw.hpp              |  2 +-
 src/Engine/Physics2D.cpp                   |  2 +-
 src/Engine/Physics2D.hpp                   |  2 +-
 src/Engine/Renderer/Renderer.cpp           |  2 +-
 src/Engine/Renderer/Renderer.hpp           |  4 ++--
 src/Engine/SceneObject.cpp                 |  2 +-
 src/Engine/Transform.cpp                   |  4 ++--
 src/Engine/Transform.hpp                   |  6 +++---
 25 files changed, 54 insertions(+), 31 deletions(-)
 create mode 100644 external/CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4ae6f39..ae93d8d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,6 +7,10 @@ file(GLOB_RECURSE SOURCE_FILES "src/*.cpp")
 add_executable(${PROJECT_NAME} ${SOURCE_FILES})
 target_include_directories(${PROJECT_NAME} PRIVATE include)
 
+add_subdirectory(external)
+target_link_libraries(${PROJECT_NAME} external::external)
+
+
 # Add custom command to copy Data directory to build directory
 # Remove Data directory in build directory if present
 add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
new file mode 100644
index 0000000..22fa6e7
--- /dev/null
+++ b/external/CMakeLists.txt
@@ -0,0 +1,19 @@
+set(LIB_NAME external)
+
+add_library(${LIB_NAME} INTERFACE)
+add_library(${LIB_NAME}::${LIB_NAME} ALIAS ${LIB_NAME})
+
+message(STATUS "${CMAKE_CURRENT_SOURCE_DIR}")
+target_include_directories(
+    ${LIB_NAME}
+    INTERFACE
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/fx-gltf/include>
+    $<INSTALL_INTERFACE:include>
+)
+
+set(JSON_BuildTests OFF CACHE INTERNAL "")
+add_subdirectory(nlohmann-json)
+target_link_libraries(${LIB_NAME} INTERFACE nlohmann_json::nlohmann_json)
+
+add_subdirectory(DMath)
+target_link_libraries(${LIB_NAME} INTERFACE DMath::DMath)
\ No newline at end of file
diff --git a/external/DMath b/external/DMath
index cb91a57..d93a427 160000
--- a/external/DMath
+++ b/external/DMath
@@ -1 +1 @@
-Subproject commit cb91a57c761dc8be87738d902abb3b9adf06d7b5
+Subproject commit d93a427928ba7957e5e162dd8567f22bc803ff57
diff --git a/src/Engine/Asset.cpp b/src/Engine/Asset.cpp
index 380f346..5a956ac 100644
--- a/src/Engine/Asset.cpp
+++ b/src/Engine/Asset.cpp
@@ -6,7 +6,7 @@
 #include <map>
 #include <type_traits>
 
-#include "fx-gltf/gltf.h"
+#include "fx/gltf.h"
 
 //#pragma warning( push, 0 )
 #define STB_IMAGE_IMPLEMENTATION
diff --git a/src/Engine/Components/BoxCollider2D.cpp b/src/Engine/Components/BoxCollider2D.cpp
index 198420b..6db6edd 100644
--- a/src/Engine/Components/BoxCollider2D.cpp
+++ b/src/Engine/Components/BoxCollider2D.cpp
@@ -1,6 +1,6 @@
 #include "BoxCollider2D.hpp"
 
-#include "Math/LinearTransform2D.hpp"
+#include "DMath/LinearTransform2D.hpp"
 #include "../SceneObject.hpp"
 
 #include <cassert>
diff --git a/src/Engine/Components/BoxCollider2D.hpp b/src/Engine/Components/BoxCollider2D.hpp
index 10b8f4f..a1df5d9 100644
--- a/src/Engine/Components/BoxCollider2D.hpp
+++ b/src/Engine/Components/BoxCollider2D.hpp
@@ -3,8 +3,8 @@
 #include "Components.hpp"
 #include "../Enum.hpp"
 
-#include "Math/Vector/Vector.hpp"
-#include "Math/Matrix/Matrix.hpp"
+#include "DMath/Vector/Vector.hpp"
+#include "DMath/Matrix/Matrix.hpp"
 
 namespace Engine
 {
diff --git a/src/Engine/Components/Camera.cpp b/src/Engine/Components/Camera.cpp
index c91cac5..5fe66c3 100644
--- a/src/Engine/Components/Camera.cpp
+++ b/src/Engine/Components/Camera.cpp
@@ -1,6 +1,6 @@
 #include "Camera.hpp"
 
-#include "Math/LinearTransform3D.hpp"
+#include "DMath/LinearTransform3D.hpp"
 
 #include "../Renderer/Renderer.hpp"
 
diff --git a/src/Engine/Components/Camera.hpp b/src/Engine/Components/Camera.hpp
index a586ba4..b462fbb 100644
--- a/src/Engine/Components/Camera.hpp
+++ b/src/Engine/Components/Camera.hpp
@@ -2,7 +2,7 @@
 
 #include "Components.hpp"
 
-#include "Math/Vector/Vector.hpp"
+#include "DMath/Vector/Vector.hpp"
 
 #include "../Renderer/Renderer.hpp"
 
diff --git a/src/Engine/Components/CircleCollider2D.cpp b/src/Engine/Components/CircleCollider2D.cpp
index 9fc845b..bf71334 100644
--- a/src/Engine/Components/CircleCollider2D.cpp
+++ b/src/Engine/Components/CircleCollider2D.cpp
@@ -1,6 +1,6 @@
 #include "CircleCollider2D.hpp"
 
-#include "Math/LinearTransform2D.hpp"
+#include "DMath/LinearTransform2D.hpp"
 
 #include "../Scene.hpp"
 #include "../SceneObject.hpp"
diff --git a/src/Engine/Components/CircleCollider2D.hpp b/src/Engine/Components/CircleCollider2D.hpp
index f2d5c8b..05f33e6 100644
--- a/src/Engine/Components/CircleCollider2D.hpp
+++ b/src/Engine/Components/CircleCollider2D.hpp
@@ -3,7 +3,7 @@
 #include "Components.hpp"
 #include "../Enum.hpp"
 
-#include "Math/Vector/Vector.hpp"
+#include "DMath/Vector/Vector.hpp"
 
 namespace Engine
 {
diff --git a/src/Engine/Components/MeshRenderer.cpp b/src/Engine/Components/MeshRenderer.cpp
index 4dfe1eb..7f3f3d5 100644
--- a/src/Engine/Components/MeshRenderer.cpp
+++ b/src/Engine/Components/MeshRenderer.cpp
@@ -6,7 +6,7 @@
 
 #include "../Renderer/Renderer.hpp"
 
-#include "Math/LinearTransform3D.hpp"
+#include "DMath/LinearTransform3D.hpp"
 
 #include "../Scene.hpp"
 #include "../SceneObject.hpp"
diff --git a/src/Engine/Components/MeshRenderer.hpp b/src/Engine/Components/MeshRenderer.hpp
index 7dca22f..3842cb0 100644
--- a/src/Engine/Components/MeshRenderer.hpp
+++ b/src/Engine/Components/MeshRenderer.hpp
@@ -6,9 +6,9 @@
 
 #include "../Enum.hpp"
 
-#include "Math/Vector/Vector.hpp"
-#include "Math/UnitQuaternion.hpp"
-#include "Math/Matrix/Matrix.hpp"
+#include "DMath/Vector/Vector.hpp"
+#include "DMath/UnitQuaternion.hpp"
+#include "DMath/Matrix/Matrix.hpp"
 
 namespace Engine
 {
diff --git a/src/Engine/Components/RigidBody2D.hpp b/src/Engine/Components/RigidBody2D.hpp
index 75cbe89..fc93d02 100644
--- a/src/Engine/Components/RigidBody2D.hpp
+++ b/src/Engine/Components/RigidBody2D.hpp
@@ -2,7 +2,7 @@
 
 #include "Components.hpp"
 
-#include "Math/Vector/Vector.hpp"
+#include "DMath/Vector/Vector.hpp"
 
 namespace Engine
 {
diff --git a/src/Engine/Components/SpriteRenderer.cpp b/src/Engine/Components/SpriteRenderer.cpp
index e72756c..139895d 100644
--- a/src/Engine/Components/SpriteRenderer.cpp
+++ b/src/Engine/Components/SpriteRenderer.cpp
@@ -6,7 +6,7 @@
 #include "../Scene.hpp"
 #include "../SceneObject.hpp"
 
-#include "Math/LinearTransform2D.hpp"
+#include "DMath/LinearTransform2D.hpp"
 
 namespace Engine
 {
diff --git a/src/Engine/Components/SpriteRenderer.hpp b/src/Engine/Components/SpriteRenderer.hpp
index ec8b9d8..130f984 100644
--- a/src/Engine/Components/SpriteRenderer.hpp
+++ b/src/Engine/Components/SpriteRenderer.hpp
@@ -4,8 +4,8 @@
 
 #include "../Asset.hpp"
 
-#include "Math/Vector/Vector.hpp"
-#include "Math/Matrix/Matrix.hpp"
+#include "DMath/Vector/Vector.hpp"
+#include "DMath/Matrix/Matrix.hpp"
 
 #include "../Enum.hpp"
 
diff --git a/src/Engine/Engine.cpp b/src/Engine/Engine.cpp
index 9c3c19d..59eafd0 100644
--- a/src/Engine/Engine.cpp
+++ b/src/Engine/Engine.cpp
@@ -16,7 +16,7 @@
 
 #include "Systems/RenderSystem.hpp"
 
-#include "Math/LinearTransform3D.hpp"
+#include "DMath/LinearTransform3D.hpp"
 
 #include "Components/ScriptBase.hpp"
 
diff --git a/src/Engine/Input/InputRaw.cpp b/src/Engine/Input/InputRaw.cpp
index 7cd2dc2..42350f6 100644
--- a/src/Engine/Input/InputRaw.cpp
+++ b/src/Engine/Input/InputRaw.cpp
@@ -1,6 +1,6 @@
 #define INPUT_BUTTON_COUNT
 #include "InputRaw.hpp"
-#include "Math/Vector/Vector.hpp"
+#include "DMath/Vector/Vector.hpp"
 
 #include <array>
 #include <memory>
diff --git a/src/Engine/Input/InputRaw.hpp b/src/Engine/Input/InputRaw.hpp
index 4d9b8e0..f2ad433 100644
--- a/src/Engine/Input/InputRaw.hpp
+++ b/src/Engine/Input/InputRaw.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Math/Vector/Vector.hpp"
+#include "DMath/Vector/Vector.hpp"
 
 #include <cstdint>
 
diff --git a/src/Engine/Physics2D.cpp b/src/Engine/Physics2D.cpp
index 30f924c..3189c41 100644
--- a/src/Engine/Physics2D.cpp
+++ b/src/Engine/Physics2D.cpp
@@ -7,7 +7,7 @@
 #include "Components/RigidBody2D.hpp"
 #include "Time/Time.hpp"
 
-#include "Math/LinearTransform2D.hpp"
+#include "DMath/LinearTransform2D.hpp"
 
 #include <vector>
 #include <memory>
diff --git a/src/Engine/Physics2D.hpp b/src/Engine/Physics2D.hpp
index 0af92f2..adc6c8d 100644
--- a/src/Engine/Physics2D.hpp
+++ b/src/Engine/Physics2D.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Math/Vector/Vector.hpp"
+#include "DMath/Vector/Vector.hpp"
 
 namespace Engine
 {
diff --git a/src/Engine/Renderer/Renderer.cpp b/src/Engine/Renderer/Renderer.cpp
index e6e6522..50fde57 100644
--- a/src/Engine/Renderer/Renderer.cpp
+++ b/src/Engine/Renderer/Renderer.cpp
@@ -6,7 +6,7 @@
 #include "../Components/MeshRenderer.hpp"
 #include "../Components/Camera.hpp"
 
-#include "Math/LinearTransform3D.hpp"
+#include "DMath/LinearTransform3D.hpp"
 
 #include <functional>
 #include <iostream>
diff --git a/src/Engine/Renderer/Renderer.hpp b/src/Engine/Renderer/Renderer.hpp
index e2185bc..ad5a549 100644
--- a/src/Engine/Renderer/Renderer.hpp
+++ b/src/Engine/Renderer/Renderer.hpp
@@ -7,8 +7,8 @@
 #include "../Utility/ImgDim.hpp"
 #include "../Utility/Color.hpp"
 
-#include "Math/Vector/Vector.hpp"
-#include "Math/UnitQuaternion.hpp"
+#include "DMath/Vector/Vector.hpp"
+#include "DMath/UnitQuaternion.hpp"
 
 #include <memory>
 #include <vector>
diff --git a/src/Engine/SceneObject.cpp b/src/Engine/SceneObject.cpp
index f86f79b..44a7d6b 100644
--- a/src/Engine/SceneObject.cpp
+++ b/src/Engine/SceneObject.cpp
@@ -4,7 +4,7 @@
 
 #include "Scene.hpp"
 
-#include "Math/LinearTransform2D.hpp"
+#include "DMath/LinearTransform2D.hpp"
 
 Engine::SceneObject::SceneObject(Scene& owningScene, size_t indexInScene) : 
 	transform(*this),
diff --git a/src/Engine/Transform.cpp b/src/Engine/Transform.cpp
index 5ff8ed9..e96720b 100644
--- a/src/Engine/Transform.cpp
+++ b/src/Engine/Transform.cpp
@@ -1,7 +1,7 @@
 #include "Transform.hpp"
 
-#include "Math/LinearTransform3D.hpp"
-#include "Math/LinearTransform2D.hpp"
+#include "DMath/LinearTransform3D.hpp"
+#include "DMath/LinearTransform2D.hpp"
 
 #include "Scene.hpp"
 #include "SceneObject.hpp"
diff --git a/src/Engine/Transform.hpp b/src/Engine/Transform.hpp
index fac956b..da16177 100644
--- a/src/Engine/Transform.hpp
+++ b/src/Engine/Transform.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "Math/Vector/Vector.hpp"
-#include "Math/Matrix/Matrix.hpp"
-#include "Math/UnitQuaternion.hpp"
+#include "DMath/Vector/Vector.hpp"
+#include "DMath/Matrix/Matrix.hpp"
+#include "DMath/UnitQuaternion.hpp"
 
 #include "Enum.hpp"
 
-- 
GitLab