added color

Author: sethcg

core/include/utils/App.hpp

@@ -12,6 +12,8 @@
 #define MINIMUM_WINDOW_WIDTH 400
 #define MINIMUM_WINDOW_HEIGHT 400
 
+#define DEFAULT_SORTING_DELAY_MILLISECONDS 100
+
 typedef struct {
     int width;
     int height;

core/include/utils/Rect.hpp

@@ -1,12 +1,26 @@
 #ifndef RECT_H
 #define RECT_H
 
+typedef struct {
+    uint8_t r;
+    uint8_t g;
+    uint8_t b;
+} rgb_color;
+
+#define rect_base_color rgb_color { .r = 50, .g = 50, .b = 50 }
+
+// OTHER COLORS TO BETTER DISTINGUISH THE SORTING PROCESS
+#define rect_green_color rgb_color { .r = 0, .g = 255, .b = 75 }
+#define rect_blue_color rgb_color { .r = 0, .g = 180, .b = 225 }
+#define rect_orange_color rgb_color { .r = 255, .g = 150, .b = 0 }
+
 typedef struct {
     int value;
     int width;
     int height;
     int start_x;    // TOP-LEFT X COORDINATE
     int start_y;    // TOP-LEFT Y COORDINATE
+    rgb_color rect_color;
 } Rectangle;
 
 #endif

core/include/utils/Sort.hpp

@@ -6,9 +6,14 @@
 #include <List.hpp>
 #include <Rect.hpp>
 
+typedef struct {
+    int value;
+    rgb_color rect_color;
+} SortStep;
+
 typedef struct {
     int stepCount;
-    int* steps;
+    SortStep* steps;
 } SortSequence;
 
 #define create_sort_sequence(count) { .stepCount = count };

core/src/sorts/BubbleSort.cpp

@@ -31,7 +31,11 @@ namespace BubbleSort {
                     stepCount++;
                 }
             }
-            if (!swapped) break;
+            if (!swapped) {
+                // INCREMENT FOR FINAL STEP
+                stepCount++; 
+                break;
+            }
         }
 
         free(array);
@@ -43,7 +47,7 @@ namespace BubbleSort {
         int stepCount = GetStepCount_BubbleSort(items);
 
         SortSequence sort = create_sort_sequence(stepCount);
-        sort.steps = (int*) malloc(LIST_SIZE * stepCount * sizeof(int));
+        sort.steps = (SortStep*) malloc(LIST_SIZE * stepCount * sizeof(SortStep));
 
         Rectangle* array = (Rectangle*) malloc(LIST_SIZE * sizeof(Rectangle));
         memcpy(array, items, LIST_SIZE * sizeof(Rectangle));
@@ -63,15 +67,33 @@ namespace BubbleSort {
 
                     // RECORD THE SORTING STEP (SNAPSHOT OF THE ARRAY)
                     for (int i = 0; i < LIST_SIZE; i++) {
+                        bool isOrdered = i >= (LIST_SIZE - index);
+                        bool isCurrent = i == j;
+                        bool isChecking = i == (j + 1);
+
                         offset = (currentStep * LIST_SIZE) + i;
-                        sort.steps[offset] = array[i].value;
+                        sort.steps[offset].value = array[i].value;
+
+                        // SET RECTANGLE COLOR
+                        sort.steps[offset].rect_color = 
+                            isOrdered ? rect_green_color : 
+                            isCurrent ? rect_blue_color : 
+                            isChecking ? rect_orange_color : rect_base_color;
                     }
                     currentStep++;
                 }
             }
 
             // BREAK WHEN NO ELEMENTS SWAPPED (OPTIMIZED)
-            if (!swapped) break;
+            if (!swapped) {
+                // RECORD FINAL STEP
+                for (int i = 0; i < LIST_SIZE; i++) {
+                    offset = (currentStep * LIST_SIZE) + i;
+                    sort.steps[offset].value = array[i].value;
+                    sort.steps[offset].rect_color = rect_green_color;
+                }
+                break;
+            }
         }
 
         free(array);
@@ -86,7 +108,8 @@ namespace BubbleSort {
         int offset;
         for (int i = 0; i < LIST_SIZE; i++) {
             offset = (index * LIST_SIZE) + i;
-            items[i].value = sequence.steps[offset];
+            items[i].value = sequence.steps[offset].value;
+            items[i].rect_color = sequence.steps[offset].rect_color;
         }
         return false;
     }

core/src/utils/List.cpp

@@ -20,6 +20,7 @@ void CreateList(SDL_Renderer *renderer, Rectangle* items, int window_width, int
         items[i].height = (i + 1) * (drawable_height / LIST_SIZE);
         items[i].start_x = LIST_MARGIN_MINIMUM + (i * (rect_width + LIST_RECT_PADDING)) + width_offset;
         items[i].start_y = LIST_MARGIN_MINIMUM + (drawable_height - rect_height) + height_offset;
+        items[i].rect_color = rect_base_color;
     }
 }
 
@@ -53,6 +54,11 @@ void ShuffleList(Rectangle* items) {
         items[i].value = items[j].value;
         items[j].value = temp;
     }
+    
+    // RESET THE RECTANGLE COLOR
+    for (int i = 0; i < LIST_SIZE; i++) {
+        items[i].rect_color = rect_base_color;
+    }
 }
 
 void DrawList(SDL_Renderer *renderer, Rectangle* items) {
@@ -73,7 +79,7 @@ static void DrawRect(SDL_Renderer *renderer, Rectangle* items, int index) {
         .h = (float) items[index].height,
     };
 
-    // DRAW Rectangle
-    SDL_SetRenderDrawColor(renderer, 50, 50, 50, SDL_ALPHA_OPAQUE_FLOAT);
+    // DRAW RECTANGLE
+    SDL_SetRenderDrawColor(renderer, items[index].rect_color.r, items[index].rect_color.g, items[index].rect_color.b, SDL_ALPHA_OPAQUE_FLOAT);
     SDL_RenderFillRect(renderer, &rect_item);
 }

src/main.cpp

@@ -36,7 +36,7 @@ SDL_AppResult SDL_AppInit(void **appstate, int argc, char *argv[])
     appContext->height = WINDOW_HEIGHT;
     appContext->isSorting = false;
     appContext->lastTime = 0;
-    appContext->delayInMilliseconds = 50;
+    appContext->delayInMilliseconds = DEFAULT_SORTING_DELAY_MILLISECONDS;
     *appstate = appContext;
 
     if (!SDL_CreateWindowAndRenderer("Sorting Visualizer", WINDOW_WIDTH, WINDOW_HEIGHT, 0, &appContext->window, &appContext->renderer)) {
@@ -95,6 +95,9 @@ SDL_AppResult SDL_AppIterate(void *appstate) {
     ImGui::Begin("Control Panel", NULL, ImGuiWindowFlags_NoCollapse);
 
     if (ImGui::Button("Shuffle", ImVec2(120, 20))) {
+        appContext->isSorting = false;
+        appContext->lastTime = 0;
+        appContext->stepIndex = 0;
         ShuffleList(appContext->items);
         ResizeList(appContext->renderer, appContext->items, appContext->width, appContext->height);
     }
@@ -127,8 +130,8 @@ SDL_AppResult SDL_AppIterate(void *appstate) {
         // DELAY ITERATING THE SORTING STEP
         static SDL_Time current = 0;
         SDL_GetCurrentTime(&current);
-        int currentTime = (int) SDL_NS_TO_MS(current);
-        int elapsedTime = currentTime - appContext->lastTime;
+        int currentTime = abs((int) SDL_NS_TO_MS(current));
+        int elapsedTime = abs(currentTime - appContext->lastTime);
         if(elapsedTime > appContext->delayInMilliseconds) {
             if(IncrementStep(appContext->sortId, appContext->stepIndex, appContext->sequence, appContext->items)) {
                 appContext->isSorting = false;

test/sorts/BubbleSort.cc

@@ -56,6 +56,6 @@ TEST(BubbleSort_Test, GetSequence_CorrectOrder) {
     int offset;
     for (int i = 0; i < LIST_SIZE; i++) {
         offset = (lastStep * LIST_SIZE) + i;
-        EXPECT_EQ(sequence.steps[offset], (i + 1));
+        EXPECT_EQ(sequence.steps[offset].value, (i + 1));
     }
 }