allemang.d/toddcox-visualize
1
0
Fork 0
mirror of https://github.com/allemangD/toddcox-visualize.git synced 2025-11-10 12:02:47 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:allemangD/toddcox-visualize

Browse Source
This commit is contained in:
David Allemang
2020-05-20 22:27:59 -04:00
parent c742c28521 870f27d836
commit aa966c6917
5 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@@ -7,3 +7,6 @@
[submodule "vendor/toddcox"] [submodule "vendor/toddcox"]
path = vendor/toddcox path = vendor/toddcox
url = https://github.com/JCRaymond/toddcox-faster.git url = https://github.com/JCRaymond/toddcox-faster.git
[submodule "vendor/yaml-cpp"]
path = vendor/yaml-cpp
url = git://github.com/jbeder/yaml-cpp.git

2
CMakeLists.txt
View File

@@ -4,6 +4,8 @@ project(toddcox-faster)
set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD 17)
add_subdirectory(vendor/toddcox) add_subdirectory(vendor/toddcox)
add_subdirectory(vendor/yaml-cpp)
add_subdirectory(vendor/glad) add_subdirectory(vendor/glad)
add_subdirectory(vendor/glfw) add_subdirectory(vendor/glfw)
add_subdirectory(vendor/glm) add_subdirectory(vendor/glm)

1
vendor/yaml-cpp vendored Submodule

Submodule vendor/yaml-cpp added at 4edff1fa5d

2
vis/CMakeLists.txt
View File

@@ -12,8 +12,6 @@ add_custom_command(
COMMENT "copied preses" COMMENT "copied preses"
) )
find_package(yaml-cpp REQUIRED)
add_library(vis-util INTERFACE) add_library(vis-util INTERFACE)
target_include_directories(vis-util INTERFACE include) target_include_directories(vis-util INTERFACE include)

6
vis/src/main.cpp
View File

@@ -343,6 +343,10 @@ int main(int argc, char *argv[]) {
return EXIT_FAILURE; return EXIT_FAILURE;
} }
glfwWindowHint(GLFW_VERSION_MAJOR, 4);
glfwWindowHint(GLFW_VERSION_MAJOR, 5);
// glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);
auto window = glfwCreateWindow( auto window = glfwCreateWindow(
1920, 1080, 1920, 1080,
"Coset Visualization", "Coset Visualization",
@@ -360,6 +364,8 @@ int main(int argc, char *argv[]) {
glClear(GL_COLOR_BUFFER_BIT); glClear(GL_COLOR_BUFFER_BIT);
glfwSwapBuffers(window); glfwSwapBuffers(window);
std::cout << utilInfo();
std::string config_file = "presets/default.yaml"; std::string config_file = "presets/default.yaml";
if (argc > 1) config_file = std::string(argv[1]); if (argc > 1) config_file = std::string(argv[1]);