Updated obsolete codebase

maroctamorg · Oct 23, 2021 · 67910bc · 67910bc
1 parent 7010114
commit 67910bc
Show file tree

Hide file tree

Showing 52 changed files with 112 additions and 189 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,5 +5,8 @@
 # platform-specific files
 Makefile
 
+# build
+build/Tsukuyomi.a
+
 # escaped build files
 *.o
diff --git a/Makefiles/Makefile_linux b/Makefiles/Makefile_linux
@@ -2,15 +2,15 @@ CC = g++
 CFLAGS = -std=c++17
 INCLUDE = `sdl2-config --cflags --libs`
 LINKER_FLAGS = -lSDL2 -lSDL2_mixer -lSDL2_image -lSDL2_ttf -pthread
-LIB_GRAPH_SOURCES = $(patsubst %, engine/graphics/%, graphics_context.cpp image.cpp rectangles.cpp text.cpp)
+LIB_GRAPH_SOURCES = $(patsubst %, graphics/%, graphics_context.cpp image.cpp rectangles.cpp text.cpp)
 LIB_GRAPH_OBJECT_FILES = $(shell basename -a ${LIB_GRAPH_SOURCES:.cpp=.o})
-LIB_UI_SOURCES = $(patsubst %, engine/ui/%, text.cpp event.cpp button.cpp input.cpp layout.cpp menu.cpp pannel.cpp ui_element.cpp)
+LIB_UI_SOURCES = $(patsubst %, ui/%, text.cpp event.cpp button.cpp input.cpp layout.cpp menu.cpp pannel.cpp ui_element.cpp)
 LIB_UI_OBJECT_FILES = $(shell basename -a ${LIB_UI_SOURCES:.cpp=.o})
-TARGET = Tsukuyomi
+TARGET = Tsukuyomi.a
 
-all: build_all run
+all: build link
 
-build_all: build_lib_graph build_lib_ui link
+build: build_lib_graph build_lib_ui link
 
 build_lib_graph:
 	@echo "\nBuilding GRAPHICS library..."
@@ -24,9 +24,9 @@ build_lib_ui:
 
 link:
 	@echo "\nLinking App..."
-	${CC} -o ${TARGET} $(patsubst %, build/graph/%, ${LIB_GRAPH_OBJECT_FILES}) $(patsubst %, build/ui/%, ${LIB_UI_OBJECT_FILES}) ${LINKER_FLAGS}
+	ar rs ${TARGET} $(patsubst %, build/graph/%, ${LIB_GRAPH_OBJECT_FILES}) $(patsubst %, build/ui/%, ${LIB_UI_OBJECT_FILES})
 	mv ${TARGET} build/
 
 cleanup:
 	@echo "\nCleaning up..."
-	rm $(patsubst %, build/%, ${LIB_GRAPH_OBJECT_FILES} ${LIB_UI_OBJECT_FILES})
+	rm $(patsubst %, build/graph/%, ${LIB_GRAPH_OBJECT_FILES}) $(patsubst %, build/ui/%, ${LIB_UI_OBJECT_FILES})
diff --git a/Makefiles/Makefile_macOS b/Makefiles/Makefile_macOS
@@ -2,15 +2,15 @@ CC = g++
 CFLAGS = -std=c++17
 FRAMEWORKS = -F/Library/Frameworks
 LINKER_FLAGS = -F/Library/Frameworks/ -framework SDL2 -framework SDL2_image -framework SDL2_ttf -framework SDL2_mixer
-LIB_GRAPH_SOURCES = $(patsubst %, engine/graphics/%, graphics_context.cpp image.cpp rectangles.cpp text.cpp)
+LIB_GRAPH_SOURCES = $(patsubst %, graphics/%, graphics_context.cpp image.cpp rectangles.cpp text.cpp)
 LIB_GRAPH_OBJECT_FILES = $(shell basename -a ${LIB_GRAPH_SOURCES:.cpp=.o})
-LIB_UI_SOURCES = $(patsubst %, engine/ui/%, text.cpp event.cpp button.cpp input.cpp layout.cpp menu.cpp pannel.cpp ui_element.cpp)
+LIB_UI_SOURCES = $(patsubst %, ui/%, text.cpp event.cpp button.cpp input.cpp layout.cpp menu.cpp pannel.cpp ui_element.cpp)
 LIB_UI_OBJECT_FILES = $(shell basename -a ${LIB_UI_SOURCES:.cpp=.o})
-TARGET = Tsukuyomi
+TARGET = Tsukuyomi.a
 
-all: build_all run
+all: build link
 
-build_all: build_lib_graph build_lib_ui link
+build: build_lib_graph build_lib_ui link
 
 build_lib_graph:
 	@echo "\nBuilding GRAPHICS library..."
@@ -24,10 +24,9 @@ build_lib_ui:
 
 link:
 	@echo "\nLinking App..."
-	${CC} -o ${TARGET} $(patsubst %, build/graph/%, ${LIB_GRAPH_OBJECT_FILES}) $(patsubst %, build/ui/%, ${LIB_UI_OBJECT_FILES}) ${LINKER_FLAGS}
+	ar rs ${TARGET} $(patsubst %, build/graph/%, ${LIB_GRAPH_OBJECT_FILES}) $(patsubst %, build/ui/%, ${LIB_UI_OBJECT_FILES})
 	mv ${TARGET} build/
 
 cleanup:
 	@echo "\nCleaning up..."
-	rm $(patsubst %, build/graph/%, ${LIB_GRAPH_OBJECT_FILES})
-	rm $(patsubst %, build/ui/%, ${LIB_UI_OBJECT_FILES})
+	rm $(patsubst %, build/graph/%, ${LIB_GRAPH_OBJECT_FILES}) $(patsubst %, build/ui/%, ${LIB_UI_OBJECT_FILES})
diff --git a/build/.gitignore → build/graph/.gitignore b/build/.gitignore → build/graph/.gitignore
diff --git a/build/ui/.gitignore b/build/ui/.gitignore
@@ -0,0 +1,3 @@
+*
+*/
+!.gitignore
diff --git a/src/engine/graphics/extern.hpp → src/graphics/extern.hpp b/src/engine/graphics/extern.hpp → src/graphics/extern.hpp
diff --git a/src/engine/graphics/graphics_context.cpp → src/graphics/graphics_context.cpp b/src/engine/graphics/graphics_context.cpp → src/graphics/graphics_context.cpp
diff --git a/src/engine/graphics/graphics_context.hpp → src/graphics/graphics_context.hpp b/src/engine/graphics/graphics_context.hpp → src/graphics/graphics_context.hpp
diff --git a/src/engine/graphics/graphics_engine.hpp → src/graphics/graphics_engine.hpp b/src/engine/graphics/graphics_engine.hpp → src/graphics/graphics_engine.hpp
diff --git a/src/engine/graphics/image.cpp → src/graphics/image.cpp b/src/engine/graphics/image.cpp → src/graphics/image.cpp
diff --git a/src/engine/graphics/image.hpp → src/graphics/image.hpp b/src/engine/graphics/image.hpp → src/graphics/image.hpp
diff --git a/src/graphics/rectangles.cpp b/src/graphics/rectangles.cpp
@@ -0,0 +1,81 @@
+#include "rectangles.hpp"
+#include <iostream>
+
+void drawBaseRects (SDL_Renderer* renderer, const SDL_Rect& rect, const SDL_Color& color, const SDL_Color& border_color, int r) {
+    SDL_Rect core { rect.x + r, rect.y + r, rect.w - 2*r, rect.h - 2*r };
+    SDL_Rect left { rect.x, rect.y + r, r, rect.h - 2*r };
+    SDL_Rect right { rect.x + rect.w - r, rect.y + r, r, rect.h - 2*r };
+    SDL_Rect top { rect.x + r, rect.y, rect.w - 2*r, r };
+    SDL_Rect bottom { rect.x + r, rect.y + rect.h - r, rect.w - 2*r, r };
+
+    SDL_SetRenderDrawColor(renderer, color.r, color.g, color.b, color.a);
+    SDL_RenderFillRect(renderer, &core);
+    SDL_RenderFillRect(renderer, &left);
+    SDL_RenderFillRect(renderer, &right);
+    SDL_RenderFillRect(renderer, &top);
+    SDL_RenderFillRect(renderer, &bottom);
+
+    if(border_color.a != 0) {
+        // DRAW BORDER
+        SDL_SetRenderDrawColor(renderer, border_color.r, border_color.g, border_color.b, border_color.a);
+        SDL_RenderDrawLine(renderer, left.x, left.y, left.x, left.y + left.h);
+        SDL_RenderDrawLine(renderer, right.x + right.w, right.y, right.x + right.w, right.y + right.h);
+        SDL_RenderDrawLine(renderer, top.x, top.y, top.x + top.w, top.y);
+        SDL_RenderDrawLine(renderer, bottom.x, bottom.y + bottom.h, bottom.x + bottom.w, bottom.y + bottom.h);
+    }
+}
+
+void drawRoundedRect(SDL_Renderer* renderer, const SDL_Rect& rect, const SDL_Color& color, const SDL_Color& border_color, int r, bool shadow) {
+    if(r > 8)
+        r = 8;
+    if(shadow) {
+        // drawRoundedRect(renderer, {rect.x - static_cast<int>(rect.w/10), rect.y - static_cast<int>(rect.h/20), rect.w, rect.h}, {0, 0, 0, 200}, {0, 0, 0, 0}, r, false);
+        drawRoundedRect(renderer, {rect.x - 10, rect.y + 10, rect.w, rect.h}, {0, 0, 0, 100}, {0, 0, 0, 0}, r, false);
+    }
+    drawBaseRects(renderer, rect, color, border_color, r);
+    SDL_SetRenderDrawColor(renderer, color.r, color.g, color.b, color.a);
+
+    auto drawPoints = [renderer, rect, color, border_color, r](int r_x, int r_y) {
+        // std::cout << "Call to drawPoints:\t" << r_x << "\t" << r_y << "\n";
+        SDL_RenderDrawPoint(renderer, rect.x + rect.w - r + r_x, rect.y + r - r_y - 1);         // FIRST QUADRANT
+        SDL_RenderDrawPoint(renderer, rect.x + r - r_x - 1, rect.y + r  - r_y - 1);             // SECOND QUADRANT
+        SDL_RenderDrawPoint(renderer, rect.x + r - r_x - 1, rect.y + rect.h - r + r_y);         // THIRD QUADRANT
+        SDL_RenderDrawPoint(renderer, rect.x + rect.w - r + r_x, rect.y + rect.h - r + r_y);    // FOURTH QUADRANT
+    };
+
+    for(int r_x {0}; r_x < r; r_x++) {
+        for(int r_y {0}; r_y < r; r_y++) {
+            if(pow(r_x,2) + pow(r_y,2) <= pow(r,2)) {
+                drawPoints(r_x, r_y);
+            }
+        }
+    }
+}
+
+void drawCutRect(SDL_Renderer* renderer, const SDL_Rect& rect, const SDL_Color& color, const SDL_Color& border_color, int r, bool shadow) {
+    drawBaseRects(renderer, rect, color, border_color, r);
+    SDL_SetRenderDrawColor(renderer, color.r, color.g, color.b, color.a);
+    auto drawPoints = [renderer, rect, color, border_color, r](int r_x, int r_y) {
+        // std::cout << "Call to drawPoints:\t" << r_x << "\t" << r_y << "\n";
+        SDL_RenderDrawPoint(renderer, rect.x + rect.w - r + r_x, rect.y + r - r_y - 1);             // FIRST QUADRANT
+        SDL_RenderDrawPoint(renderer, rect.x + r - r_x - 1, rect.y + r  - r_y - 1);                      // SECOND QUADRANT
+        SDL_RenderDrawPoint(renderer, rect.x + r - r_x - 1, rect.y + rect.h - r + r_y);             // THIRD QUADRANT
+        SDL_RenderDrawPoint(renderer, rect.x + rect.w - r + r_x, rect.y + rect.h - r + r_y);    // FOURTH QUADRANT
+    };
+
+    int y_bound { 0 };
+    auto getBound = [r, &y_bound](int r_x, int r_y) {
+        y_bound = static_cast<int>(sqrt(pow(r-1, 2)-pow(r_x,2)));
+        return y_bound;
+    };
+
+    int r_x {0}, r_y {r - 1};
+    while(r_x < r) {
+        while(r_y >= 0) {
+            drawPoints(r_x, r_y);
+            r_y--;
+        }
+        r_y = r - 1 - r_x;
+        r_x++;
+    }
+}
diff --git a/src/engine/graphics/rectangles.hpp → src/graphics/rectangles.hpp b/src/engine/graphics/rectangles.hpp → src/graphics/rectangles.hpp
diff --git a/src/engine/graphics/rectangles.cpp → src/graphics/rectangles_old.cpp b/src/engine/graphics/rectangles.cpp → src/graphics/rectangles_old.cpp
diff --git a/src/engine/graphics/sound.hpp → src/graphics/sound.hpp b/src/engine/graphics/sound.hpp → src/graphics/sound.hpp
diff --git a/src/engine/graphics/text.cpp → src/graphics/text.cpp b/src/engine/graphics/text.cpp → src/graphics/text.cpp
diff --git a/src/engine/graphics/text.hpp → src/graphics/text.hpp b/src/engine/graphics/text.hpp → src/graphics/text.hpp
diff --git a/src/engine/graphics/text_old.cpp → src/graphics/text_old.cpp b/src/engine/graphics/text_old.cpp → src/graphics/text_old.cpp
diff --git a/src/engine/graphics/text_old.hpp → src/graphics/text_old.hpp b/src/engine/graphics/text_old.hpp → src/graphics/text_old.hpp
diff --git a/src/engine/ui/animations.hpp → src/ui/animations.hpp b/src/engine/ui/animations.hpp → src/ui/animations.hpp
diff --git a/src/engine/ui/background.hpp → src/ui/background.hpp b/src/engine/ui/background.hpp → src/ui/background.hpp
diff --git a/src/engine/ui/button.cpp → src/ui/button.cpp b/src/engine/ui/button.cpp → src/ui/button.cpp
diff --git a/src/engine/ui/button.hpp → src/ui/button.hpp b/src/engine/ui/button.hpp → src/ui/button.hpp
diff --git a/src/engine/ui/button_old.cpp → src/ui/button_old.cpp b/src/engine/ui/button_old.cpp → src/ui/button_old.cpp
diff --git a/src/engine/ui/button_old.hpp → src/ui/button_old.hpp b/src/engine/ui/button_old.hpp → src/ui/button_old.hpp
diff --git a/src/ui/end_menu.hpp b/src/ui/end_menu.hpp
diff --git a/src/engine/ui/event.cpp → src/ui/event.cpp b/src/engine/ui/event.cpp → src/ui/event.cpp
diff --git a/src/engine/ui/event.hpp → src/ui/event.hpp b/src/engine/ui/event.hpp → src/ui/event.hpp
diff --git a/src/engine/ui/extern.hpp → src/ui/extern.hpp b/src/engine/ui/extern.hpp → src/ui/extern.hpp
diff --git a/src/ui/game_window.hpp b/src/ui/game_window.hpp
diff --git a/src/engine/ui/image.hpp → src/ui/image.hpp b/src/engine/ui/image.hpp → src/ui/image.hpp
diff --git a/src/engine/ui/input.cpp → src/ui/input.cpp b/src/engine/ui/input.cpp → src/ui/input.cpp
diff --git a/src/engine/ui/input.hpp → src/ui/input.hpp b/src/engine/ui/input.hpp → src/ui/input.hpp
diff --git a/src/engine/ui/layout.cpp → src/ui/layout.cpp b/src/engine/ui/layout.cpp → src/ui/layout.cpp
diff --git a/src/engine/ui/layout.hpp → src/ui/layout.hpp b/src/engine/ui/layout.hpp → src/ui/layout.hpp
diff --git a/src/engine/ui/menu.cpp → src/ui/menu.cpp b/src/engine/ui/menu.cpp → src/ui/menu.cpp
diff --git a/src/engine/ui/menu.hpp → src/ui/menu.hpp b/src/engine/ui/menu.hpp → src/ui/menu.hpp
diff --git a/src/ui/options_pannel.hpp b/src/ui/options_pannel.hpp
diff --git a/src/engine/ui/pannel.cpp → src/ui/pannel.cpp b/src/engine/ui/pannel.cpp → src/ui/pannel.cpp
diff --git a/src/engine/ui/pannel.hpp → src/ui/pannel.hpp b/src/engine/ui/pannel.hpp → src/ui/pannel.hpp
diff --git a/src/ui/pause_menu.hpp b/src/ui/pause_menu.hpp
diff --git a/src/ui/start_menu.hpp b/src/ui/start_menu.hpp
diff --git a/src/ui/test_menu.cpp b/src/ui/test_menu.cpp
diff --git a/src/ui/test_menu.hpp b/src/ui/test_menu.hpp
diff --git a/src/ui/test_menu_old.cpp b/src/ui/test_menu_old.cpp
diff --git a/src/ui/test_menu_old.hpp b/src/ui/test_menu_old.hpp
diff --git a/src/engine/ui/text.cpp → src/ui/text.cpp b/src/engine/ui/text.cpp → src/ui/text.cpp
diff --git a/src/engine/ui/text.hpp → src/ui/text.hpp b/src/engine/ui/text.hpp → src/ui/text.hpp
diff --git a/src/ui/ui.hpp b/src/ui/ui.hpp
diff --git a/src/engine/ui/ui_element.cpp → src/ui/ui_element.cpp b/src/engine/ui/ui_element.cpp → src/ui/ui_element.cpp
@@ -26,18 +26,19 @@ void UI_Element::render() {
         // SDL_RenderCopy(texture, )
     }
     else if(color.a != 0 && !hidden) {
-        if(r < 1) {
-            SDL_SetRenderDrawColor(context->renderer, color.r, color.g, color.b, color.a);
-            SDL_RenderFillRect(context->renderer, &(this->rect));
+        // if(r < 1) {
+        //     SDL_SetRenderDrawColor(context->renderer, color.r, color.g, color.b, color.a);
+        //     SDL_RenderFillRect(context->renderer, &(this->rect));
 
-            if(border_color.a != 0) {
-                SDL_SetRenderDrawColor(context->renderer, border_color.r, border_color.g, border_color.b, border_color.a);
-                SDL_RenderDrawRect(context->renderer, &(this->rect));
-            }
+        //     if(border_color.a != 0) {
+        //         SDL_SetRenderDrawColor(context->renderer, border_color.r, border_color.g, border_color.b, border_color.a);
+        //         SDL_RenderDrawRect(context->renderer, &(this->rect));
+        //     }
 
-            return;
-        }
+        //     return;
+        // }
+
+        drawRoundedRect(context->renderer, this->rect, this->color, this->border_color, 5, true);
 
-        drawCutRect(context->renderer, this->rect, this->color, this->border_color, r, shadow);
     }
 }
diff --git a/src/engine/ui/ui_element.hpp → src/ui/ui_element.hpp b/src/engine/ui/ui_element.hpp → src/ui/ui_element.hpp
diff --git a/src/engine/ui/ui_engine.hpp → src/ui/ui_engine.hpp b/src/engine/ui/ui_engine.hpp → src/ui/ui_engine.hpp