diff --git a/.gitmodules b/.gitmodules index ecc2720..3d0aed5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,3 +7,6 @@ [submodule "vendor/toddcox"] path = vendor/toddcox url = https://github.com/JCRaymond/toddcox-faster.git +[submodule "vendor/yaml-cpp"] + path = vendor/yaml-cpp + url = git://github.com/jbeder/yaml-cpp.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 505fccf..3648714 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,6 +4,8 @@ project(toddcox-faster) set(CMAKE_CXX_STANDARD 17) add_subdirectory(vendor/toddcox) + +add_subdirectory(vendor/yaml-cpp) add_subdirectory(vendor/glad) add_subdirectory(vendor/glfw) add_subdirectory(vendor/glm) diff --git a/vendor/yaml-cpp b/vendor/yaml-cpp new file mode 160000 index 0000000..4edff1f --- /dev/null +++ b/vendor/yaml-cpp @@ -0,0 +1 @@ +Subproject commit 4edff1fa5dbfca16fc72d89870841bee89f8ef89 diff --git a/vis/CMakeLists.txt b/vis/CMakeLists.txt index cb493cd..e8e488d 100644 --- a/vis/CMakeLists.txt +++ b/vis/CMakeLists.txt @@ -12,8 +12,6 @@ add_custom_command( COMMENT "copied preses" ) -find_package(yaml-cpp REQUIRED) - add_library(vis-util INTERFACE) target_include_directories(vis-util INTERFACE include) diff --git a/vis/src/main.cpp b/vis/src/main.cpp index 64ea975..922d7ea 100644 --- a/vis/src/main.cpp +++ b/vis/src/main.cpp @@ -343,6 +343,10 @@ int main(int argc, char *argv[]) { return EXIT_FAILURE; } + glfwWindowHint(GLFW_VERSION_MAJOR, 4); + glfwWindowHint(GLFW_VERSION_MAJOR, 5); +// glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE); + auto window = glfwCreateWindow( 1920, 1080, "Coset Visualization", @@ -360,6 +364,8 @@ int main(int argc, char *argv[]) { glClear(GL_COLOR_BUFFER_BIT); glfwSwapBuffers(window); + std::cout << utilInfo(); + std::string config_file = "presets/default.yaml"; if (argc > 1) config_file = std::string(argv[1]);