Swap out SDL for GLFW

Auburn · Aug 3, 2021 · 3adfacd · 3adfacd
1 parent aeff44b
commit 3adfacd
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 27 deletions.
diff --git a/NoiseTool/CMakeLists.txt b/NoiseTool/CMakeLists.txt
@@ -10,17 +10,17 @@ CPMAddPackage(
         "WITH_TESTSUITE OFF"
 )
 
-# Get SDL2 windows dev release
-if(WIN32)
-    CPMAddPackage(
-        NAME SDL2
-        VERSION 2.0.14
-        URL https://www.libsdl.org/release/SDL2-devel-2.0.14-VC.zip
-    )
-
-    # Set SDL2 path so magnum can find it
-    list(APPEND CMAKE_PREFIX_PATH "${SDL2_SOURCE_DIR}")
-endif()
+CPMAddPackage(
+    NAME GLFW
+    GITHUB_REPOSITORY glfw/glfw
+    GIT_TAG 3.3.4
+    EXCLUDE_FROM_ALL YES
+    OPTIONS
+        "GLFW_INSTALL OFF"
+        "GLFW_BUILD_TESTS OFF"
+        "GLFW_BUILD_EXAMPLES OFF"
+        "GLFW_BULID_DOCS OFF"
+)
 
 CPMAddPackage(
     NAME magnum
@@ -31,7 +31,7 @@ CPMAddPackage(
     OPTIONS
         "BUILD_STATIC ON"
         "BUILD_PLUGINS_STATIC ON"
-        "WITH_SDL2APPLICATION ON"
+        "WITH_GLFWAPPLICATION ON"
         "WITH_MESHTOOLS OFF"
         "WITH_TRADE OFF"
         "WITH_TEXT OFF"
@@ -65,7 +65,7 @@ CPMAddPackage(
 # Use modules from magnum-integration since it has everything we need
 set(CMAKE_MODULE_PATH "${magnum-integration_SOURCE_DIR}/modules" ${CMAKE_MODULE_PATH})
 
-find_package(Magnum REQUIRED GL Sdl2Application)
+find_package(Magnum REQUIRED GL GlfwApplication)
 find_package(MagnumIntegration REQUIRED ImGui)
 
 # Bundle a better font
@@ -104,14 +104,5 @@ endif()
 
 set(install_targets ${install_targets} NoiseTool PARENT_SCOPE)
 
-# Need sdl2 dll on windows, linux/mac its expected to be installed
-if(WIN32)
-    find_package(SDL2)
-    install(
-        FILES ${SDL2_DLL_RELEASE}
-        DESTINATION "${CMAKE_INSTALL_BINDIR}"
-    )
-endif()
-
 # Make the executable a default target to build & run in Visual Studio
 set_property(DIRECTORY ${PROJECT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT NoiseTool)
diff --git a/NoiseTool/FastNoiseNodeEditor.cpp b/NoiseTool/FastNoiseNodeEditor.cpp
@@ -227,6 +227,8 @@ const FastNoise::Metadata* FastNoiseNodeEditor::MetadataMenuGroup::DrawUI( std::
 
 FastNoiseNodeEditor::FastNoiseNodeEditor()
 {
+    ImGui::CreateContext();
+
 #ifdef IMGUI_HAS_DOCK
     ImGui::GetIO().ConfigFlags |= ImGuiConfigFlags_DockingEnable;
 #endif

diff --git a/NoiseTool/NoiseToolApp.cpp b/NoiseTool/NoiseToolApp.cpp
@@ -1,4 +1,5 @@
 #include <imgui.h>
+#include <Corrade/Utility/Resource.h>
 #include <Magnum/ImGuiIntegration/Context.hpp>
 #include <Magnum/Math/Matrix4.h>
 #include <Magnum/GL/DefaultFramebuffer.h>
@@ -24,20 +25,22 @@ NoiseToolApp::NoiseToolApp( const Arguments& arguments ) :
     .setWindowFlags( Configuration::WindowFlag::Resizable | Configuration::WindowFlag::Maximized ),
     GLConfiguration{}
     .setSampleCount( 4 )
-    }, 
-    mImGuiContext( Vector2{ windowSize() } / dpiScaling(), windowSize(), framebufferSize() )
+    }
 {
     InitResources();
 
+    const Vector2 size = Vector2 { windowSize() } / dpiScaling();
+
     // Add a font that actually looks acceptable on HiDPI screens.
     {
-        ImGui::GetIO().Fonts->Clear();
         ImFontConfig fontConfig;
         fontConfig.FontDataOwnedByAtlas = false;
         const auto font = Utility::Resource { "font" }.getRaw( "main.ttf" );
-        ImGui::GetIO().Fonts->AddFontFromMemoryTTF( const_cast<char*>( font.data() ), font.size(), 14.0f * framebufferSize().x() / ImGui::GetIO().DisplaySize.x, &fontConfig );
+        ImGui::GetIO().Fonts->AddFontFromMemoryTTF( const_cast<char*>( font.data() ), font.size(), 14.0f * framebufferSize().x() / size.x(), &fontConfig );
     }
 
+    mImGuiContext = ImGuiIntegration::Context( *ImGui::GetCurrentContext(), size, windowSize(), framebufferSize() );
+
     GL::Renderer::enable( GL::Renderer::Feature::DepthTest );
 
     setSwapInterval( 1 );

diff --git a/NoiseTool/NoiseToolApp.h b/NoiseTool/NoiseToolApp.h
@@ -2,7 +2,7 @@
 
 #include <array>
 #include <Magnum/Math/Color.h>
-#include <Magnum/Platform/Sdl2Application.h>
+#include <Magnum/Platform/GlfwApplication.h>
 #include <Magnum/ImGuiIntegration/Context.h>
 #include <Magnum/SceneGraph/Object.h>
 #include <Magnum/SceneGraph/Camera.h>