(Chore): Fixed cmake to work for imgui + raylib

CMakeLists.txt

@@ -1,95 +1,65 @@
-cmake_minimum_required(VERSION 3.24)
-project(RaylibDmx) # Project Name: RaylibDmx
+cmake_minimum_required(VERSION 3.10)
 
-# nvim/fleet users (ONLY WORKS WITH MINGW/NINJA BUILDERS)
-set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+# Set the project name
+project(RaylibDmx)
 
-# Dependencies
-## - Raylib
-## - rlImGui
-#### - ImGui
-
-# Use FetchContent to download and build raylib
-# This is a faster alternative to using a git repo, since this just downloads the source
-# while the git repo pull takes a lot longer. Not sure why, other repos don't seem to have this issue
-
-# If you would like to use git instead, use this:
-# - - - - - - - - - - - - - - - - - - - - - - - -
-#FetchContent_Declare(
-#        raylib
-#        GIT_REPOSITORY "https://github.com/raysan5/raylib.git"
-#        GIT_TAG "master"
-#        GIT_SHALLOW TRUE
-#        GIT_PROGRESS TRUE
-#)
-# - - - - - - - - - - - - - - - - - - - - - - - -
+# Set the C++ standard
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
+# Include FetchContent module
 include(FetchContent)
-set(FETCHCONTENT_QUIET FALSE)
-set(BUILD_EXAMPLES OFF CACHE BOOL "" FORCE) # don't build the supplied examples
-set(BUILD_GAMES    OFF CACHE BOOL "" FORCE) # don't build the supplied example games
 
+# Download and configure raylib
 FetchContent_Declare(
         raylib
-        URL https://github.com/raysan5/raylib/archive/refs/tags/4.5.0.tar.gz
+        GIT_REPOSITORY https://github.com/raysan5/raylib.git
+        GIT_TAG 4.5.0  # or the latest version you want to use
 )
 FetchContent_MakeAvailable(raylib)
 
-# Raylib conf
-set(raylib_VERBOSE 1) # Not 100% sure if this does anything...
-
-# Download and build Dear ImGui
+# Download and configure ImGui
 FetchContent_Declare(
         imgui
         GIT_REPOSITORY https://github.com/ocornut/imgui.git
-        GIT_SHALLOW TRUE
-        GIT_TAG v1.89.4
+        GIT_TAG v1.89.2  # or the latest version you want to use
 )
 FetchContent_MakeAvailable(imgui)
 
-# Download and build rlImGui
+# Build ImGui as a static library
+add_library(ImGui STATIC
+        ${imgui_SOURCE_DIR}/imgui.cpp
+        ${imgui_SOURCE_DIR}/imgui_demo.cpp
+        ${imgui_SOURCE_DIR}/imgui_draw.cpp
+        ${imgui_SOURCE_DIR}/imgui_tables.cpp
+        ${imgui_SOURCE_DIR}/imgui_widgets.cpp
+)
+target_include_directories(ImGui PUBLIC ${imgui_SOURCE_DIR})
+
+# Download and configure rlImGui (raylib backend for ImGui)
 FetchContent_Declare(
-        rlImGui
+        rlimgui
         GIT_REPOSITORY https://github.com/raylib-extras/rlImGui.git
-        GIT_TAG main
+        GIT_TAG main  # Use the correct branch name
 )
-FetchContent_MakeAvailable(rlImGui)
+FetchContent_MakeAvailable(rlimgui)
 
-# Add rlImGui library
-add_library(rlImGui STATIC
-        ${rlImGui_SOURCE_DIR}/rlImGui.cpp
-        ${rlImGui_SOURCE_DIR}/imgui_impl_raylib.cpp
+# Add executable target with the source files
+file(GLOB_RECURSE SOURCES "src/*.cpp")
+add_executable(${PROJECT_NAME} ${SOURCES})
+
+# Link raylib to your project
+target_link_libraries(${PROJECT_NAME} raylib)
+
+# Add rlImGui to the project
+set(RLIMGUI_SOURCES
+        ${rlimgui_SOURCE_DIR}/rlImGui.cpp
 )
 
-# Include directories for rlImGui
-target_include_directories(rlImGui PRIVATE
-        ${imgui_SOURCE_DIR}
-        ${raylib_SOURCE_DIR}/src
-        ${rlImGui_SOURCE_DIR}
-)
+# Create the rlImGui library
+add_library(rlImGui STATIC ${RLIMGUI_SOURCES})
+target_include_directories(rlImGui PUBLIC ${rlimgui_SOURCE_DIR} ${imgui_SOURCE_DIR})
+target_link_libraries(rlImGui raylib ImGui)
 
-# Link rlImGui with Raylib
-target_link_libraries(rlImGui PRIVATE raylib)
-
-# add source code
-file(GLOB_RECURSE PROJECT_SOURCES CONFIGURE_DEPENDS "${CMAKE_CURRENT_LIST_DIR}/src/*.cpp") # Define PROJECT_SOURCES as a list of all source files
-set(PROJECT_INCLUDE "${CMAKE_CURRENT_LIST_DIR}/src")
-
-# exe
-add_executable(${PROJECT_NAME})
-target_sources(${PROJECT_NAME} PRIVATE ${PROJECT_SOURCES})
-target_include_directories(${PROJECT_NAME} PRIVATE ${PROJECT_INCLUDE})
-target_link_libraries(${PROJECT_NAME} PRIVATE raylib rlImGui)
-
-# Web Configurations
-if (${PLATFORM} STREQUAL "Web")
-    # Tell Emscripten to build an example.html file.
-    set_target_properties(${PROJECT_NAME} PROPERTIES SUFFIX ".html")
-endif()
-
-# Checks if OSX and links appropriate frameworks (Only required on MacOS)
-if (APPLE)
-    target_link_libraries(${PROJECT_NAME} "-framework IOKit")
-    target_link_libraries(${PROJECT_NAME} "-framework Cocoa")
-    target_link_libraries(${PROJECT_NAME} "-framework OpenGL")
-endif()
+# Link ImGui and rlImGui to your project
+target_link_libraries(${PROJECT_NAME} ImGui rlImGui)

src/main.cpp

@@ -1,5 +1,8 @@
 #include "raylib.h"
+#include "rlImGui.h"
 #include "panel.h"
+#include "imgui.h"
+
 
 int main() {
     const int screenWidth = 1920;
@@ -8,19 +11,23 @@ int main() {
     InitWindow(screenWidth, screenHeight, "DMX Raylib UI");
     SetTargetFPS(60);
 
-    // Create the timeline and properties panels
+    rlImGuiSetup(true);  // Use true for dark theme, false for light theme
+
     Panel timelinePanel = {{0, 0, screenWidth * 0.75f, screenHeight * 0.6f}, "Timeline", LIGHTGRAY, DARKGRAY, true};
     Panel propertiesPanel = {{screenWidth * 0.75f, 0, screenWidth * 0.25f, screenHeight}, "Properties", LIGHTGRAY, DARKGRAY, true};
 
     while (!WindowShouldClose()) {
-        // Update panels
         timelinePanel.Update();
         propertiesPanel.Update();
 
         BeginDrawing();
         ClearBackground(RAYWHITE);
 
-        // Draw panels
+        rlImGuiBegin();
+        bool open = true;
+        ImGui::ShowDemoWindow(&open);
+        rlImGuiEnd();
+
         if (timelinePanel.isVisible) timelinePanel.Draw();
         if (propertiesPanel.isVisible) propertiesPanel.Draw();
 
@@ -28,6 +35,8 @@ int main() {
         EndDrawing();
     }
 
+    rlImGuiShutdown();
     CloseWindow();
+
     return 0;
 }