chore: update submodules

GameDevTecnico · Sep 28, 2023 · 1033f88 · 1033f88
1 parent 758e2aa
commit 1033f88
Show file tree

Hide file tree

Showing 12 changed files with 39 additions and 18 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -25,3 +25,9 @@
 [submodule "engine/lib/imgui"]
 	path = engine/lib/imgui
 	url = https://github.com/ocornut/imgui.git
+[submodule "core/lib/json"]
+	path = core/lib/json
+	url = https://github.com/nlohmann/json.git
+[submodule "core/lib/glad"]
+	path = core/lib/glad
+	url = [email protected]:Dav1dde/glad.git
diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
@@ -93,8 +93,10 @@ cubos_common_target_options(cubos-core)
 # Link dependencies
 
 if (WITH_OPENGL)
-    add_subdirectory(lib/glad)
-    target_link_libraries(cubos-core PRIVATE glad)
+    set(GLAD_SOUURCES_DIR "lib/glad")
+    add_subdirectory("${GLAD_SOUURCES_DIR}/cmake" glad_cmake)
+    glad_add_library(glad REPRODUCIBLE API gl:core=3.3)
+    target_link_libraries(cubos-core PUBLIC glad)
     target_compile_definitions(cubos-core PRIVATE WITH_OPENGL)
 endif ()
 
@@ -147,6 +149,7 @@ else ()
     find_package(spdlog REQUIRED)
 endif ()
 
+set(JSON_BuildTests OFF CACHE INTERNAL "")
 add_subdirectory(lib/json)
 
 add_subdirectory(lib/stduuid)
@@ -156,8 +159,8 @@ set(THREADS_PREFER_PTHREAD_FLAG ON)
 find_package(Threads REQUIRED)
 
 target_compile_definitions(cubos-core PUBLIC GLM_FORCE_SILENT_WARNINGS) # Needed for compilation to succeed on MSVC
-target_link_libraries(cubos-core PUBLIC glm::glm spdlog fmt::fmt json ${CMAKE_DL_LIBS})
-target_link_libraries(cubos-core PRIVATE glad Threads::Threads)
+target_link_libraries(cubos-core PUBLIC glm::glm spdlog nlohmann_json::nlohmann_json fmt::fmt ${CMAKE_DL_LIBS})
+target_link_libraries(cubos-core PRIVATE Threads::Threads)
 
 # Add core tests
 

diff --git a/core/lib/glad b/core/lib/glad
diff --git a/core/lib/glfw b/core/lib/glfw
diff --git a/core/lib/glm b/core/lib/glm
diff --git a/core/lib/json b/core/lib/json
diff --git a/core/lib/openal-soft b/core/lib/openal-soft
diff --git a/core/src/cubos/core/gl/ogl_render_device.cpp b/core/src/cubos/core/gl/ogl_render_device.cpp
@@ -4,7 +4,7 @@
 #include <string>
 #include <utility>
 
-#include <glad/glad.h>
+#include <glad/gl.h>
 
 #include <cubos/core/log.hpp>
 

diff --git a/core/src/cubos/core/io/glfw_window.cpp b/core/src/cubos/core/io/glfw_window.cpp
@@ -1,6 +1,6 @@
 #include "glfw_window.hpp"
 
-#include <glad/glad.h>
+#include <glad/gl.h>
 
 #include <cubos/core/log.hpp>
 
@@ -69,7 +69,7 @@ GLFWWindow::GLFWWindow(const std::string& title, const glm::ivec2& size)
 
     // Create OpenGL render device
     glfwMakeContextCurrent(mHandle);
-    if (gladLoadGLLoader((GLADloadproc)glfwGetProcAddress) == 0)
+    if (gladLoadGL(glfwGetProcAddress) == 0)
     {
         CUBOS_CRITICAL("OpenGL loader failed");
         abort();

diff --git a/engine/lib/imgui b/engine/lib/imgui
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -1,7 +1,7 @@
 # Flake used for development with nix
 {
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.11";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05";
     flake-utils.url = "github:numtide/flake-utils";
   };
 
@@ -13,6 +13,14 @@
       {
         devShell = pkgs.mkShell {
           buildInputs = with pkgs; [
+            xorg.libX11
+            xorg.libXrandr
+            xorg.libXinerama
+            xorg.libXcursor
+            xorg.libXi
+            libxkbcommon
+            libGL
+            libglvnd
             pkg-config
             cmake
             gcc
@@ -24,13 +32,15 @@
             graphviz
             clang_14
             doctest
-	    ccache
+            ccache
             lcov
             (python3.withPackages (ps: with ps; [
               jinja2
               pygments
-            ])) 
+            ]))
           ];
+
+          LD_LIBRARY_PATH = "/run/opengl-driver/lib:/run/opengl-driver-32/lib";
         };
       });
 }
+3 −16		.appveyor.yml
+0 −0		.github/CODEOWNERS
+116 −0		.github/workflows/build.yml
+0 −114		.travis.yml
+17 −2		CMake/GenerateMappings.cmake
+1 −1		CMake/modules/FindEpollShim.cmake
+12 −8		CMakeLists.txt
+250 −0		CONTRIBUTORS.md
+87 −229		README.md
+6 −14		deps/glad/vk_platform.h
+2,381 −353		deps/glad/vulkan.h
+348 −208		deps/glad_vulkan.c
+803 −127		deps/stb_image_write.h
+3 −3		docs/CONTRIBUTING.md
+0 −20		docs/Doxyfile.in
+2 −2		docs/SUPPORT.md
+1 −1		docs/build.dox
+1 −5		docs/compat.dox
+196 −119		docs/compile.dox
+18 −18		docs/context.dox
+21 −4		docs/input.dox
+1 −1		docs/intro.dox
+13 −0		docs/news.dox
+10 −3		docs/vulkan.dox
+33 −52		docs/window.dox
+7 −2		examples/CMakeLists.txt
+5 −5		examples/heightmap.c
+1 −1		examples/splitview.c
+76 −69		include/GLFW/glfw3.h
+138 −35		include/GLFW/glfw3native.h
+21 −16		src/CMakeLists.txt
+15 −5		src/cocoa_init.m
+1 −0		src/cocoa_joystick.h
+8 −7		src/cocoa_joystick.m
+6 −10		src/cocoa_monitor.m
+15 −7		src/cocoa_platform.h
+135 −44		src/cocoa_window.m
+6 −8		src/context.c
+25 −3		src/egl_context.c
+4 −2		src/egl_context.h
+0 −2		src/glfw_config.h.in
+13 −10		src/glx_context.c
+0 −2		src/glx_context.h
+100 −20		src/init.c
+53 −29		src/input.c
+12 −4		src/internal.h
+4 −4		src/linux_joystick.c
+1 −0		src/linux_joystick.h
+624 −99		src/mappings.h
+12 −3		src/mappings.h.in
+3 −5		src/monitor.c
+4 −4		src/nsgl_context.h
+1 −1		src/nsgl_context.m
+3 −0		src/null_window.c
+15 −1		src/osmesa_context.c
+0 −2		src/osmesa_context.h
+0 −2		src/posix_thread.h
+0 −1		src/posix_time.h
+2 −0		src/vulkan.c
+7 −5		src/wgl_context.c
+0 −2		src/wgl_context.h
+15 −14		src/win32_init.c
+7 −7		src/win32_joystick.c
+1 −0		src/win32_joystick.h
+13 −2		src/win32_monitor.c
+9 −20		src/win32_platform.h
+4 −20		src/win32_time.c
+138 −33		src/win32_window.c
+23 −24		src/window.c
+62 −791		src/wl_init.c
+62 −24		src/wl_monitor.c
+56 −42		src/wl_platform.h
+1,570 −679		src/wl_window.c
+65 −2		src/x11_init.c
+3 −4		src/x11_platform.h
+186 −200		src/x11_window.c
+2 −2		src/xkb_unicode.c
+3 −1		src/xkb_unicode.h
+7 −2		tests/CMakeLists.txt
+6 −0		tests/gamma.c
+101 −78		tests/glfwinfo.c
+3 −3		tests/iconify.c
+15 −9		tests/triangle-vulkan.c
+1 −1		.github/issue_template.md
+2 −5		backends/imgui_impl_allegro5.cpp
+2 −5		backends/imgui_impl_allegro5.h
+2 −5		backends/imgui_impl_android.cpp
+2 −5		backends/imgui_impl_android.h
+2 −5		backends/imgui_impl_dx10.cpp
+2 −5		backends/imgui_impl_dx10.h
+2 −5		backends/imgui_impl_dx11.cpp
+2 −5		backends/imgui_impl_dx11.h
+2 −5		backends/imgui_impl_dx12.cpp
+2 −5		backends/imgui_impl_dx12.h
+2 −5		backends/imgui_impl_dx9.cpp
+2 −5		backends/imgui_impl_dx9.h
+2 −8		backends/imgui_impl_glfw.cpp
+2 −5		backends/imgui_impl_glfw.h
+2 −5		backends/imgui_impl_glut.cpp
+2 −5		backends/imgui_impl_glut.h
+2 −5		backends/imgui_impl_metal.h
+2 −5		backends/imgui_impl_metal.mm
+2 −5		backends/imgui_impl_opengl2.cpp
+2 −5		backends/imgui_impl_opengl2.h
+2 −5		backends/imgui_impl_opengl3.cpp
+2 −5		backends/imgui_impl_opengl3.h
+2 −5		backends/imgui_impl_osx.h
+2 −5		backends/imgui_impl_osx.mm
+2 −5		backends/imgui_impl_sdl2.cpp
+2 −5		backends/imgui_impl_sdl2.h
+2 −5		backends/imgui_impl_sdl3.cpp
+2 −5		backends/imgui_impl_sdl3.h
+2 −6		backends/imgui_impl_sdlrenderer2.cpp
+0 −8		backends/imgui_impl_sdlrenderer2.h
+2 −6		backends/imgui_impl_sdlrenderer3.cpp
+0 −8		backends/imgui_impl_sdlrenderer3.h
+5 −8		backends/imgui_impl_vulkan.cpp
+5 −8		backends/imgui_impl_vulkan.h
+2 −5		backends/imgui_impl_wgpu.cpp
+2 −5		backends/imgui_impl_wgpu.h
+5 −29		backends/imgui_impl_win32.cpp
+2 −5		backends/imgui_impl_win32.h
+1 −76		docs/CHANGELOG.txt
+2 −2		docs/EXAMPLES.md
+2 −2		docs/FAQ.md
+24 −58		docs/FONTS.md
+1 −1		docs/README.md
+2 −6		examples/example_allegro5/main.cpp
+1 −6		examples/example_android_opengl3/main.cpp
+2 −6		examples/example_apple_metal/main.mm
+2 −6		examples/example_apple_opengl2/main.mm
+2 −6		examples/example_emscripten_wgpu/main.cpp
+2 −6		examples/example_glfw_metal/main.mm
+2 −6		examples/example_glfw_opengl2/main.cpp
+2 −6		examples/example_glfw_opengl3/main.cpp
+2 −6		examples/example_glfw_vulkan/main.cpp
+2 −6		examples/example_glut_opengl2/main.cpp
+2 −6		examples/example_sdl2_directx11/main.cpp
+2 −6		examples/example_sdl2_metal/main.mm
+2 −6		examples/example_sdl2_opengl2/main.cpp
+2 −6		examples/example_sdl2_opengl3/main.cpp
+2 −6		examples/example_sdl2_sdlrenderer2/main.cpp
+2 −6		examples/example_sdl2_vulkan/main.cpp
+2 −6		examples/example_sdl3_opengl3/main.cpp
+2 −6		examples/example_sdl3_sdlrenderer3/main.cpp
+2 −6		examples/example_win32_directx10/main.cpp
+2 −6		examples/example_win32_directx11/main.cpp
+2 −6		examples/example_win32_directx12/main.cpp
+2 −6		examples/example_win32_directx9/main.cpp
+3 −7		examples/example_win32_opengl3/main.cpp
+127 −189		imgui.cpp
+42 −49		imgui.h
+11 −27		imgui_demo.cpp
+40 −105		imgui_draw.cpp
+35 −118		imgui_internal.h
+29 −45		imgui_tables.cpp
+61 −302		imgui_widgets.cpp
+1 −4		imstb_textedit.h
+1 −1		misc/freetype/imgui_freetype.cpp