Moved GUI classes into a subdir and their own static library

kblaschke · kblaschke · commit 38cbcbe2dc68 · 2024-01-19T19:53:37.000+01:00
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -1,24 +1,14 @@
+add_subdirectory(gui)
 
 set(PROJECTM_CONFIGURATION_FILE "${CMAKE_CURRENT_BINARY_DIR}/projectMSDL.properties")
 set(PROJECTM_CONFIGURATION_FILE "${PROJECTM_CONFIGURATION_FILE}" PARENT_SCOPE)
 configure_file(resources/projectMSDL.properties.in "${PROJECTM_CONFIGURATION_FILE}" @ONLY)
 
-# Font embedding
-add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/AnonymousProFont.h"
-        COMMAND $<TARGET_FILE:ImGuiBinaryToCompressedC> "${CMAKE_CURRENT_SOURCE_DIR}/resources/AnonymousPro-Regular.ttf" AnonymousPro > "${CMAKE_CURRENT_BINARY_DIR}/AnonymousProFont.h"
-        MAIN_DEPENDENCY "${CMAKE_CURRENT_SOURCE_DIR}/resources/AnonymousPro-Regular.ttf"
-        )
-
 add_executable(projectMSDL WIN32
-        "${CMAKE_CURRENT_BINARY_DIR}/AnonymousProFont.h"
         AudioCapture.cpp
         AudioCapture.h
         FPSLimiter.cpp
         FPSLimiter.h
-        GuiFileChooserWindow.cpp
-        GuiFileChooserWindow.h
-        PresetSelectionGui.cpp
-        PresetSelectionGui.h
         ProjectMSDLApplication.cpp
         ProjectMSDLApplication.h
         ProjectMWrapper.cpp
@@ -30,11 +20,6 @@ add_executable(projectMSDL WIN32
         main.cpp
         )
 
-target_include_directories(projectMSDL
-        PRIVATE
-        "${CMAKE_CURRENT_BINARY_DIR}"
-        )
-
 if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
     target_sources(projectMSDL
             PRIVATE
@@ -64,7 +49,7 @@ target_compile_definitions(projectMSDL
 
 target_link_libraries(projectMSDL
         PRIVATE
-        ImGui
+        ProjectMSDL-GUI
         libprojectM::playlist
         Poco::Util
         SDL2::SDL2$<$<STREQUAL:${SDL2_LINKAGE},static>:-static>
diff --git a/src/ProjectMSDLApplication.cpp b/src/ProjectMSDLApplication.cpp
@@ -8,7 +8,7 @@
 #include "ProjectMWrapper.h"
 #include "RenderLoop.h"
 #include "SDLRenderingWindow.h"
-#include "PresetSelectionGui.h"
+#include "gui/PresetSelection.h"
 
 #include <Poco/Environment.h>
 #include <Poco/File.h>
@@ -24,7 +24,7 @@ ProjectMSDLApplication::ProjectMSDLApplication()
     addSubsystem(new SDLRenderingWindow);
     addSubsystem(new ProjectMWrapper);
     addSubsystem(new AudioCapture);
-    addSubsystem(new PresetSelectionGui);
+    addSubsystem(new PresetSelection);
 }
 
 const char* ProjectMSDLApplication::name() const
diff --git a/src/RenderLoop.cpp b/src/RenderLoop.cpp
@@ -10,7 +10,7 @@ RenderLoop::RenderLoop()
     : _audioCapture(Poco::Util::Application::instance().getSubsystem<AudioCapture>())
     , _projectMWrapper(Poco::Util::Application::instance().getSubsystem<ProjectMWrapper>())
     , _sdlRenderingWindow(Poco::Util::Application::instance().getSubsystem<SDLRenderingWindow>())
-    , _presetSelectionGui(Poco::Util::Application::instance().getSubsystem<PresetSelectionGui>())
+    , _presetSelectionGui(Poco::Util::Application::instance().getSubsystem<PresetSelection>())
     , _projectMHandle(_projectMWrapper.ProjectM())
     , _playlistHandle(_projectMWrapper.Playlist())
 {
diff --git a/src/RenderLoop.h b/src/RenderLoop.h
@@ -3,7 +3,7 @@
 #include "AudioCapture.h"
 #include "ProjectMWrapper.h"
 #include "SDLRenderingWindow.h"
-#include "PresetSelectionGui.h"
+#include "gui/PresetSelection.h"
 
 #include <Poco/Logger.h>
 
@@ -78,7 +78,7 @@ class RenderLoop
     AudioCapture& _audioCapture;
     ProjectMWrapper& _projectMWrapper;
     SDLRenderingWindow& _sdlRenderingWindow;
-    PresetSelectionGui& _presetSelectionGui;
+    PresetSelection& _presetSelectionGui;
 
     projectm_handle _projectMHandle{nullptr};
     projectm_playlist_handle _playlistHandle{nullptr};
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
@@ -0,0 +1,26 @@
+# Font embedding
+add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/AnonymousProFont.h"
+        COMMAND $<TARGET_FILE:ImGuiBinaryToCompressedC> "${CMAKE_SOURCE_DIR}/src/resources/AnonymousPro-Regular.ttf" AnonymousPro > "${CMAKE_CURRENT_BINARY_DIR}/AnonymousProFont.h"
+        MAIN_DEPENDENCY "${CMAKE_SOURCE_DIR}/src/resources/AnonymousPro-Regular.ttf"
+        )
+
+add_library(ProjectMSDL-GUI STATIC
+        "${CMAKE_CURRENT_BINARY_DIR}/AnonymousProFont.h"
+        FileChooser.cpp
+        FileChooser.h
+        PresetSelection.cpp
+        PresetSelection.h
+        )
+
+target_include_directories(ProjectMSDL-GUI
+        PRIVATE
+        "${CMAKE_SOURCE_DIR}/src/"
+        "${CMAKE_CURRENT_BINARY_DIR}"
+        )
+
+target_link_libraries(ProjectMSDL-GUI
+        PUBLIC
+        ImGui
+        libprojectM::${PROJECTM_LINKAGE}
+        )
+
diff --git a/src/gui/FileChooser.cpp b/src/gui/FileChooser.cpp
@@ -1,4 +1,4 @@
-#include "GuiFileChooserWindow.h"
+#include "FileChooser.h"
 
 #include "imgui.h"
 
@@ -7,12 +7,12 @@
 
 #include <algorithm>
 
-void GuiFileChooserWindow::Show()
+void FileChooser::Show()
 {
     _visible = true;
 }
 
-bool GuiFileChooserWindow::Draw()
+bool FileChooser::Draw()
 {
     if (!_visible)
     {
@@ -78,12 +78,12 @@ bool GuiFileChooserWindow::Draw()
     return fileSelected;
 }
 
-const Poco::File& GuiFileChooserWindow::SelectedFile() const
+const Poco::File& FileChooser::SelectedFile() const
 {
     return _selectedFile;
 }
 
-void GuiFileChooserWindow::DrawNavButtons()
+void FileChooser::DrawNavButtons()
 {
     ImGui::Checkbox("Show hidden files", &_showhidden);
 
@@ -117,7 +117,7 @@ void GuiFileChooserWindow::DrawNavButtons()
     }
 }
 
-bool GuiFileChooserWindow::PopulateFileList()
+bool FileChooser::PopulateFileList()
 {
     bool fileSelected{false};
     bool changeDir{false};
@@ -178,7 +178,7 @@ bool GuiFileChooserWindow::PopulateFileList()
     return fileSelected;
 }
 
-void GuiFileChooserWindow::ChangeDirectory(const Poco::Path& newDirectory)
+void FileChooser::ChangeDirectory(const Poco::Path& newDirectory)
 {
     _currentDir = newDirectory;
     _currentDir.makeDirectory();
diff --git a/src/gui/FileChooser.h b/src/gui/FileChooser.h
@@ -9,7 +9,7 @@
  *
  * Displays a file browser that shows directories and .milk files from which the user can choose one.
  */
-class GuiFileChooserWindow
+class FileChooser
 {
 public:
 
diff --git a/src/gui/PresetSelection.cpp b/src/gui/PresetSelection.cpp
@@ -1,8 +1,8 @@
-#include "PresetSelectionGui.h"
+#include "PresetSelection.h"
 
-#include "AnonymousProFont.h"
 #include "ProjectMWrapper.h"
 #include "SDLRenderingWindow.h"
+#include "AnonymousProFont.h"
 
 #include "imgui.h"
 #include "imgui_impl_opengl3.h"
@@ -12,12 +12,12 @@
 
 #include <cmath>
 
-const char* PresetSelectionGui::name() const
+const char* PresetSelection::name() const
 {
     return "Preset Selection GUI";
 }
 
-void PresetSelectionGui::initialize(Poco::Util::Application& app)
+void PresetSelection::initialize(Poco::Util::Application& app)
 {
     IMGUI_CHECKVERSION();
     ImGui::CreateContext();
@@ -41,7 +41,7 @@ void PresetSelectionGui::initialize(Poco::Util::Application& app)
     UpdateFontSize();
 }
 
-void PresetSelectionGui::uninitialize()
+void PresetSelection::uninitialize()
 {
     ImGui_ImplOpenGL3_Shutdown();
     ImGui_ImplSDL2_Shutdown();
@@ -53,7 +53,7 @@ void PresetSelectionGui::uninitialize()
     _glContext = nullptr;
 }
 
-void PresetSelectionGui::UpdateFontSize()
+void PresetSelection::UpdateFontSize()
 {
     ImGuiIO& io = ImGui::GetIO();
 
@@ -88,7 +88,7 @@ void PresetSelectionGui::UpdateFontSize()
     ImGui::GetStyle().ScaleAllSizes(1.0);
 }
 
-void PresetSelectionGui::ProcessInput(const SDL_Event& event)
+void PresetSelection::ProcessInput(const SDL_Event& event)
 {
     ImGui_ImplSDL2_ProcessEvent(&event);
     unsigned int position;
@@ -97,7 +97,7 @@ void PresetSelectionGui::ProcessInput(const SDL_Event& event)
     _playlistSize = projectm_get_playlist_size(_projectMWrapper->ProjectM());
 }
 
-void PresetSelectionGui::Draw()
+void PresetSelection::Draw()
 {
     ImGui_ImplSDL2_NewFrame();
     ImGui_ImplOpenGL3_NewFrame();
@@ -134,19 +134,19 @@ void PresetSelectionGui::Draw()
     ImGui_ImplOpenGL3_RenderDrawData(ImGui::GetDrawData());
 }
 
-bool PresetSelectionGui::WantsKeyboardInput()
+bool PresetSelection::WantsKeyboardInput()
 {
     auto& io = ImGui::GetIO();
     return io.WantCaptureKeyboard;
 }
 
-bool PresetSelectionGui::WantsMouseInput()
+bool PresetSelection::WantsMouseInput()
 {
     auto& io = ImGui::GetIO();
     return io.WantCaptureMouse;
 }
 
-void PresetSelectionGui::DrawSettingsWindow()
+void PresetSelection::DrawSettingsWindow()
 {
     if (ImGui::Begin("projectM Settings", &_settingsVisible))
     {
@@ -164,7 +164,6 @@ void PresetSelectionGui::DrawSettingsWindow()
             projectm_select_preset(_projectMWrapper->ProjectM(), _playlistPosition, true);
         }
 
-
         ImGui::Text("Application average %.3f ms/frame (%.1f FPS)", 1000.0f / ImGui::GetIO().Framerate, ImGui::GetIO().Framerate);
 
         if (ImGui::Button("Toggle Fullscreen"))
diff --git a/src/gui/PresetSelection.h b/src/gui/PresetSelection.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "GuiFileChooserWindow.h"
+#include "FileChooser.h"
 
 #include <SDL2/SDL.h>
 
@@ -13,7 +13,7 @@ struct ImFont;
 class ProjectMWrapper;
 class SDLRenderingWindow;
 
-class PresetSelectionGui : public Poco::Util::Subsystem
+class PresetSelection : public Poco::Util::Subsystem
 {
 public:
     const char* name() const override;
@@ -44,7 +44,7 @@ class PresetSelectionGui : public Poco::Util::Subsystem
 
     float _dpi{ 0.0f }; //!< Last DPI value.
 
-    GuiFileChooserWindow _fileChooser; //!< File chooser dialog.
+    FileChooser _fileChooser; //!< File chooser dialog.
 
     bool _settingsVisible{ true }; //!< Flag for settings window visibility.
     float _displayDuration{ 0.0f }; //!< Preset display time

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ RenderLoop::RenderLoop()`
`10`	`10`	`: _audioCapture(Poco::Util::Application::instance().getSubsystem<AudioCapture>())`
`11`	`11`	`, _projectMWrapper(Poco::Util::Application::instance().getSubsystem<ProjectMWrapper>())`
`12`	`12`	`, _sdlRenderingWindow(Poco::Util::Application::instance().getSubsystem<SDLRenderingWindow>())`
`13`		`- , _presetSelectionGui(Poco::Util::Application::instance().getSubsystem<PresetSelectionGui>())`
	`13`	`+ , _presetSelectionGui(Poco::Util::Application::instance().getSubsystem<PresetSelection>())`
`14`	`14`	`, _projectMHandle(_projectMWrapper.ProjectM())`
`15`	`15`	`, _playlistHandle(_projectMWrapper.Playlist())`
`16`	`16`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#include "GuiFileChooserWindow.h"`
	`1`	`+#include "FileChooser.h"`
`2`	`2`
`3`	`3`	`#include "imgui.h"`
`4`	`4`
`@@ -7,12 +7,12 @@`
`7`	`7`
`8`	`8`	`#include <algorithm>`
`9`	`9`
`10`		`-void GuiFileChooserWindow::Show()`
	`10`	`+void FileChooser::Show()`
`11`	`11`	`{`
`12`	`12`	`_visible = true;`
`13`	`13`	`}`
`14`	`14`
`15`		`-bool GuiFileChooserWindow::Draw()`
	`15`	`+bool FileChooser::Draw()`
`16`	`16`	`{`
`17`	`17`	`if (!_visible)`
`18`	`18`	`{`
`@@ -78,12 +78,12 @@ bool GuiFileChooserWindow::Draw()`
`78`	`78`	`return fileSelected;`
`79`	`79`	`}`
`80`	`80`
`81`		`-const Poco::File& GuiFileChooserWindow::SelectedFile() const`
	`81`	`+const Poco::File& FileChooser::SelectedFile() const`
`82`	`82`	`{`
`83`	`83`	`return _selectedFile;`
`84`	`84`	`}`
`85`	`85`
`86`		`-void GuiFileChooserWindow::DrawNavButtons()`
	`86`	`+void FileChooser::DrawNavButtons()`
`87`	`87`	`{`
`88`	`88`	`ImGui::Checkbox("Show hidden files", &_showhidden);`
`89`	`89`
`@@ -117,7 +117,7 @@ void GuiFileChooserWindow::DrawNavButtons()`
`117`	`117`	`}`
`118`	`118`	`}`
`119`	`119`
`120`		`-bool GuiFileChooserWindow::PopulateFileList()`
	`120`	`+bool FileChooser::PopulateFileList()`
`121`	`121`	`{`
`122`	`122`	`bool fileSelected{false};`
`123`	`123`	`bool changeDir{false};`
`@@ -178,7 +178,7 @@ bool GuiFileChooserWindow::PopulateFileList()`
`178`	`178`	`return fileSelected;`
`179`	`179`	`}`
`180`	`180`
`181`		`-void GuiFileChooserWindow::ChangeDirectory(const Poco::Path& newDirectory)`
	`181`	`+void FileChooser::ChangeDirectory(const Poco::Path& newDirectory)`
`182`	`182`	`{`
`183`	`183`	`_currentDir = newDirectory;`
`184`	`184`	`_currentDir.makeDirectory();`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`*`
`10`	`10`	`* Displays a file browser that shows directories and .milk files from which the user can choose one.`
`11`	`11`	`*/`
`12`		`-class GuiFileChooserWindow`
	`12`	`+class FileChooser`
`13`	`13`	`{`
`14`	`14`	`public:`
`15`	`15`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`		`-#include "PresetSelectionGui.h"`
	`1`	`+#include "PresetSelection.h"`
`2`	`2`
`3`		`-#include "AnonymousProFont.h"`
`4`	`3`	`#include "ProjectMWrapper.h"`
`5`	`4`	`#include "SDLRenderingWindow.h"`
	`5`	`+#include "AnonymousProFont.h"`
`6`	`6`
`7`	`7`	`#include "imgui.h"`
`8`	`8`	`#include "imgui_impl_opengl3.h"`
`@@ -12,12 +12,12 @@`
`12`	`12`
`13`	`13`	`#include <cmath>`
`14`	`14`
`15`		`-const char* PresetSelectionGui::name() const`
	`15`	`+const char* PresetSelection::name() const`
`16`	`16`	`{`
`17`	`17`	`return "Preset Selection GUI";`
`18`	`18`	`}`
`19`	`19`
`20`		`-void PresetSelectionGui::initialize(Poco::Util::Application& app)`
	`20`	`+void PresetSelection::initialize(Poco::Util::Application& app)`
`21`	`21`	`{`
`22`	`22`	`IMGUI_CHECKVERSION();`
`23`	`23`	`ImGui::CreateContext();`
`@@ -41,7 +41,7 @@ void PresetSelectionGui::initialize(Poco::Util::Application& app)`
`41`	`41`	`UpdateFontSize();`
`42`	`42`	`}`
`43`	`43`
`44`		`-void PresetSelectionGui::uninitialize()`
	`44`	`+void PresetSelection::uninitialize()`
`45`	`45`	`{`
`46`	`46`	`ImGui_ImplOpenGL3_Shutdown();`
`47`	`47`	`ImGui_ImplSDL2_Shutdown();`
`@@ -53,7 +53,7 @@ void PresetSelectionGui::uninitialize()`
`53`	`53`	`_glContext = nullptr;`
`54`	`54`	`}`
`55`	`55`
`56`		`-void PresetSelectionGui::UpdateFontSize()`
	`56`	`+void PresetSelection::UpdateFontSize()`
`57`	`57`	`{`
`58`	`58`	`ImGuiIO& io = ImGui::GetIO();`
`59`	`59`
`@@ -88,7 +88,7 @@ void PresetSelectionGui::UpdateFontSize()`
`88`	`88`	`ImGui::GetStyle().ScaleAllSizes(1.0);`
`89`	`89`	`}`
`90`	`90`
`91`		`-void PresetSelectionGui::ProcessInput(const SDL_Event& event)`
	`91`	`+void PresetSelection::ProcessInput(const SDL_Event& event)`
`92`	`92`	`{`
`93`	`93`	`ImGui_ImplSDL2_ProcessEvent(&event);`
`94`	`94`	`unsigned int position;`
`@@ -97,7 +97,7 @@ void PresetSelectionGui::ProcessInput(const SDL_Event& event)`
`97`	`97`	`_playlistSize = projectm_get_playlist_size(_projectMWrapper->ProjectM());`
`98`	`98`	`}`
`99`	`99`
`100`		`-void PresetSelectionGui::Draw()`
	`100`	`+void PresetSelection::Draw()`
`101`	`101`	`{`
`102`	`102`	`ImGui_ImplSDL2_NewFrame();`
`103`	`103`	`ImGui_ImplOpenGL3_NewFrame();`
`@@ -134,19 +134,19 @@ void PresetSelectionGui::Draw()`
`134`	`134`	`ImGui_ImplOpenGL3_RenderDrawData(ImGui::GetDrawData());`
`135`	`135`	`}`
`136`	`136`
`137`		`-bool PresetSelectionGui::WantsKeyboardInput()`
	`137`	`+bool PresetSelection::WantsKeyboardInput()`
`138`	`138`	`{`
`139`	`139`	`auto& io = ImGui::GetIO();`
`140`	`140`	`return io.WantCaptureKeyboard;`
`141`	`141`	`}`
`142`	`142`
`143`		`-bool PresetSelectionGui::WantsMouseInput()`
	`143`	`+bool PresetSelection::WantsMouseInput()`
`144`	`144`	`{`
`145`	`145`	`auto& io = ImGui::GetIO();`
`146`	`146`	`return io.WantCaptureMouse;`
`147`	`147`	`}`
`148`	`148`
`149`		`-void PresetSelectionGui::DrawSettingsWindow()`
	`149`	`+void PresetSelection::DrawSettingsWindow()`
`150`	`150`	`{`
`151`	`151`	`if (ImGui::Begin("projectM Settings", &_settingsVisible))`
`152`	`152`	`{`
`@@ -164,7 +164,6 @@ void PresetSelectionGui::DrawSettingsWindow()`
`164`	`164`	`projectm_select_preset(_projectMWrapper->ProjectM(), _playlistPosition, true);`
`165`	`165`	`}`
`166`	`166`
`167`		`-`
`168`	`167`	`ImGui::Text("Application average %.3f ms/frame (%.1f FPS)", 1000.0f / ImGui::GetIO().Framerate, ImGui::GetIO().Framerate);`
`169`	`168`
`170`	`169`	`if (ImGui::Button("Toggle Fullscreen"))`