overhaul structure

Author: sethcg

.github/workflows/build.yml

@@ -51,4 +51,4 @@ jobs:
 
     - name: RUN TESTS
       if: runner.os == 'Linux'
-      run: ctest --preset default -C release
+      run: ctest --preset default --build-config release

.vscode/launch.json

@@ -3,14 +3,21 @@
     "configurations": [
         {
             "name": "Launch Debug (Windows)",
-            "type": "cppvsdbg",
+            "type": "cppdbg",
             "request": "launch",
             "program": "${workspaceFolder}\\build\\default\\Debug\\main.exe",
             "cwd": "${workspaceFolder}\\build\\default\\Debug",
             "args": [],
-            "stopAtEntry": false,
             "environment": [],
-            "console": "newExternalWindow",
+            "MIMode": "gdb",
+            "miDebuggerPath": "C:\\msys64\\mingw64\\bin\\gdb.exe",
+            "setupCommands": [
+                {
+                    "description": "Enable pretty-printing for gdb",
+                    "text": "-enable-pretty-printing",
+                    "ignoreFailures": true
+                }
+            ],
             "preLaunchTask": "Build Debug"
         },
         {
@@ -20,9 +27,8 @@
             "program": "${workspaceFolder}\\build\\default\\Release\\main.exe",
             "cwd": "${workspaceFolder}\\build\\default\\Release",
             "args": [],
-            "stopAtEntry": false,
             "environment": [],
-            "console": "newExternalWindow",
+            "console": "integratedTerminal",
             "preLaunchTask": "Build Release"
         }
     ]

README.md

@@ -5,27 +5,7 @@
 <dl>
   <dd>
     This is a C++ application that implements various <a href="https://en.wikipedia.org/wiki/Sorting_algorithm">sorting algorithms</a> 
-    using colors and shapes to represent how the underlying data structure is changing.
-  </dd>
-</dl>
-
-<dl>
-  <dd>
-  <details closed>
-  <summary><b>Time Complexity</b></summary>
-
-  | Name       | Best               | Average            | Worst              |
-  |:-----------|:-------------------|:-------------------|:-------------------|
-  | Bubble     | O(n)               | O(n<sup>2</sup>)   | O(n<sup>2</sup>)   |
-  | Cocktail   | O(n)               | O(n<sup>2</sup>)   | O(n<sup>2</sup>)   |
-  | Heap       | O(n log(n))        | O(n log(n))        | O(n log(n))        |
-  | Insertion  | O(n)               | O(n<sup>2</sup>)   | O(n<sup>2</sup>)   |
-  | Merge      | O(n log(n))        | O(n log(n))        | O(n log(n))        |
-  | Quick      | O(n log(n))        | O(n log(n))        | O(n<sup>2</sup>)   |
-  | Radix      | O(nk)              | O(nk)              | O(nk)              |
-  | Selection  | O(n<sup>2</sup>)   | O(n<sup>2</sup>)   | O(n<sup>2</sup>)   |
-
-  </details>
+    using colors and shapes to represent changes in the data structure.
   </dd>
 </dl>
 
@@ -34,8 +14,6 @@
 <details open>
   <summary>Show</summary>
   <img width="598px" height="600px" src="https://github.com/user-attachments/assets/53180fca-318b-4c76-9f2f-363413b2bc00" alt="image">
-
-
   <br>
 </details>
 
@@ -57,10 +35,11 @@ cmake --preset default
 
 # BUILD DEBUG (RUN TESTS)
 cmake --build --preset debug
-ctest --preset default -C debug
+ctest --preset default --build-config debug
 
 # BUILD RELEASE
 cmake --build --preset release
+ctest --preset default --build-config release
 
 ```
 

core/include/app/App.hpp

@@ -1,9 +1,21 @@
 #ifndef APP_H
 #define APP_H
 
+#include <memory>
+#include <vector>
+#include <string>
+#include <ctime>
+#include <cstdlib>
+
 #include <SDL3/SDL.h>
+#include <imgui.h>
+#include <imgui_impl_sdl3.h>
+#include <imgui_impl_sdlrenderer3.h>
 
 #include <AppContext.hpp>
+#include <ListManager.hpp>
+#include <Renderer.hpp>
+#include <SortManager.hpp>
 #include <UserInterface.hpp>
 
 namespace Application {
@@ -37,11 +49,8 @@ namespace Application {
             bool CreateWindowAndRenderer(const char* title);
             void RenderScene(float deltaTime);
 
-            int width = WINDOW_WIDTH;
-            int height = WINDOW_HEIGHT;
-
             SDL_Window* window = nullptr;
-            SDL_Renderer* renderer = nullptr;
+            SDL_Renderer* sdl_renderer = nullptr;
 
             float deltaTime = 0.0f;
             float lastFrameTime = 0.0f;

core/include/app/AppContext.hpp

@@ -1,34 +1,39 @@
-#pragma once
+#ifndef APP_CONTEXT_H
+#define APP_CONTEXT_H
 
+#include <atomic>
 #include <memory>
+#include <vector>
 
-#include <Rect.hpp>
-#include <Sort.hpp>
+#include <ListManager.hpp>
+#include <Renderer.hpp>
+#include <SortManager.hpp>
 
 #define WINDOW_WIDTH 800
 #define WINDOW_HEIGHT 800
+#define WINDOW_FLAGS SDL_WINDOW_RESIZABLE
+
 #define MINIMUM_WINDOW_WIDTH 400
 #define MINIMUM_WINDOW_HEIGHT 400
 
-#define DEFAULT_SORTING_DELAY_SECONDS 0.1f
-
 namespace Application {
 
     struct AppContext {
-        std::unique_ptr<Rectangle[]> items;
+        std::unique_ptr<Renderer> renderer;
+        std::unique_ptr<SortManager> sortManager;
+        std::unique_ptr<ListManager> listManager;
 
-        float elapsedTime;  // ELAPSED TIME SINCE LAST ITERATION STEP (SECONDS)
-        float delayTime;    // ITERATION DELAY TIME (SECONDS)
+        std::atomic<bool> isSortingFlag { false };
 
-        bool isSorting = false;
-        int sortId = 0;
-        int stepIndex = 0;
-        std::unique_ptr<SortSequence> sequence;
+        float elapsedTime;          // ELAPSED TIME SINCE LAST ITERATION STEP (SECONDS)
+        float delayTimeNormalized;  // NORMALIZED ITERATION DELAY TIME (SECONDS)
 
         AppContext() {
             elapsedTime = 0.0f;
-            delayTime = DEFAULT_SORTING_DELAY_SECONDS;
+            delayTimeNormalized = 0.75f;
         }
     };
 
 }
+
+#endif

core/include/app/UserInterface.hpp

@@ -1,4 +1,8 @@
-#pragma once
+#ifndef USER_INTERFACE_H
+#define USER_INTERFACE_H
+
+#include <atomic>
+#include <vector>
 
 #include <imgui.h>
 #include <imgui_internal.h>
@@ -8,6 +12,44 @@
 
 namespace UserInterface {
 
-    void RenderGUI(Application::AppContext* appContext, int width, int height);
+    inline void SetCustomTheme() {
+        ImGuiStyle& style = ImGui::GetStyle();
+        ImVec4* colors = style.Colors;
+        ImGui::StyleColorsDark();
+
+        // ROUNDING
+        style.WindowRounding = 4.0f;
+        style.FrameRounding = 4.0f;
+        style.ChildRounding = 6.0f;
+        style.PopupRounding = 4.0f;
+        style.GrabRounding = 4.0f;
+        style.ScrollbarRounding = 6.0f;
+
+        // WINDOW
+        style.WindowBorderSize = 0.0f;
+        style.WindowTitleAlign = ImVec2(0.5f, 0.5f);    // WINDOW TITLE CENTERED
+        
+        style.ItemSpacing = ImVec2(8.0f, 6.0f);
+        style.ItemInnerSpacing = ImVec2(6.0f, 4.0f);
+        style.ScrollbarSize = 18.0f;
+        style.FramePadding = ImVec2(10.0f, 6.0f);
+        style.FrameBorderSize = 0.0f;
+        style.GrabMinSize = 10.0f;
+
+        // TITLE (PANEL)
+        colors[ImGuiCol_TitleBg]                    = ImVec4(0.16f, 0.29f, 0.48f, 1.00f);
+        colors[ImGuiCol_TitleBgActive]              = ImVec4(0.16f, 0.29f, 0.48f, 1.00f);
+        colors[ImGuiCol_TitleBgCollapsed]           = ImVec4(0.16f, 0.29f, 0.48f, 1.00f);
+    }
+
+    void CreateShuffleButton(Application::AppContext* appContext);
+
+    void CreateSortButton(Application::AppContext* appContext);
+
+    void CreateSortSelectionDropdown(Application::AppContext* appContext);
+
+    void RenderGUI(Application::AppContext* appContext);
+
+}
 
-}
+#endif

core/include/renderer/ListManager.hpp

@@ -0,0 +1,41 @@
+#ifndef LIST_MANAGER_H
+#define LIST_MANAGER_H
+
+#include <algorithm>
+#include <vector>
+
+#include <SDL3/SDL.h>
+
+#include <Rect.hpp>
+
+class ListManager {
+    public:
+        ListManager(int windowWidth, int windowHeight, int listCount = 32) {
+            this->windowWidth = windowWidth;
+            this->windowHeight = windowHeight;
+            this->listCount = listCount;
+            CreateList();
+        }
+
+        void CreateList();
+
+        void Resize(int width, int height);
+
+        void ResizeRectangles();
+
+        void Shuffle();
+
+        std::vector<Rect::Rectangle>& GetItems() { return rects; }
+
+    private:
+        int listCount;
+        int windowWidth;
+        int windowHeight;
+
+        int margin = 24;
+        int rectPadding = 2;
+
+        std::vector<Rect::Rectangle> rects;
+};
+
+#endif

core/include/renderer/Renderer.hpp

@@ -0,0 +1,26 @@
+#ifndef RENDERER_H
+#define RENDERER_H
+
+#include <vector>
+
+#include <SDL3/SDL.h>
+
+#include <Color.hpp>
+#include <ListManager.hpp>
+#include <Rect.hpp>
+
+class Renderer {
+    public:
+        Renderer(SDL_Renderer* renderer) {
+            this->renderer = renderer;
+        };
+
+        void DrawList(const std::vector<Rect::Rectangle>& items, ListManager& listManager);
+        
+        void DrawRect(const Rect::Rectangle& rect);
+
+    private:
+        SDL_Renderer* renderer;
+};
+
+#endif

core/include/sorting/Sort.hpp

@@ -0,0 +1,44 @@
+#ifndef SORT_H
+#define SORT_H
+
+#include <memory>
+#include <vector>
+
+#include <Rect.hpp>
+
+// FORWARD DECLARATIONS
+namespace Rect {
+    enum class State;
+    struct Rectangle;
+}
+
+struct SortStep {
+    std::unique_ptr<std::vector<Rect::Rectangle>> rects;
+};
+
+struct SortSequence {
+    int stepCount = 0;
+    std::unique_ptr<std::vector<SortStep>> steps;
+};
+
+namespace Sort {
+
+    class Sort {
+        public:
+            virtual ~Sort() = default;
+
+            virtual const char* GetName() const = 0;
+
+            virtual void SetSequence(SortSequence* sequence, std::vector<Rect::Rectangle> rects) = 0;
+
+        protected:
+            static void PushStep(SortSequence& sequence, std::vector<Rect::Rectangle> rects);
+
+            static void FirstStep(SortSequence& sequence, const std::vector<Rect::Rectangle>& rects);
+            
+            static void LastStep(SortSequence& sequence, std::vector<Rect::Rectangle>& rects);
+    };
+
+}
+
+#endif