From f6e66159fad8471fb36c3bec1d0d1cdc5ff6906f Mon Sep 17 00:00:00 2001 From: jones Date: Fri, 8 Nov 2024 18:36:30 +0100 Subject: [PATCH] updated deps --- CMakeLists.txt | 4 ++-- ExternalLib/GLFW | 2 +- ExternalLib/GLM | 2 +- ExternalLib/IMGUI | 2 +- ExternalLib/STB | 2 +- ExternalLib/TOL | 2 +- README.md | 1 + Src/gui/GUI.cpp | 11 +++++------ 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e740a08..b3f6789 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -63,7 +63,7 @@ include(FetchContent) # include google test to project FetchContent_Declare( googletest - URL https://github.com/google/googletest/archive/58d77fa8070e8cec2dc1ed015d66b454c8d78850.zip + URL https://github.com/google/googletest/archive/df1544bcee0c7ce35cd5ea0b3eb8cc81855a4140.zip ) # For Windows: Prevent overriding the parent project's compiler/linker settings set(gtest_force_shared_crt ON CACHE BOOL "" FORCE) @@ -74,7 +74,7 @@ FetchContent_MakeAvailable(googletest) # You can also pick a specific commit, if you need to. FetchContent_Declare(GSL GIT_REPOSITORY "https://github.com/microsoft/GSL" - GIT_TAG "v4.0.0" + GIT_TAG "v4.1.0" ) FetchContent_MakeAvailable(GSL) diff --git a/ExternalLib/GLFW b/ExternalLib/GLFW index da6713c..b35641f 160000 --- a/ExternalLib/GLFW +++ b/ExternalLib/GLFW @@ -1 +1 @@ -Subproject commit da6713cd096a40a4512f468b34c189017e73f987 +Subproject commit b35641f4a3c62aa86a0b3c983d163bc0fe36026d diff --git a/ExternalLib/GLM b/ExternalLib/GLM index cc98465..33b4a62 160000 --- a/ExternalLib/GLM +++ b/ExternalLib/GLM @@ -1 +1 @@ -Subproject commit cc98465e3508535ba8c7f6208df934c156a018dc +Subproject commit 33b4a621a697a305bc3a7610d290677b96beb181 diff --git a/ExternalLib/IMGUI b/ExternalLib/IMGUI index 9aae45e..f401021 160000 --- a/ExternalLib/IMGUI +++ b/ExternalLib/IMGUI @@ -1 +1 @@ -Subproject commit 9aae45eb4a05a5a1f96be1ef37eb503a12ceb889 +Subproject commit f401021d5a5d56fe2304056c391e78f81c8d4b8f diff --git a/ExternalLib/STB b/ExternalLib/STB index af1a5bc..0dd01c2 160000 --- a/ExternalLib/STB +++ b/ExternalLib/STB @@ -1 +1 @@ -Subproject commit af1a5bc352164740c1cc1354942b1c6b72eacb8a +Subproject commit 0dd01c26ef47750512cdc1830581480c25a19f1d diff --git a/ExternalLib/TOL b/ExternalLib/TOL index 03a2f3a..5cd3842 160000 --- a/ExternalLib/TOL +++ b/ExternalLib/TOL @@ -1 +1 @@ -Subproject commit 03a2f3a46615da7da641c170b8823b3e0fb63110 +Subproject commit 5cd3842fdca3b06cc993801cff1825fc6d999068 diff --git a/README.md b/README.md index be5236b..b073210 100644 --- a/README.md +++ b/README.md @@ -103,6 +103,7 @@ With the provided CMake file you are able to built the project on Linux (Ubuntu and Windows. I do not provide support for MacOS. Be aware of the dependencies: * [OpenGL 4.6](https://www.opengl.org//) +* [GLAD](https://glad.dav1d.de/) * [glm](https://github.com/g-truc/glm) * [glfw](https://www.glfw.org/) * [tinyobjloader](https://github.com/tinyobjloader/tinyobjloader) diff --git a/Src/gui/GUI.cpp b/Src/gui/GUI.cpp index b7943c0..a7f42f5 100644 --- a/Src/gui/GUI.cpp +++ b/Src/gui/GUI.cpp @@ -1,15 +1,15 @@ #include "GUI.hpp" -#include "OpenGLRendererConfig.hpp" #include #include #include -#include #include +#include -#include "RepeatMode.hpp" #include "Clouds.hpp" +#include "OpenGLRendererConfig.hpp" +#include "RepeatMode.hpp" #include "host_device_shared.hpp" GUI::GUI() { @@ -206,9 +206,8 @@ void GUI::render(bool loading_in_progress, float progress, ImGui::Text("Application average %.3f ms/frame (%.1f FPS)", 1000.0f / ImGui::GetIO().Framerate, ImGui::GetIO().Framerate); // ImGui::ShowDemoWindow(); - - ImGui::Image((void*)(intptr_t)logo_tex.get_id(), ImVec2(200, 200), - ImVec2(0, 1), ImVec2(1, 0)); + // (void*)(intptr_t) + ImGui::Image(logo_tex.get_id(), ImVec2(200, 200), ImVec2(0, 1), ImVec2(1, 0)); ImGui::End();