updated deps

Kataglyphis · Nov 8, 2024 · f6e6615 · f6e6615
1 parent 74522d6
commit f6e6615
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 13 deletions.
diff --git 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
diff --git a/ExternalLib/GLM b/ExternalLib/GLM
diff --git a/ExternalLib/IMGUI b/ExternalLib/IMGUI
diff --git a/ExternalLib/STB b/ExternalLib/STB
diff --git a/ExternalLib/TOL b/ExternalLib/TOL
diff --git 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
@@ -1,15 +1,15 @@
 #include "GUI.hpp"
-#include "OpenGLRendererConfig.hpp"
 
 #include <imgui.h>
 #include <imgui_impl_glfw.h>
 #include <imgui_impl_opengl3.h>
 
-#include <sstream>
 #include <filesystem>
+#include <sstream>
 
-#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();
+15 −0		.github/ISSUE_TEMPLATE/1-stb_image-doesn-t-load-specific-image-correctly.md
+0 −0		.github/ISSUE_TEMPLATE/2-bug_report.md
+0 −0		.github/ISSUE_TEMPLATE/3-feature_request.md
+1 −0		.github/ISSUE_TEMPLATE/config.yml
+3 −0		.gitignore
+12 −9		README.md
+0 −0		deprecated/stb_image_resize.h
+2 −1		stb_c_lexer.h
+1 −1		stb_ds.h
+289 −198		stb_image.h
+10,601 −0		stb_image_resize2.h
+224 −0		stb_image_resize_test/dotimings.c
+2,738 −0		stb_image_resize_test/old_image_resize.h
+56 −0		stb_image_resize_test/oldir.c
+992 −0		stb_image_resize_test/stbirtest.c
+999 −0		stb_image_resize_test/vf_train.c
+428 −0		stb_perlin.h
+8 −6		stb_truetype.h
+3 −2		tests/image_test.dsp
+259 −0		tests/pngsuite/ref_results.csv
+9 −4		tests/resample_test.cpp
+1 −1		tests/resize.dsp
+1 −1		tests/stb.dsp
+3 −2		tests/test_c_compilation.c
+1 −1		tests/test_cpp_compilation.cpp
+47 −0		tests/test_png_paeth.c
+75 −0		tests/test_png_regress.c
+1 −1		tests/test_vorbis.c
+5 −3		tools/README.header.md
+2 −1		tools/README.list
+30 −0		.cirrus.yml
+15 −0		.github/FUNDING.yml
+115 −0		.github/workflows/wheels.yml
+2 −0		.gitignore
+9 −0		BUILD.bazel
+60 −4		CMakeLists.txt
+8 −0		MANIFEST.in
+9 −0		MODULE.bazel
+26 −15		README.md
+130 −125		azure-pipelines.yml
+20 −0		bootstrap-cmake-linux-with-pyhthon.sh
+9 −0		cmake/ClangClCMakeCompileRules.cmake
+14 −0		cmake/aarch64-linux-gnu.toolchain
+327 −0		cmake/clang-cl-msvc-windows.cmake
+327 −0		cmake/clang-cl-msvc-wsl.cmake
+17 −0		cmake/linux_i386.toolchain.cmake
+24 −0		cmake/llvm-mingw-cross.cmake
+20 −0		cmake/llvm-mingw-win64.cmake
+20 −0		cmake/mingw64-cross.cmake
+59 −0		cmake/sanitizers/FindASan.cmake
+57 −0		cmake/sanitizers/FindMSan.cmake
+94 −0		cmake/sanitizers/FindSanitizers.cmake
+65 −0		cmake/sanitizers/FindTSan.cmake
+46 −0		cmake/sanitizers/FindUBSan.cmake
+55 −0		cmake/sanitizers/asan-wrapper
+177 −0		cmake/sanitizers/sanitize-helpers.cmake
+1 −1		examples/obj_sticher/obj_writer.cc
+1 −0		examples/viewer/.gitignore
+29 −0		examples/viewer/CMakeLists.txt
+47 −23		examples/viewer/viewer.cc
+1 −1		loader_example.cc
+31 −0		models/cube-vertex-w-component.obj
+2 −0		models/invalid-relative-texture-index.obj
+1 −0		models/invalid-relative-vertex-index.obj
+39 −0		models/issue-319-002.obj
+27 −0		models/issue-319-003.obj
+12 −0		models/issue-330.obj
+2 −0		models/issue-356-leading-spaces-newmtl.mtl
+2 −0		models/issue-356-leading-spaces-newmtl.obj
+29 −0		pbr-mtl.md
+39 −0		pyproject.toml
+0 −6		python/MANIFEST.in
+1 −1		python/Makefile
+5 −8		python/README.md
+93 −8		python/bindings.cc
+0 −2		python/pyproject.toml
+72 −12		python/sample.py
+0 −131		python/setup.py
+1 −1		python/tiny_obj_loader.cc
+69 −0		setup.py
+48 −0		tests/tester.cc
+289 −123		tiny_obj_loader.h