Puts All 3rd Parties Dependencies In One Folder

CMakeLists.txt

@@ -9,6 +9,7 @@ if (UNIX OR APPLE)
     set(CMAKE_ERROR_DEPRECATED OFF)
 endif ()
 
+add_subdirectory(third-party)
 add_subdirectory(Extractor)
 add_subdirectory(ModelConverter)
 

Extractor/CMakeLists.txt

@@ -1,12 +1,12 @@
-include_directories(../argparse)
-include_directories(../json)
+include_directories(../third-party/argparse)
+include_directories(../third-party/json)
 
 add_executable(Extractor
         extractor.h
         extractor.cpp
 
-        ../argparse/argparse.hpp
-        ../json/json.hpp
+        ../third-party/argparse/argparse.hpp
+        ../third-party/json/json.hpp
         Utility.h
         Utility.cpp
         Regions.h

ModelConverter/CMakeLists.txt

@@ -1,24 +1,16 @@
-list(PREPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
-
-include(assimp)
-
-add_subdirectory(third-party)
-
 include_directories(./)
+include_directories(../third-party/stb)
 
 add_executable(ModelConverter
         main.cpp
-        game/sgd.h
-        game/sgd.cpp
-        game/sgd_types.h
+
         render/tim2.cpp
         render/tim2.h
-        utils/logging.cpp
-        utils/logging.h
         render/sgdMdl.cpp
         render/sgdMdl.h
         render/tim2.cpp
         render/tim2.h
+
         game/vif.h
         game/vif.cpp
         game/Mesh.cpp
@@ -27,18 +19,27 @@ add_executable(ModelConverter
         game/Texture.cpp
         game/packfile.h
         game/packfile.cpp
-        stb_write_image.h
         game/Model.cpp
         game/Model.h
         math/linalg.cpp
         math/linalg.h
-        utils/utility.cpp
-        utils/utility.h
+        game/sgd.h
+        game/sgd.cpp
+        game/sgd_types.h
         game/Exporter.cpp
         game/Exporter.h
+        game/gra3dSGDData.cpp
+        game/gra3dSGDData.h
+
+        utils/utility.cpp
+        utils/utility.h
+        utils/logging.cpp
+        utils/logging.h
         utils/assimp_utils.cpp
         utils/assimp_utils.h
-        game/gra3dSGDData.cpp game/gra3dSGDData.h)
+
+        ../third-party/stb/stb_write_image.h
+        )
 
 target_link_libraries(ModelConverter PRIVATE spdlog assimp)
 

ModelConverter/math/linalg.cpp

@@ -38,12 +38,11 @@ Vector3 &operator+=(Vector3 &source, const Vector3 &target) {
 }
 
 Vector3& operator+(Vector3 &source, Vector3 &target) {
-    Vector3 result = {0};
-    result.x = source.x + target.x;
-    result.y = source.y + target.y;
-    result.z = source.z + target.z;
+    source.x = source.x + target.x;
+    source.y = source.y + target.y;
+    source.z = source.z + target.z;
 
-    return result;
+    return source;
 }
 
 Vector3 &operator+=(Vector3 &source, const Vector4 *target) {

third-party/CMakeLists.txt

@@ -0,0 +1,5 @@
+# Setup SPDLOG
+list(PREPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
+include(assimp)
+
+add_subdirectory(spdlog)

ModelConverter/cmake/assimp.cmake → third-party/cmake/assimp.cmake

@@ -10,14 +10,16 @@ set(ASSIMP_BUILD_ALL_EXPORTERS_BY_DEFAULT OFF CACHE BOOL "Disable all exporters"
 set(ASSIMP_BUILD_OBJ_EXPORTER OFF CACHE BOOL "Enable OBJ exporter" FORCE)
 set(ASSIMP_BUILD_COLLADA_EXPORTER OFF CACHE BOOL "Enable COLLADA exporter" FORCE)
 set(ASSIMP_BUILD_FBX_EXPORTER OFF CACHE BOOL "Enable FBX exporter" FORCE)
+set(ASSIMP_BUILD_ASSIMP_VIEW OFF CACHE BOOL "Disable assimp view" FORCE)
+
+# Enable GLTF importer and exporter, if importer is nor included then exporter build will fail
 set(ASSIMP_BUILD_GLTF_EXPORTER ON CACHE BOOL "Enable GLTF exporter" FORCE)
 set(ASSIMP_BUILD_GLTF_IMPORTER ON CACHE BOOL "Enable GLTF importer" FORCE)
-set(ASSIMP_BUILD_ASSIMP_VIEW OFF CACHE BOOL "Disable assimp view" FORCE)
 
 FetchContent_Declare(
         assimp
         GIT_REPOSITORY https://github.com/assimp/assimp.git
         GIT_TAG v5.3.1
 )
 
-FetchContent_MakeAvailable(assimp)
+FetchContent_MakeAvailable(assimp)