Fixed emscripten rendering

MadLadSquad · Oct 27, 2024 · 9d414d8 · 9d414d8
1 parent 279d32b
commit 9d414d8
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 24 deletions.
diff --git a/Framework/Renderer/OpenGL/OpenGLRenderer.cpp b/Framework/Renderer/OpenGL/OpenGLRenderer.cpp
@@ -2,12 +2,10 @@
 #include <Renderer.hpp>
 #include <ImGui/ImGui.hpp>
 #include <Interfaces/WindowInterface.hpp>
-#ifndef __APPLE__
-    #include <glad/include/glad/gl.h>
-#elif __EMSCRIPTEN__
-    #include <glad/include/glad/gles2.h>
-#else
+#ifdef __APPLE__
     #include <OpenGL/GL.h>
+#else
+    #include <glad/include/glad/gl.h>
 #endif
 #include <GLFW/glfw3.h>
 #include <imgui_impl_glfw.h>

diff --git a/Framework/Renderer/Window/Platform.cpp b/Framework/Renderer/Window/Platform.cpp
@@ -13,13 +13,11 @@
     #endif
 #endif
 
-#ifndef __APPLE__
-    #include <glad/include/glad/gl.h>
-#elif __EMSCRIPTEN__
-    #include <glad/include/glad/gles2.h>
-#else
+#ifdef __APPLE__
     #include <OpenGL/GL.h>
     #include "macOS/MacOSWindowPlatform.h"
+#else
+    #include <glad/include/glad/gl.h>
 #endif
 #include <GLFW/glfw3.h>
 #include <GLFW/glfw3native.h>

diff --git a/Framework/Renderer/Window/Window.cpp b/Framework/Renderer/Window/Window.cpp
@@ -1,11 +1,9 @@
 #define STB_IMAGE_IMPLEMENTATION
 #include "Window.hpp"
-#ifndef __APPLE__
-    #include <glad/include/glad/gl.h>
-#elif __EMSCRIPTEN__
-    #include <glad/include/glad/gles2.h>
-#else
+#ifdef __APPLE__
     #include <OpenGL/GL.h>
+#else
+    #include <glad/include/glad/gl.h>
 #endif
 #include <GLFW/glfw3.h>
 
@@ -196,9 +194,15 @@ void UImGui::WindowInternal::createWindow() noexcept
 
     if (!Renderer::data().bVulkan)
     {
-#if !__APPLE__ && !__EMSCRIPTEN__
+#if !__APPLE__
         const int version = gladLoadGL(glfwGetProcAddress);
-        Logger::log("Successfully loaded OpenGL ", ULOG_LOG_TYPE_SUCCESS, GLAD_VERSION_MAJOR(version), ".", GLAD_VERSION_MINOR(version));
+        Logger::log(
+    #ifdef EMSCRIPTEN
+            "Successfully loaded WebGL ",
+    #else
+            "Successfully loaded OpenGL ",
+    #endif
+            ULOG_LOG_TYPE_SUCCESS, GLAD_VERSION_MAJOR(version), ".", GLAD_VERSION_MINOR(version));
 #endif
         glEnable(GL_MULTISAMPLE);
         glEnable(GL_DEPTH_TEST);

diff --git a/Framework/cmake/SetupSources.cmake b/Framework/cmake/SetupSources.cmake
@@ -23,6 +23,8 @@ endif ()
 
 if (NOT APPLE)
     list(APPEND FRAMEWORK_INCLUDE_DIRS "${CMAKE_SOURCE_DIR}/Framework/ThirdParty/glad/include/")
+    file(GLOB_RECURSE GLAD_SRC "Framework/ThirdParty/glad/src/gl.c")
+    file(GLOB_RECURSE GLAD_HEAD "Framework/ThirdParty/glad/include/*.h")
 endif()
 
 include_directories(${FRAMEWORK_INCLUDE_DIRS})
@@ -41,9 +43,6 @@ if (EMSCRIPTEN)
             "Framework/ThirdParty/imgui/backends/imgui_impl_opengl3.h"
             "Framework/ThirdParty/imgui/backends/imgui_impl_wgpu.h"
             "Framework/ThirdParty/imgui/backends/imgui_impl_opengl3_loader.h")
-
-    file(GLOB_RECURSE GLAD_SRC "Framework/ThirdParty/glad/src/gles2.c")
-    file(GLOB_RECURSE GLAD_HEAD "Framework/ThirdParty/glad/include/*.h")
 else()
     file(GLOB_RECURSE IMGUI_SRC "Framework/ThirdParty/imgui/backends/imgui_impl_glfw.cpp"
             "Framework/ThirdParty/imgui/backends/imgui_impl_opengl3.cpp"
@@ -54,10 +53,6 @@ else()
             "Framework/ThirdParty/imgui/backends/imgui_impl_opengl3.h" "Framework/ThirdParty/imgui/misc/freetype/*.h"
             "Framework/ThirdParty/imgui/backends/imgui_impl_vulkan.h"
             "Framework/ThirdParty/imgui/backends/imgui_impl_opengl3_loader.h")
-    if (NOT APPLE)
-        file(GLOB_RECURSE GLAD_SRC "Framework/ThirdParty/glad/src/gl.c")
-        file(GLOB_RECURSE GLAD_HEAD "Framework/ThirdParty/glad/include/*.h")
-    endif()
 endif()
 
 file(GLOB_RECURSE UGUI_SRC "Framework/Core/*.cpp" "Framework/Renderer/*.cpp" ${IMGUI_SRC} ${GLAD_SRC}