diff --git a/CMakeLists.txt b/CMakeLists.txt index 11eb8c8..d4ab6b0 100644 --- a/CMakeLists.txt +++ b/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) diff --git a/Extractor/CMakeLists.txt b/Extractor/CMakeLists.txt index 2b26913..5acba8d 100644 --- a/Extractor/CMakeLists.txt +++ b/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 diff --git a/ModelConverter/CMakeLists.txt b/ModelConverter/CMakeLists.txt index 85bd5ef..73cb2c7 100644 --- a/ModelConverter/CMakeLists.txt +++ b/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) diff --git a/ModelConverter/math/linalg.cpp b/ModelConverter/math/linalg.cpp index 6b085e3..2f0ca3d 100644 --- a/ModelConverter/math/linalg.cpp +++ b/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) { diff --git a/ModelConverter/third-party/CMakeLists.txt b/ModelConverter/third-party/CMakeLists.txt deleted file mode 100644 index 2b94602..0000000 --- a/ModelConverter/third-party/CMakeLists.txt +++ /dev/null @@ -1,15 +0,0 @@ -# Setup SDL2 -#find_package(SDL2) - -#if(NOT SDL2_FOUND) -# add_subdirectory(SDL2) -#endif() - -# Setup SPDLOG -add_subdirectory(spdlog) - -# Setup ImGui -#add_subdirectory(imgui) - -# STB Library -#${CMAKE_CURRENT_SOURCE_DIR}/stb/stb_image.h \ No newline at end of file diff --git a/third-party/CMakeLists.txt b/third-party/CMakeLists.txt new file mode 100644 index 0000000..8922c45 --- /dev/null +++ b/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) \ No newline at end of file diff --git a/argparse/argparse.hpp b/third-party/argparse/argparse.hpp similarity index 100% rename from argparse/argparse.hpp rename to third-party/argparse/argparse.hpp diff --git a/ModelConverter/cmake/assimp.cmake b/third-party/cmake/assimp.cmake similarity index 88% rename from ModelConverter/cmake/assimp.cmake rename to third-party/cmake/assimp.cmake index 21377f0..cd7a1e6 100644 --- a/ModelConverter/cmake/assimp.cmake +++ b/third-party/cmake/assimp.cmake @@ -10,9 +10,11 @@ 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 @@ -20,4 +22,4 @@ FetchContent_Declare( GIT_TAG v5.3.1 ) -FetchContent_MakeAvailable(assimp) +FetchContent_MakeAvailable(assimp) \ No newline at end of file diff --git a/json/json.hpp b/third-party/json/json.hpp similarity index 100% rename from json/json.hpp rename to third-party/json/json.hpp diff --git a/ModelConverter/third-party/spdlog/CMakeLists.txt b/third-party/spdlog/CMakeLists.txt similarity index 100% rename from ModelConverter/third-party/spdlog/CMakeLists.txt rename to third-party/spdlog/CMakeLists.txt diff --git a/ModelConverter/third-party/spdlog/README.md b/third-party/spdlog/README.md similarity index 100% rename from ModelConverter/third-party/spdlog/README.md rename to third-party/spdlog/README.md diff --git a/ModelConverter/third-party/spdlog/include/spdlog/async.h b/third-party/spdlog/include/spdlog/async.h similarity index 100% rename from ModelConverter/third-party/spdlog/include/spdlog/async.h rename to third-party/spdlog/include/spdlog/async.h diff --git a/ModelConverter/third-party/spdlog/include/spdlog/async_logger-inl.h b/third-party/spdlog/include/spdlog/async_logger-inl.h similarity index 100% rename from ModelConverter/third-party/spdlog/include/spdlog/async_logger-inl.h rename to third-party/spdlog/include/spdlog/async_logger-inl.h diff --git a/ModelConverter/third-party/spdlog/include/spdlog/async_logger.h b/third-party/spdlog/include/spdlog/async_logger.h similarity index 100% rename from ModelConverter/third-party/spdlog/include/spdlog/async_logger.h rename to third-party/spdlog/include/spdlog/async_logger.h diff --git a/ModelConverter/third-party/spdlog/include/spdlog/cfg/argv.h b/third-party/spdlog/include/spdlog/cfg/argv.h similarity index 100% rename from ModelConverter/third-party/spdlog/include/spdlog/cfg/argv.h rename to third-party/spdlog/include/spdlog/cfg/argv.h diff --git a/ModelConverter/third-party/spdlog/include/spdlog/cfg/env.h b/third-party/spdlog/include/spdlog/cfg/env.h similarity index 100% rename from ModelConverter/third-party/spdlog/include/spdlog/cfg/env.h rename to third-party/spdlog/include/spdlog/cfg/env.h diff --git a/ModelConverter/third-party/spdlog/include/spdlog/cfg/helpers-inl.h b/third-party/spdlog/include/spdlog/cfg/helpers-inl.h similarity index 100% rename from ModelConverter/third-party/spdlog/include/spdlog/cfg/helpers-inl.h rename to third-party/spdlog/include/spdlog/cfg/helpers-inl.h diff --git a/ModelConverter/third-party/spdlog/include/spdlog/cfg/helpers.h b/third-party/spdlog/include/spdlog/cfg/helpers.h similarity index 100% rename from ModelConverter/third-party/spdlog/include/spdlog/cfg/helpers.h rename to third-party/spdlog/include/spdlog/cfg/helpers.h diff --git a/ModelConverter/third-party/spdlog/include/spdlog/common-inl.h b/third-party/spdlog/include/spdlog/common-inl.h similarity index 100% rename from ModelConverter/third-party/spdlog/include/spdlog/common-inl.h rename to third-party/spdlog/include/spdlog/common-inl.h diff --git a/ModelConverter/third-party/spdlog/include/spdlog/common.h b/third-party/spdlog/include/spdlog/common.h similarity index 100% rename from ModelConverter/third-party/spdlog/include/spdlog/common.h rename to third-party/spdlog/include/spdlog/common.h diff --git a/ModelConverter/third-party/spdlog/include/spdlog/details/backtracer-inl.h b/third-party/spdlog/include/spdlog/details/backtracer-inl.h similarity index 100% rename from ModelConverter/third-party/spdlog/include/spdlog/details/backtracer-inl.h rename to third-party/spdlog/include/spdlog/details/backtracer-inl.h diff --git a/ModelConverter/third-party/spdlog/include/spdlog/details/backtracer.h b/third-party/spdlog/include/spdlog/details/backtracer.h similarity index 100% rename from ModelConverter/third-party/spdlog/include/spdlog/details/backtracer.h rename to third-party/spdlog/include/spdlog/details/backtracer.h diff --git a/ModelConverter/third-party/spdlog/include/spdlog/details/circular_q.h b/third-party/spdlog/include/spdlog/details/circular_q.h similarity index 100% rename from ModelConverter/third-party/spdlog/include/spdlog/details/circular_q.h rename to third-party/spdlog/include/spdlog/details/circular_q.h diff --git a/ModelConverter/third-party/spdlog/include/spdlog/details/console_globals.h b/third-party/spdlog/include/spdlog/details/console_globals.h similarity index 100% rename from ModelConverter/third-party/spdlog/include/spdlog/details/console_globals.h rename to third-party/spdlog/include/spdlog/details/console_globals.h diff --git a/ModelConverter/third-party/spdlog/include/spdlog/details/file_helper-inl.h b/third-party/spdlog/include/spdlog/details/file_helper-inl.h similarity index 100% rename from ModelConverter/third-party/spdlog/include/spdlog/details/file_helper-inl.h rename to third-party/spdlog/include/spdlog/details/file_helper-inl.h diff --git a/ModelConverter/third-party/spdlog/include/spdlog/details/file_helper.h b/third-party/spdlog/include/spdlog/details/file_helper.h similarity index 100% rename from ModelConverter/third-party/spdlog/include/spdlog/details/file_helper.h rename to third-party/spdlog/include/spdlog/details/file_helper.h diff --git a/ModelConverter/third-party/spdlog/include/spdlog/details/fmt_helper.h b/third-party/spdlog/include/spdlog/details/fmt_helper.h similarity index 100% rename from ModelConverter/third-party/spdlog/include/spdlog/details/fmt_helper.h rename to third-party/spdlog/include/spdlog/details/fmt_helper.h diff --git a/ModelConverter/third-party/spdlog/include/spdlog/details/log_msg-inl.h b/third-party/spdlog/include/spdlog/details/log_msg-inl.h similarity index 100% rename from ModelConverter/third-party/spdlog/include/spdlog/details/log_msg-inl.h rename to third-party/spdlog/include/spdlog/details/log_msg-inl.h diff --git a/ModelConverter/third-party/spdlog/include/spdlog/details/log_msg.h b/third-party/spdlog/include/spdlog/details/log_msg.h similarity index 100% rename from ModelConverter/third-party/spdlog/include/spdlog/details/log_msg.h rename to third-party/spdlog/include/spdlog/details/log_msg.h diff --git a/ModelConverter/third-party/spdlog/include/spdlog/details/log_msg_buffer-inl.h b/third-party/spdlog/include/spdlog/details/log_msg_buffer-inl.h similarity index 100% rename from ModelConverter/third-party/spdlog/include/spdlog/details/log_msg_buffer-inl.h rename to third-party/spdlog/include/spdlog/details/log_msg_buffer-inl.h diff --git a/ModelConverter/third-party/spdlog/include/spdlog/details/log_msg_buffer.h b/third-party/spdlog/include/spdlog/details/log_msg_buffer.h similarity index 100% rename from ModelConverter/third-party/spdlog/include/spdlog/details/log_msg_buffer.h rename to third-party/spdlog/include/spdlog/details/log_msg_buffer.h diff --git a/ModelConverter/third-party/spdlog/include/spdlog/details/mpmc_blocking_q.h b/third-party/spdlog/include/spdlog/details/mpmc_blocking_q.h similarity index 100% rename from ModelConverter/third-party/spdlog/include/spdlog/details/mpmc_blocking_q.h rename to third-party/spdlog/include/spdlog/details/mpmc_blocking_q.h diff --git a/ModelConverter/third-party/spdlog/include/spdlog/details/null_mutex.h b/third-party/spdlog/include/spdlog/details/null_mutex.h similarity index 100% rename from ModelConverter/third-party/spdlog/include/spdlog/details/null_mutex.h rename to third-party/spdlog/include/spdlog/details/null_mutex.h diff --git a/ModelConverter/third-party/spdlog/include/spdlog/details/os-inl.h b/third-party/spdlog/include/spdlog/details/os-inl.h similarity index 100% rename from ModelConverter/third-party/spdlog/include/spdlog/details/os-inl.h rename to third-party/spdlog/include/spdlog/details/os-inl.h diff --git a/ModelConverter/third-party/spdlog/include/spdlog/details/os.h b/third-party/spdlog/include/spdlog/details/os.h similarity index 100% rename from ModelConverter/third-party/spdlog/include/spdlog/details/os.h rename to third-party/spdlog/include/spdlog/details/os.h diff --git a/ModelConverter/third-party/spdlog/include/spdlog/details/periodic_worker-inl.h b/third-party/spdlog/include/spdlog/details/periodic_worker-inl.h similarity index 100% rename from ModelConverter/third-party/spdlog/include/spdlog/details/periodic_worker-inl.h rename to third-party/spdlog/include/spdlog/details/periodic_worker-inl.h diff --git a/ModelConverter/third-party/spdlog/include/spdlog/details/periodic_worker.h b/third-party/spdlog/include/spdlog/details/periodic_worker.h similarity index 100% rename from ModelConverter/third-party/spdlog/include/spdlog/details/periodic_worker.h rename to third-party/spdlog/include/spdlog/details/periodic_worker.h diff --git a/ModelConverter/third-party/spdlog/include/spdlog/details/registry-inl.h b/third-party/spdlog/include/spdlog/details/registry-inl.h similarity index 100% rename from ModelConverter/third-party/spdlog/include/spdlog/details/registry-inl.h rename to third-party/spdlog/include/spdlog/details/registry-inl.h diff --git a/ModelConverter/third-party/spdlog/include/spdlog/details/registry.h b/third-party/spdlog/include/spdlog/details/registry.h similarity index 100% rename from ModelConverter/third-party/spdlog/include/spdlog/details/registry.h rename to third-party/spdlog/include/spdlog/details/registry.h diff --git a/ModelConverter/third-party/spdlog/include/spdlog/details/synchronous_factory.h b/third-party/spdlog/include/spdlog/details/synchronous_factory.h similarity index 100% rename from ModelConverter/third-party/spdlog/include/spdlog/details/synchronous_factory.h rename to third-party/spdlog/include/spdlog/details/synchronous_factory.h diff --git a/ModelConverter/third-party/spdlog/include/spdlog/details/tcp_client-windows.h b/third-party/spdlog/include/spdlog/details/tcp_client-windows.h similarity index 100% rename from ModelConverter/third-party/spdlog/include/spdlog/details/tcp_client-windows.h rename to third-party/spdlog/include/spdlog/details/tcp_client-windows.h diff --git a/ModelConverter/third-party/spdlog/include/spdlog/details/tcp_client.h b/third-party/spdlog/include/spdlog/details/tcp_client.h similarity index 100% rename from ModelConverter/third-party/spdlog/include/spdlog/details/tcp_client.h rename to third-party/spdlog/include/spdlog/details/tcp_client.h diff --git a/ModelConverter/third-party/spdlog/include/spdlog/details/thread_pool-inl.h b/third-party/spdlog/include/spdlog/details/thread_pool-inl.h similarity index 100% rename from ModelConverter/third-party/spdlog/include/spdlog/details/thread_pool-inl.h rename to third-party/spdlog/include/spdlog/details/thread_pool-inl.h diff --git a/ModelConverter/third-party/spdlog/include/spdlog/details/thread_pool.h b/third-party/spdlog/include/spdlog/details/thread_pool.h similarity index 100% rename from ModelConverter/third-party/spdlog/include/spdlog/details/thread_pool.h rename to third-party/spdlog/include/spdlog/details/thread_pool.h diff --git a/ModelConverter/third-party/spdlog/include/spdlog/details/udp_client-windows.h b/third-party/spdlog/include/spdlog/details/udp_client-windows.h similarity index 100% rename from ModelConverter/third-party/spdlog/include/spdlog/details/udp_client-windows.h rename to third-party/spdlog/include/spdlog/details/udp_client-windows.h diff --git a/ModelConverter/third-party/spdlog/include/spdlog/details/udp_client.h b/third-party/spdlog/include/spdlog/details/udp_client.h similarity index 100% rename from ModelConverter/third-party/spdlog/include/spdlog/details/udp_client.h rename to third-party/spdlog/include/spdlog/details/udp_client.h diff --git a/ModelConverter/third-party/spdlog/include/spdlog/details/windows_include.h b/third-party/spdlog/include/spdlog/details/windows_include.h similarity index 100% rename from ModelConverter/third-party/spdlog/include/spdlog/details/windows_include.h rename to third-party/spdlog/include/spdlog/details/windows_include.h diff --git a/ModelConverter/third-party/spdlog/include/spdlog/fmt/bin_to_hex.h b/third-party/spdlog/include/spdlog/fmt/bin_to_hex.h similarity index 100% rename from ModelConverter/third-party/spdlog/include/spdlog/fmt/bin_to_hex.h rename to third-party/spdlog/include/spdlog/fmt/bin_to_hex.h diff --git a/ModelConverter/third-party/spdlog/include/spdlog/fmt/bundled/args.h b/third-party/spdlog/include/spdlog/fmt/bundled/args.h similarity index 100% rename from ModelConverter/third-party/spdlog/include/spdlog/fmt/bundled/args.h rename to third-party/spdlog/include/spdlog/fmt/bundled/args.h diff --git a/ModelConverter/third-party/spdlog/include/spdlog/fmt/bundled/chrono.h b/third-party/spdlog/include/spdlog/fmt/bundled/chrono.h similarity index 100% rename from ModelConverter/third-party/spdlog/include/spdlog/fmt/bundled/chrono.h rename to third-party/spdlog/include/spdlog/fmt/bundled/chrono.h diff --git a/ModelConverter/third-party/spdlog/include/spdlog/fmt/bundled/color.h b/third-party/spdlog/include/spdlog/fmt/bundled/color.h similarity index 100% rename from ModelConverter/third-party/spdlog/include/spdlog/fmt/bundled/color.h rename to third-party/spdlog/include/spdlog/fmt/bundled/color.h diff --git a/ModelConverter/third-party/spdlog/include/spdlog/fmt/bundled/compile.h b/third-party/spdlog/include/spdlog/fmt/bundled/compile.h similarity index 100% rename from ModelConverter/third-party/spdlog/include/spdlog/fmt/bundled/compile.h rename to third-party/spdlog/include/spdlog/fmt/bundled/compile.h diff --git a/ModelConverter/third-party/spdlog/include/spdlog/fmt/bundled/core.h b/third-party/spdlog/include/spdlog/fmt/bundled/core.h similarity index 100% rename from ModelConverter/third-party/spdlog/include/spdlog/fmt/bundled/core.h rename to third-party/spdlog/include/spdlog/fmt/bundled/core.h diff --git a/ModelConverter/third-party/spdlog/include/spdlog/fmt/bundled/fmt.license.rst b/third-party/spdlog/include/spdlog/fmt/bundled/fmt.license.rst similarity index 100% rename from ModelConverter/third-party/spdlog/include/spdlog/fmt/bundled/fmt.license.rst rename to third-party/spdlog/include/spdlog/fmt/bundled/fmt.license.rst diff --git a/ModelConverter/third-party/spdlog/include/spdlog/fmt/bundled/format-inl.h b/third-party/spdlog/include/spdlog/fmt/bundled/format-inl.h similarity index 100% rename from ModelConverter/third-party/spdlog/include/spdlog/fmt/bundled/format-inl.h rename to third-party/spdlog/include/spdlog/fmt/bundled/format-inl.h diff --git a/ModelConverter/third-party/spdlog/include/spdlog/fmt/bundled/format.h b/third-party/spdlog/include/spdlog/fmt/bundled/format.h similarity index 100% rename from ModelConverter/third-party/spdlog/include/spdlog/fmt/bundled/format.h rename to third-party/spdlog/include/spdlog/fmt/bundled/format.h diff --git a/ModelConverter/third-party/spdlog/include/spdlog/fmt/bundled/locale.h b/third-party/spdlog/include/spdlog/fmt/bundled/locale.h similarity index 100% rename from ModelConverter/third-party/spdlog/include/spdlog/fmt/bundled/locale.h rename to third-party/spdlog/include/spdlog/fmt/bundled/locale.h diff --git a/ModelConverter/third-party/spdlog/include/spdlog/fmt/bundled/os.h b/third-party/spdlog/include/spdlog/fmt/bundled/os.h similarity index 100% rename from ModelConverter/third-party/spdlog/include/spdlog/fmt/bundled/os.h rename to third-party/spdlog/include/spdlog/fmt/bundled/os.h diff --git a/ModelConverter/third-party/spdlog/include/spdlog/fmt/bundled/ostream.h b/third-party/spdlog/include/spdlog/fmt/bundled/ostream.h similarity index 100% rename from ModelConverter/third-party/spdlog/include/spdlog/fmt/bundled/ostream.h rename to third-party/spdlog/include/spdlog/fmt/bundled/ostream.h diff --git a/ModelConverter/third-party/spdlog/include/spdlog/fmt/bundled/printf.h b/third-party/spdlog/include/spdlog/fmt/bundled/printf.h similarity index 100% rename from ModelConverter/third-party/spdlog/include/spdlog/fmt/bundled/printf.h rename to third-party/spdlog/include/spdlog/fmt/bundled/printf.h diff --git a/ModelConverter/third-party/spdlog/include/spdlog/fmt/bundled/ranges.h b/third-party/spdlog/include/spdlog/fmt/bundled/ranges.h similarity index 100% rename from ModelConverter/third-party/spdlog/include/spdlog/fmt/bundled/ranges.h rename to third-party/spdlog/include/spdlog/fmt/bundled/ranges.h diff --git a/ModelConverter/third-party/spdlog/include/spdlog/fmt/bundled/xchar.h b/third-party/spdlog/include/spdlog/fmt/bundled/xchar.h similarity index 100% rename from ModelConverter/third-party/spdlog/include/spdlog/fmt/bundled/xchar.h rename to third-party/spdlog/include/spdlog/fmt/bundled/xchar.h diff --git a/ModelConverter/third-party/spdlog/include/spdlog/fmt/chrono.h b/third-party/spdlog/include/spdlog/fmt/chrono.h similarity index 100% rename from ModelConverter/third-party/spdlog/include/spdlog/fmt/chrono.h rename to third-party/spdlog/include/spdlog/fmt/chrono.h diff --git a/ModelConverter/third-party/spdlog/include/spdlog/fmt/compile.h b/third-party/spdlog/include/spdlog/fmt/compile.h similarity index 100% rename from ModelConverter/third-party/spdlog/include/spdlog/fmt/compile.h rename to third-party/spdlog/include/spdlog/fmt/compile.h diff --git a/ModelConverter/third-party/spdlog/include/spdlog/fmt/fmt.h b/third-party/spdlog/include/spdlog/fmt/fmt.h similarity index 100% rename from ModelConverter/third-party/spdlog/include/spdlog/fmt/fmt.h rename to third-party/spdlog/include/spdlog/fmt/fmt.h diff --git a/ModelConverter/third-party/spdlog/include/spdlog/fmt/ostr.h b/third-party/spdlog/include/spdlog/fmt/ostr.h similarity index 100% rename from ModelConverter/third-party/spdlog/include/spdlog/fmt/ostr.h rename to third-party/spdlog/include/spdlog/fmt/ostr.h diff --git a/ModelConverter/third-party/spdlog/include/spdlog/fmt/ranges.h b/third-party/spdlog/include/spdlog/fmt/ranges.h similarity index 100% rename from ModelConverter/third-party/spdlog/include/spdlog/fmt/ranges.h rename to third-party/spdlog/include/spdlog/fmt/ranges.h diff --git a/ModelConverter/third-party/spdlog/include/spdlog/fmt/xchar.h b/third-party/spdlog/include/spdlog/fmt/xchar.h similarity index 100% rename from ModelConverter/third-party/spdlog/include/spdlog/fmt/xchar.h rename to third-party/spdlog/include/spdlog/fmt/xchar.h diff --git a/ModelConverter/third-party/spdlog/include/spdlog/formatter.h b/third-party/spdlog/include/spdlog/formatter.h similarity index 100% rename from ModelConverter/third-party/spdlog/include/spdlog/formatter.h rename to third-party/spdlog/include/spdlog/formatter.h diff --git a/ModelConverter/third-party/spdlog/include/spdlog/fwd.h b/third-party/spdlog/include/spdlog/fwd.h similarity index 100% rename from ModelConverter/third-party/spdlog/include/spdlog/fwd.h rename to third-party/spdlog/include/spdlog/fwd.h diff --git a/ModelConverter/third-party/spdlog/include/spdlog/logger-inl.h b/third-party/spdlog/include/spdlog/logger-inl.h similarity index 100% rename from ModelConverter/third-party/spdlog/include/spdlog/logger-inl.h rename to third-party/spdlog/include/spdlog/logger-inl.h diff --git a/ModelConverter/third-party/spdlog/include/spdlog/logger.h b/third-party/spdlog/include/spdlog/logger.h similarity index 100% rename from ModelConverter/third-party/spdlog/include/spdlog/logger.h rename to third-party/spdlog/include/spdlog/logger.h diff --git a/ModelConverter/third-party/spdlog/include/spdlog/pattern_formatter-inl.h b/third-party/spdlog/include/spdlog/pattern_formatter-inl.h similarity index 100% rename from ModelConverter/third-party/spdlog/include/spdlog/pattern_formatter-inl.h rename to third-party/spdlog/include/spdlog/pattern_formatter-inl.h diff --git a/ModelConverter/third-party/spdlog/include/spdlog/pattern_formatter.h b/third-party/spdlog/include/spdlog/pattern_formatter.h similarity index 100% rename from ModelConverter/third-party/spdlog/include/spdlog/pattern_formatter.h rename to third-party/spdlog/include/spdlog/pattern_formatter.h diff --git a/ModelConverter/third-party/spdlog/include/spdlog/sinks/android_sink.h b/third-party/spdlog/include/spdlog/sinks/android_sink.h similarity index 100% rename from ModelConverter/third-party/spdlog/include/spdlog/sinks/android_sink.h rename to third-party/spdlog/include/spdlog/sinks/android_sink.h diff --git a/ModelConverter/third-party/spdlog/include/spdlog/sinks/ansicolor_sink-inl.h b/third-party/spdlog/include/spdlog/sinks/ansicolor_sink-inl.h similarity index 100% rename from ModelConverter/third-party/spdlog/include/spdlog/sinks/ansicolor_sink-inl.h rename to third-party/spdlog/include/spdlog/sinks/ansicolor_sink-inl.h diff --git a/ModelConverter/third-party/spdlog/include/spdlog/sinks/ansicolor_sink.h b/third-party/spdlog/include/spdlog/sinks/ansicolor_sink.h similarity index 100% rename from ModelConverter/third-party/spdlog/include/spdlog/sinks/ansicolor_sink.h rename to third-party/spdlog/include/spdlog/sinks/ansicolor_sink.h diff --git a/ModelConverter/third-party/spdlog/include/spdlog/sinks/base_sink-inl.h b/third-party/spdlog/include/spdlog/sinks/base_sink-inl.h similarity index 100% rename from ModelConverter/third-party/spdlog/include/spdlog/sinks/base_sink-inl.h rename to third-party/spdlog/include/spdlog/sinks/base_sink-inl.h diff --git a/ModelConverter/third-party/spdlog/include/spdlog/sinks/base_sink.h b/third-party/spdlog/include/spdlog/sinks/base_sink.h similarity index 100% rename from ModelConverter/third-party/spdlog/include/spdlog/sinks/base_sink.h rename to third-party/spdlog/include/spdlog/sinks/base_sink.h diff --git a/ModelConverter/third-party/spdlog/include/spdlog/sinks/basic_file_sink-inl.h b/third-party/spdlog/include/spdlog/sinks/basic_file_sink-inl.h similarity index 100% rename from ModelConverter/third-party/spdlog/include/spdlog/sinks/basic_file_sink-inl.h rename to third-party/spdlog/include/spdlog/sinks/basic_file_sink-inl.h diff --git a/ModelConverter/third-party/spdlog/include/spdlog/sinks/basic_file_sink.h b/third-party/spdlog/include/spdlog/sinks/basic_file_sink.h similarity index 100% rename from ModelConverter/third-party/spdlog/include/spdlog/sinks/basic_file_sink.h rename to third-party/spdlog/include/spdlog/sinks/basic_file_sink.h diff --git a/ModelConverter/third-party/spdlog/include/spdlog/sinks/daily_file_sink.h b/third-party/spdlog/include/spdlog/sinks/daily_file_sink.h similarity index 100% rename from ModelConverter/third-party/spdlog/include/spdlog/sinks/daily_file_sink.h rename to third-party/spdlog/include/spdlog/sinks/daily_file_sink.h diff --git a/ModelConverter/third-party/spdlog/include/spdlog/sinks/dist_sink.h b/third-party/spdlog/include/spdlog/sinks/dist_sink.h similarity index 100% rename from ModelConverter/third-party/spdlog/include/spdlog/sinks/dist_sink.h rename to third-party/spdlog/include/spdlog/sinks/dist_sink.h diff --git a/ModelConverter/third-party/spdlog/include/spdlog/sinks/dup_filter_sink.h b/third-party/spdlog/include/spdlog/sinks/dup_filter_sink.h similarity index 100% rename from ModelConverter/third-party/spdlog/include/spdlog/sinks/dup_filter_sink.h rename to third-party/spdlog/include/spdlog/sinks/dup_filter_sink.h diff --git a/ModelConverter/third-party/spdlog/include/spdlog/sinks/hourly_file_sink.h b/third-party/spdlog/include/spdlog/sinks/hourly_file_sink.h similarity index 100% rename from ModelConverter/third-party/spdlog/include/spdlog/sinks/hourly_file_sink.h rename to third-party/spdlog/include/spdlog/sinks/hourly_file_sink.h diff --git a/ModelConverter/third-party/spdlog/include/spdlog/sinks/mongo_sink.h b/third-party/spdlog/include/spdlog/sinks/mongo_sink.h similarity index 100% rename from ModelConverter/third-party/spdlog/include/spdlog/sinks/mongo_sink.h rename to third-party/spdlog/include/spdlog/sinks/mongo_sink.h diff --git a/ModelConverter/third-party/spdlog/include/spdlog/sinks/msvc_sink.h b/third-party/spdlog/include/spdlog/sinks/msvc_sink.h similarity index 100% rename from ModelConverter/third-party/spdlog/include/spdlog/sinks/msvc_sink.h rename to third-party/spdlog/include/spdlog/sinks/msvc_sink.h diff --git a/ModelConverter/third-party/spdlog/include/spdlog/sinks/null_sink.h b/third-party/spdlog/include/spdlog/sinks/null_sink.h similarity index 100% rename from ModelConverter/third-party/spdlog/include/spdlog/sinks/null_sink.h rename to third-party/spdlog/include/spdlog/sinks/null_sink.h diff --git a/ModelConverter/third-party/spdlog/include/spdlog/sinks/ostream_sink.h b/third-party/spdlog/include/spdlog/sinks/ostream_sink.h similarity index 100% rename from ModelConverter/third-party/spdlog/include/spdlog/sinks/ostream_sink.h rename to third-party/spdlog/include/spdlog/sinks/ostream_sink.h diff --git a/ModelConverter/third-party/spdlog/include/spdlog/sinks/qt_sinks.h b/third-party/spdlog/include/spdlog/sinks/qt_sinks.h similarity index 100% rename from ModelConverter/third-party/spdlog/include/spdlog/sinks/qt_sinks.h rename to third-party/spdlog/include/spdlog/sinks/qt_sinks.h diff --git a/ModelConverter/third-party/spdlog/include/spdlog/sinks/ringbuffer_sink.h b/third-party/spdlog/include/spdlog/sinks/ringbuffer_sink.h similarity index 100% rename from ModelConverter/third-party/spdlog/include/spdlog/sinks/ringbuffer_sink.h rename to third-party/spdlog/include/spdlog/sinks/ringbuffer_sink.h diff --git a/ModelConverter/third-party/spdlog/include/spdlog/sinks/rotating_file_sink-inl.h b/third-party/spdlog/include/spdlog/sinks/rotating_file_sink-inl.h similarity index 100% rename from ModelConverter/third-party/spdlog/include/spdlog/sinks/rotating_file_sink-inl.h rename to third-party/spdlog/include/spdlog/sinks/rotating_file_sink-inl.h diff --git a/ModelConverter/third-party/spdlog/include/spdlog/sinks/rotating_file_sink.h b/third-party/spdlog/include/spdlog/sinks/rotating_file_sink.h similarity index 100% rename from ModelConverter/third-party/spdlog/include/spdlog/sinks/rotating_file_sink.h rename to third-party/spdlog/include/spdlog/sinks/rotating_file_sink.h diff --git a/ModelConverter/third-party/spdlog/include/spdlog/sinks/sink-inl.h b/third-party/spdlog/include/spdlog/sinks/sink-inl.h similarity index 100% rename from ModelConverter/third-party/spdlog/include/spdlog/sinks/sink-inl.h rename to third-party/spdlog/include/spdlog/sinks/sink-inl.h diff --git a/ModelConverter/third-party/spdlog/include/spdlog/sinks/sink.h b/third-party/spdlog/include/spdlog/sinks/sink.h similarity index 100% rename from ModelConverter/third-party/spdlog/include/spdlog/sinks/sink.h rename to third-party/spdlog/include/spdlog/sinks/sink.h diff --git a/ModelConverter/third-party/spdlog/include/spdlog/sinks/stdout_color_sinks-inl.h b/third-party/spdlog/include/spdlog/sinks/stdout_color_sinks-inl.h similarity index 100% rename from ModelConverter/third-party/spdlog/include/spdlog/sinks/stdout_color_sinks-inl.h rename to third-party/spdlog/include/spdlog/sinks/stdout_color_sinks-inl.h diff --git a/ModelConverter/third-party/spdlog/include/spdlog/sinks/stdout_color_sinks.h b/third-party/spdlog/include/spdlog/sinks/stdout_color_sinks.h similarity index 100% rename from ModelConverter/third-party/spdlog/include/spdlog/sinks/stdout_color_sinks.h rename to third-party/spdlog/include/spdlog/sinks/stdout_color_sinks.h diff --git a/ModelConverter/third-party/spdlog/include/spdlog/sinks/stdout_sinks-inl.h b/third-party/spdlog/include/spdlog/sinks/stdout_sinks-inl.h similarity index 100% rename from ModelConverter/third-party/spdlog/include/spdlog/sinks/stdout_sinks-inl.h rename to third-party/spdlog/include/spdlog/sinks/stdout_sinks-inl.h diff --git a/ModelConverter/third-party/spdlog/include/spdlog/sinks/stdout_sinks.h b/third-party/spdlog/include/spdlog/sinks/stdout_sinks.h similarity index 100% rename from ModelConverter/third-party/spdlog/include/spdlog/sinks/stdout_sinks.h rename to third-party/spdlog/include/spdlog/sinks/stdout_sinks.h diff --git a/ModelConverter/third-party/spdlog/include/spdlog/sinks/syslog_sink.h b/third-party/spdlog/include/spdlog/sinks/syslog_sink.h similarity index 100% rename from ModelConverter/third-party/spdlog/include/spdlog/sinks/syslog_sink.h rename to third-party/spdlog/include/spdlog/sinks/syslog_sink.h diff --git a/ModelConverter/third-party/spdlog/include/spdlog/sinks/systemd_sink.h b/third-party/spdlog/include/spdlog/sinks/systemd_sink.h similarity index 100% rename from ModelConverter/third-party/spdlog/include/spdlog/sinks/systemd_sink.h rename to third-party/spdlog/include/spdlog/sinks/systemd_sink.h diff --git a/ModelConverter/third-party/spdlog/include/spdlog/sinks/tcp_sink.h b/third-party/spdlog/include/spdlog/sinks/tcp_sink.h similarity index 100% rename from ModelConverter/third-party/spdlog/include/spdlog/sinks/tcp_sink.h rename to third-party/spdlog/include/spdlog/sinks/tcp_sink.h diff --git a/ModelConverter/third-party/spdlog/include/spdlog/sinks/udp_sink.h b/third-party/spdlog/include/spdlog/sinks/udp_sink.h similarity index 100% rename from ModelConverter/third-party/spdlog/include/spdlog/sinks/udp_sink.h rename to third-party/spdlog/include/spdlog/sinks/udp_sink.h diff --git a/ModelConverter/third-party/spdlog/include/spdlog/sinks/win_eventlog_sink.h b/third-party/spdlog/include/spdlog/sinks/win_eventlog_sink.h similarity index 100% rename from ModelConverter/third-party/spdlog/include/spdlog/sinks/win_eventlog_sink.h rename to third-party/spdlog/include/spdlog/sinks/win_eventlog_sink.h diff --git a/ModelConverter/third-party/spdlog/include/spdlog/sinks/wincolor_sink-inl.h b/third-party/spdlog/include/spdlog/sinks/wincolor_sink-inl.h similarity index 100% rename from ModelConverter/third-party/spdlog/include/spdlog/sinks/wincolor_sink-inl.h rename to third-party/spdlog/include/spdlog/sinks/wincolor_sink-inl.h diff --git a/ModelConverter/third-party/spdlog/include/spdlog/sinks/wincolor_sink.h b/third-party/spdlog/include/spdlog/sinks/wincolor_sink.h similarity index 100% rename from ModelConverter/third-party/spdlog/include/spdlog/sinks/wincolor_sink.h rename to third-party/spdlog/include/spdlog/sinks/wincolor_sink.h diff --git a/ModelConverter/third-party/spdlog/include/spdlog/spdlog-inl.h b/third-party/spdlog/include/spdlog/spdlog-inl.h similarity index 100% rename from ModelConverter/third-party/spdlog/include/spdlog/spdlog-inl.h rename to third-party/spdlog/include/spdlog/spdlog-inl.h diff --git a/ModelConverter/third-party/spdlog/include/spdlog/spdlog.h b/third-party/spdlog/include/spdlog/spdlog.h similarity index 100% rename from ModelConverter/third-party/spdlog/include/spdlog/spdlog.h rename to third-party/spdlog/include/spdlog/spdlog.h diff --git a/ModelConverter/third-party/spdlog/include/spdlog/stopwatch.h b/third-party/spdlog/include/spdlog/stopwatch.h similarity index 100% rename from ModelConverter/third-party/spdlog/include/spdlog/stopwatch.h rename to third-party/spdlog/include/spdlog/stopwatch.h diff --git a/ModelConverter/third-party/spdlog/include/spdlog/tweakme.h b/third-party/spdlog/include/spdlog/tweakme.h similarity index 100% rename from ModelConverter/third-party/spdlog/include/spdlog/tweakme.h rename to third-party/spdlog/include/spdlog/tweakme.h diff --git a/ModelConverter/third-party/spdlog/include/spdlog/version.h b/third-party/spdlog/include/spdlog/version.h similarity index 100% rename from ModelConverter/third-party/spdlog/include/spdlog/version.h rename to third-party/spdlog/include/spdlog/version.h diff --git a/ModelConverter/stb_write_image.h b/third-party/stb/stb_write_image.h similarity index 100% rename from ModelConverter/stb_write_image.h rename to third-party/stb/stb_write_image.h