Merge pull request #8 from matthew-rindel/develop

Develop
open-siege · Oct 17, 2020 · fbdad00 · fbdad00
2 parents e11e5fd + de48991
commit fbdad00
Show file tree

Hide file tree

Showing 20 changed files with 1,868 additions and 566 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -9,15 +9,15 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR})
 
 file(GLOB MDL_SRC_FILES src/mdl-to-json/*.cpp)
 file(GLOB DTS_SRC_FILES src/dts-to-json/*.cpp)
-file(GLOB OBJ_SRC_FILES src/dts-to-obj/*.cpp)
+file(GLOB OBJ_SRC_FILES src/dts_renderable_shape.cpp src/dts-to-obj/*.cpp)
 file(GLOB JSON_SRC_FILES src/json-to-dts/*.cpp)
-file(GLOB DTS_VIEWER_SRC_FILES src/dts-viewer/*.cpp)
+file(GLOB DTS_VIEWER_SRC_FILES src/dts_renderable_shape.cpp src/3space-studio/utility.cpp src/3space-studio/*.cpp)
 
 add_executable(mdl-to-json ${MDL_SRC_FILES})
 add_executable(dts-to-json ${DTS_SRC_FILES})
 add_executable(dts-to-obj ${OBJ_SRC_FILES})
 add_executable(json-to-dts ${JSON_SRC_FILES})
-add_executable(dts-viewer ${DTS_VIEWER_SRC_FILES})
+add_executable(3space-studio ${DTS_VIEWER_SRC_FILES})
 
 include_directories(${CONAN_INCLUDE_DIRS})
 include_directories(packages/include)
@@ -27,18 +27,18 @@ conan_target_link_libraries(mdl-to-json)
 conan_target_link_libraries(dts-to-json)
 conan_target_link_libraries(dts-to-obj)
 conan_target_link_libraries(json-to-dts)
-target_link_libraries(dts-viewer PRIVATE ${CONAN_LIBS})
+target_link_libraries(3space-studio PRIVATE ${CONAN_LIBS})
 
 if(MSVC)
     target_compile_options(mdl-to-json PRIVATE /W4 /WX $<$<CONFIG:RELEASE>:/O2>)
     target_compile_options(dts-to-json PRIVATE /W4 /WX $<$<CONFIG:RELEASE>:/O2>)
-    target_compile_options(dts-to-obj PRIVATE /W4 /WX $<$<CONFIG:RELEASE>:/O2>)
+    target_compile_options(dts-to-obj PRIVATE /W3 /WX $<$<CONFIG:RELEASE>:/O2>)
     target_compile_options(json-to-dts PRIVATE /W4 /WX $<$<CONFIG:RELEASE>:/O2>)
-    target_compile_options(dts-viewer PRIVATE $<$<CONFIG:RELEASE>:/O2>)
+    target_compile_options(3space-studio PRIVATE $<$<CONFIG:RELEASE>:/O2>)
 else()
     target_compile_options(mdl-to-json PRIVATE -Wall -Wextra -Werror -pedantic $<$<CONFIG:RELEASE>:-O3>)
     target_compile_options(dts-to-json PRIVATE -Wall -Wextra -Werror -pedantic $<$<CONFIG:RELEASE>:-O3>)
     target_compile_options(dts-to-obj PRIVATE -Wall -Wextra -Werror -pedantic $<$<CONFIG:RELEASE>:-O3>)
     target_compile_options(json-to-dts PRIVATE -Wall -Wextra -Werror -pedantic $<$<CONFIG:RELEASE>:-O3>)
-    target_compile_options(dts-viewer PRIVATE $<$<CONFIG:RELEASE>:-O3>)
+    target_compile_options(3space-studio PRIVATE $<$<CONFIG:RELEASE>:-O3>)
 endif()
diff --git a/README.md b/README.md
diff --git a/conanfile.py b/conanfile.py
@@ -5,7 +5,7 @@ class LocalConanFile(ConanFile):
     system_requires = "opengl/system"
     build_requires = "cmake/3.17.3", "cppcheck_installer/2.0@bincrafters/stable"
     settings = "os", "compiler", "build_type", "arch"
-    requires = "toml11/3.4.0", "nlohmann_json/3.9.0", "boost_endian/1.69.0@bincrafters/stable", "imgui-sfml/2.1@bincrafters/stable", "wxwidgets/3.1.3@bincrafters/stable"
+    requires = "toml11/3.4.0", "nlohmann_json/3.9.0", "boost_endian/1.69.0@bincrafters/stable", "imgui-sfml/2.1@bincrafters/stable", "wxwidgets/3.1.3@bincrafters/stable", "glm/0.9.9.8"
     generators = "cmake", "virtualenv"
     build_folder = "build"