From 664e4206ed9086f88ea880a24a9d34ead5db5849 Mon Sep 17 00:00:00 2001
From: Relintai <relintai@protonmail.com>
Date: Thu, 15 Apr 2021 00:57:41 +0200
Subject: [PATCH] Renamed the widgets project to a folder structure project.
 Also structured the files into folders.

---
 .../.clang-format                             |   0
 .../DejaVuSans.ttf                            | Bin
 .../application.cpp                           |   2 +-
 .../application.h                             |   0
 .../compile.bat                               |   0
 .../17_sdl_folder_structure/compile.sh        |  42 ++++++++++++++++++
 .../core}/color.cpp                           |   0
 .../core}/color.h                             |   0
 .../core}/math.cpp                            |   0
 .../core}/math.h                              |   0
 .../core}/rect2.cpp                           |   0
 .../core}/rect2.h                             |   0
 .../core}/string.cpp                          |   0
 .../core}/string.h                            |   0
 .../core}/vector.h                            |   0
 .../core}/vector2.cpp                         |   0
 .../core}/vector2.h                           |   0
 .../core}/vector3.cpp                         |   0
 .../core}/vector3.h                           |   0
 .../impl_application.h                        |   0
 .../main.cpp                                  |   2 +-
 .../main_scene.cpp                            |   4 +-
 .../main_scene.h                              |  16 +++----
 .../renderer}/button.cpp                      |   0
 .../renderer}/button.h                        |   2 +-
 .../renderer}/camera.cpp                      |   0
 .../renderer}/camera.h                        |   2 +-
 .../renderer}/image.cpp                       |   0
 .../renderer}/image.h                         |   8 ++--
 .../renderer}/renderer.cpp                    |   2 +-
 .../renderer}/renderer.h                      |   4 +-
 .../renderer}/sprite.cpp                      |   0
 .../renderer}/sprite.h                        |   4 +-
 .../renderer}/text_image.cpp                  |   0
 .../renderer}/text_image.h                    |   6 +--
 .../renderer}/text_sprite.cpp                 |   0
 .../renderer}/text_sprite.h                   |   6 +--
 .../renderer}/texture.cpp                     |   0
 .../renderer}/texture.h                       |   0
 .../renderer}/true_type_font.cpp              |   0
 .../renderer}/true_type_font.h                |   6 +--
 .../scene.cpp                                 |   0
 .../scene.h                                   |   0
 .../ti.bmp                                    | Bin
 03_sdl_basics/17_sdl_widgets/compile.sh       |  42 ------------------
 45 files changed, 74 insertions(+), 74 deletions(-)
 rename 03_sdl_basics/{17_sdl_widgets => 17_sdl_folder_structure}/.clang-format (100%)
 rename 03_sdl_basics/{17_sdl_widgets => 17_sdl_folder_structure}/DejaVuSans.ttf (100%)
 rename 03_sdl_basics/{17_sdl_widgets => 17_sdl_folder_structure}/application.cpp (97%)
 rename 03_sdl_basics/{17_sdl_widgets => 17_sdl_folder_structure}/application.h (100%)
 rename 03_sdl_basics/{17_sdl_widgets => 17_sdl_folder_structure}/compile.bat (100%)
 create mode 100755 03_sdl_basics/17_sdl_folder_structure/compile.sh
 rename 03_sdl_basics/{17_sdl_widgets => 17_sdl_folder_structure/core}/color.cpp (100%)
 rename 03_sdl_basics/{17_sdl_widgets => 17_sdl_folder_structure/core}/color.h (100%)
 rename 03_sdl_basics/{17_sdl_widgets => 17_sdl_folder_structure/core}/math.cpp (100%)
 rename 03_sdl_basics/{17_sdl_widgets => 17_sdl_folder_structure/core}/math.h (100%)
 rename 03_sdl_basics/{17_sdl_widgets => 17_sdl_folder_structure/core}/rect2.cpp (100%)
 rename 03_sdl_basics/{17_sdl_widgets => 17_sdl_folder_structure/core}/rect2.h (100%)
 rename 03_sdl_basics/{17_sdl_widgets => 17_sdl_folder_structure/core}/string.cpp (100%)
 rename 03_sdl_basics/{17_sdl_widgets => 17_sdl_folder_structure/core}/string.h (100%)
 rename 03_sdl_basics/{17_sdl_widgets => 17_sdl_folder_structure/core}/vector.h (100%)
 rename 03_sdl_basics/{17_sdl_widgets => 17_sdl_folder_structure/core}/vector2.cpp (100%)
 rename 03_sdl_basics/{17_sdl_widgets => 17_sdl_folder_structure/core}/vector2.h (100%)
 rename 03_sdl_basics/{17_sdl_widgets => 17_sdl_folder_structure/core}/vector3.cpp (100%)
 rename 03_sdl_basics/{17_sdl_widgets => 17_sdl_folder_structure/core}/vector3.h (100%)
 rename 03_sdl_basics/{17_sdl_widgets => 17_sdl_folder_structure}/impl_application.h (100%)
 rename 03_sdl_basics/{17_sdl_widgets => 17_sdl_folder_structure}/main.cpp (95%)
 rename 03_sdl_basics/{17_sdl_widgets => 17_sdl_folder_structure}/main_scene.cpp (97%)
 rename 03_sdl_basics/{17_sdl_widgets => 17_sdl_folder_structure}/main_scene.h (64%)
 rename 03_sdl_basics/{17_sdl_widgets => 17_sdl_folder_structure/renderer}/button.cpp (100%)
 rename 03_sdl_basics/{17_sdl_widgets => 17_sdl_folder_structure/renderer}/button.h (95%)
 rename 03_sdl_basics/{17_sdl_widgets => 17_sdl_folder_structure/renderer}/camera.cpp (100%)
 rename 03_sdl_basics/{17_sdl_widgets => 17_sdl_folder_structure/renderer}/camera.h (91%)
 rename 03_sdl_basics/{17_sdl_widgets => 17_sdl_folder_structure/renderer}/image.cpp (100%)
 rename 03_sdl_basics/{17_sdl_widgets => 17_sdl_folder_structure/renderer}/image.h (93%)
 rename 03_sdl_basics/{17_sdl_widgets => 17_sdl_folder_structure/renderer}/renderer.cpp (99%)
 rename 03_sdl_basics/{17_sdl_widgets => 17_sdl_folder_structure/renderer}/renderer.h (98%)
 rename 03_sdl_basics/{17_sdl_widgets => 17_sdl_folder_structure/renderer}/sprite.cpp (100%)
 rename 03_sdl_basics/{17_sdl_widgets => 17_sdl_folder_structure/renderer}/sprite.h (97%)
 rename 03_sdl_basics/{17_sdl_widgets => 17_sdl_folder_structure/renderer}/text_image.cpp (100%)
 rename 03_sdl_basics/{17_sdl_widgets => 17_sdl_folder_structure/renderer}/text_image.h (92%)
 rename 03_sdl_basics/{17_sdl_widgets => 17_sdl_folder_structure/renderer}/text_sprite.cpp (100%)
 rename 03_sdl_basics/{17_sdl_widgets => 17_sdl_folder_structure/renderer}/text_sprite.h (92%)
 rename 03_sdl_basics/{17_sdl_widgets => 17_sdl_folder_structure/renderer}/texture.cpp (100%)
 rename 03_sdl_basics/{17_sdl_widgets => 17_sdl_folder_structure/renderer}/texture.h (100%)
 rename 03_sdl_basics/{17_sdl_widgets => 17_sdl_folder_structure/renderer}/true_type_font.cpp (100%)
 rename 03_sdl_basics/{17_sdl_widgets => 17_sdl_folder_structure/renderer}/true_type_font.h (96%)
 rename 03_sdl_basics/{17_sdl_widgets => 17_sdl_folder_structure}/scene.cpp (100%)
 rename 03_sdl_basics/{17_sdl_widgets => 17_sdl_folder_structure}/scene.h (100%)
 rename 03_sdl_basics/{17_sdl_widgets => 17_sdl_folder_structure}/ti.bmp (100%)
 delete mode 100755 03_sdl_basics/17_sdl_widgets/compile.sh

diff --git a/03_sdl_basics/17_sdl_widgets/.clang-format b/03_sdl_basics/17_sdl_folder_structure/.clang-format
similarity index 100%
rename from 03_sdl_basics/17_sdl_widgets/.clang-format
rename to 03_sdl_basics/17_sdl_folder_structure/.clang-format
diff --git a/03_sdl_basics/17_sdl_widgets/DejaVuSans.ttf b/03_sdl_basics/17_sdl_folder_structure/DejaVuSans.ttf
similarity index 100%
rename from 03_sdl_basics/17_sdl_widgets/DejaVuSans.ttf
rename to 03_sdl_basics/17_sdl_folder_structure/DejaVuSans.ttf
diff --git a/03_sdl_basics/17_sdl_widgets/application.cpp b/03_sdl_basics/17_sdl_folder_structure/application.cpp
similarity index 97%
rename from 03_sdl_basics/17_sdl_widgets/application.cpp
rename to 03_sdl_basics/17_sdl_folder_structure/application.cpp
index d86f9c3..b5da868 100644
--- a/03_sdl_basics/17_sdl_widgets/application.cpp
+++ b/03_sdl_basics/17_sdl_folder_structure/application.cpp
@@ -1,6 +1,6 @@
 #include "application.h"
 
-#include "renderer.h"
+#include "renderer/renderer.h"
 
 Application* Application::_instance = nullptr;
 
diff --git a/03_sdl_basics/17_sdl_widgets/application.h b/03_sdl_basics/17_sdl_folder_structure/application.h
similarity index 100%
rename from 03_sdl_basics/17_sdl_widgets/application.h
rename to 03_sdl_basics/17_sdl_folder_structure/application.h
diff --git a/03_sdl_basics/17_sdl_widgets/compile.bat b/03_sdl_basics/17_sdl_folder_structure/compile.bat
similarity index 100%
rename from 03_sdl_basics/17_sdl_widgets/compile.bat
rename to 03_sdl_basics/17_sdl_folder_structure/compile.bat
diff --git a/03_sdl_basics/17_sdl_folder_structure/compile.sh b/03_sdl_basics/17_sdl_folder_structure/compile.sh
new file mode 100755
index 0000000..af7ebbb
--- /dev/null
+++ b/03_sdl_basics/17_sdl_folder_structure/compile.sh
@@ -0,0 +1,42 @@
+
+if [ ! -d "obj" ]; then
+    mkdir obj
+fi
+
+if [ ! -d "bin" ]; then
+    mkdir bin
+fi
+
+#-Iinclude
+
+#g++ -Wall -g -c vector2.cpp -o obj/vector2.o
+#g++ -Wall -g -c vector3.cpp -o obj/vector3.o
+#g++ -Wall -g -c int_vector.cpp -o obj/int_vector.o
+
+g++ -Wall -g -I. -c core/math.cpp -o obj/math.o
+g++ -Wall -g $(sdl2-config --cflags) -I. -c core/rect2.cpp -o obj/rect2.o
+g++ -Wall -g $(sdl2-config --cflags) -I. -c core/color.cpp -o obj/color.o
+g++ -Wall -g $(sdl2-config --cflags) -I. -c core/vector2.cpp -o obj/vector2.o
+g++ -Wall -g $(sdl2-config --cflags) -I. -c core/vector3.cpp -o obj/vector3.o
+g++ -Wall -g -I. -c core/string.cpp -o obj/string.o
+
+g++ -Wall -g $(sdl2-config --cflags) -I. -c renderer/renderer.cpp -o obj/renderer.o 
+g++ -Wall -g $(sdl2-config --cflags) -I. -c renderer/image.cpp -o obj/image.o 
+g++ -Wall -g $(sdl2-config --cflags) -I. -c renderer/texture.cpp -o obj/texture.o 
+g++ -Wall -g $(sdl2-config --cflags) -I. -c renderer/sprite.cpp -o obj/sprite.o 
+g++ -Wall -g $(sdl2-config --cflags) -I. -c renderer/camera.cpp -o obj/camera.o 
+g++ -Wall -g $(sdl2-config --cflags) -I. -c renderer/text_image.cpp -o obj/text_image.o 
+g++ -Wall -g $(sdl2-config --cflags) -I. -c renderer/text_sprite.cpp -o obj/text_sprite.o 
+
+g++ -Wall -g $(sdl2-config --cflags) -I. -c renderer/true_type_font.cpp -o obj/true_type_font.o
+
+g++ -Wall -g $(sdl2-config --cflags) -I. -c renderer/button.cpp -o obj/button.o 
+
+g++ -Wall -g $(sdl2-config --cflags) -I. -c scene.cpp -o obj/scene.o 
+g++ -Wall -g $(sdl2-config --cflags) -I. -c application.cpp -o obj/application.o 
+g++ -Wall -g $(sdl2-config --cflags) -I. -c main_scene.cpp -o obj/main_scene.o 
+
+g++ -Wall -g $(sdl2-config --cflags) -I. -c main.cpp -o obj/main.o
+
+g++ -o bin/program obj/math.o obj/rect2.o obj/color.o obj/vector2.o obj/vector3.o obj/string.o obj/renderer.o obj/image.o obj/texture.o obj/sprite.o obj/camera.o obj/text_image.o obj/text_sprite.o  obj/true_type_font.o obj/button.o obj/scene.o obj/application.o obj/main_scene.o   obj/main.o $(sdl2-config --libs) -lSDL2_ttf 
+
diff --git a/03_sdl_basics/17_sdl_widgets/color.cpp b/03_sdl_basics/17_sdl_folder_structure/core/color.cpp
similarity index 100%
rename from 03_sdl_basics/17_sdl_widgets/color.cpp
rename to 03_sdl_basics/17_sdl_folder_structure/core/color.cpp
diff --git a/03_sdl_basics/17_sdl_widgets/color.h b/03_sdl_basics/17_sdl_folder_structure/core/color.h
similarity index 100%
rename from 03_sdl_basics/17_sdl_widgets/color.h
rename to 03_sdl_basics/17_sdl_folder_structure/core/color.h
diff --git a/03_sdl_basics/17_sdl_widgets/math.cpp b/03_sdl_basics/17_sdl_folder_structure/core/math.cpp
similarity index 100%
rename from 03_sdl_basics/17_sdl_widgets/math.cpp
rename to 03_sdl_basics/17_sdl_folder_structure/core/math.cpp
diff --git a/03_sdl_basics/17_sdl_widgets/math.h b/03_sdl_basics/17_sdl_folder_structure/core/math.h
similarity index 100%
rename from 03_sdl_basics/17_sdl_widgets/math.h
rename to 03_sdl_basics/17_sdl_folder_structure/core/math.h
diff --git a/03_sdl_basics/17_sdl_widgets/rect2.cpp b/03_sdl_basics/17_sdl_folder_structure/core/rect2.cpp
similarity index 100%
rename from 03_sdl_basics/17_sdl_widgets/rect2.cpp
rename to 03_sdl_basics/17_sdl_folder_structure/core/rect2.cpp
diff --git a/03_sdl_basics/17_sdl_widgets/rect2.h b/03_sdl_basics/17_sdl_folder_structure/core/rect2.h
similarity index 100%
rename from 03_sdl_basics/17_sdl_widgets/rect2.h
rename to 03_sdl_basics/17_sdl_folder_structure/core/rect2.h
diff --git a/03_sdl_basics/17_sdl_widgets/string.cpp b/03_sdl_basics/17_sdl_folder_structure/core/string.cpp
similarity index 100%
rename from 03_sdl_basics/17_sdl_widgets/string.cpp
rename to 03_sdl_basics/17_sdl_folder_structure/core/string.cpp
diff --git a/03_sdl_basics/17_sdl_widgets/string.h b/03_sdl_basics/17_sdl_folder_structure/core/string.h
similarity index 100%
rename from 03_sdl_basics/17_sdl_widgets/string.h
rename to 03_sdl_basics/17_sdl_folder_structure/core/string.h
diff --git a/03_sdl_basics/17_sdl_widgets/vector.h b/03_sdl_basics/17_sdl_folder_structure/core/vector.h
similarity index 100%
rename from 03_sdl_basics/17_sdl_widgets/vector.h
rename to 03_sdl_basics/17_sdl_folder_structure/core/vector.h
diff --git a/03_sdl_basics/17_sdl_widgets/vector2.cpp b/03_sdl_basics/17_sdl_folder_structure/core/vector2.cpp
similarity index 100%
rename from 03_sdl_basics/17_sdl_widgets/vector2.cpp
rename to 03_sdl_basics/17_sdl_folder_structure/core/vector2.cpp
diff --git a/03_sdl_basics/17_sdl_widgets/vector2.h b/03_sdl_basics/17_sdl_folder_structure/core/vector2.h
similarity index 100%
rename from 03_sdl_basics/17_sdl_widgets/vector2.h
rename to 03_sdl_basics/17_sdl_folder_structure/core/vector2.h
diff --git a/03_sdl_basics/17_sdl_widgets/vector3.cpp b/03_sdl_basics/17_sdl_folder_structure/core/vector3.cpp
similarity index 100%
rename from 03_sdl_basics/17_sdl_widgets/vector3.cpp
rename to 03_sdl_basics/17_sdl_folder_structure/core/vector3.cpp
diff --git a/03_sdl_basics/17_sdl_widgets/vector3.h b/03_sdl_basics/17_sdl_folder_structure/core/vector3.h
similarity index 100%
rename from 03_sdl_basics/17_sdl_widgets/vector3.h
rename to 03_sdl_basics/17_sdl_folder_structure/core/vector3.h
diff --git a/03_sdl_basics/17_sdl_widgets/impl_application.h b/03_sdl_basics/17_sdl_folder_structure/impl_application.h
similarity index 100%
rename from 03_sdl_basics/17_sdl_widgets/impl_application.h
rename to 03_sdl_basics/17_sdl_folder_structure/impl_application.h
diff --git a/03_sdl_basics/17_sdl_widgets/main.cpp b/03_sdl_basics/17_sdl_folder_structure/main.cpp
similarity index 95%
rename from 03_sdl_basics/17_sdl_widgets/main.cpp
rename to 03_sdl_basics/17_sdl_folder_structure/main.cpp
index 5f4b33a..5b7700e 100644
--- a/03_sdl_basics/17_sdl_widgets/main.cpp
+++ b/03_sdl_basics/17_sdl_folder_structure/main.cpp
@@ -5,7 +5,7 @@
 #include <SDL_ttf.h>
 
 #include "application.h"
-#include "renderer.h"
+#include "renderer/renderer.h"
 
 #include "impl_application.h"
 #define APPLICATION_CLASS ImplApplication
diff --git a/03_sdl_basics/17_sdl_widgets/main_scene.cpp b/03_sdl_basics/17_sdl_folder_structure/main_scene.cpp
similarity index 97%
rename from 03_sdl_basics/17_sdl_widgets/main_scene.cpp
rename to 03_sdl_basics/17_sdl_folder_structure/main_scene.cpp
index 46bbb25..de863fe 100644
--- a/03_sdl_basics/17_sdl_widgets/main_scene.cpp
+++ b/03_sdl_basics/17_sdl_folder_structure/main_scene.cpp
@@ -1,7 +1,7 @@
 #include "main_scene.h"
 
-#include "rect2.h"
-#include "renderer.h"
+#include "core/rect2.h"
+#include "renderer/renderer.h"
 
 #include <SDL.h>
 
diff --git a/03_sdl_basics/17_sdl_widgets/main_scene.h b/03_sdl_basics/17_sdl_folder_structure/main_scene.h
similarity index 64%
rename from 03_sdl_basics/17_sdl_widgets/main_scene.h
rename to 03_sdl_basics/17_sdl_folder_structure/main_scene.h
index bd70363..3b6b25f 100644
--- a/03_sdl_basics/17_sdl_widgets/main_scene.h
+++ b/03_sdl_basics/17_sdl_folder_structure/main_scene.h
@@ -3,14 +3,14 @@
 
 #include "scene.h"
 
-#include "image.h"
-#include "texture.h"
-#include "sprite.h"
-#include "camera.h"
-#include "button.h"
-#include "true_type_font.h"
-#include "text_image.h"
-#include "text_sprite.h"
+#include "renderer/image.h"
+#include "renderer/texture.h"
+#include "renderer/sprite.h"
+#include "renderer/camera.h"
+#include "renderer/button.h"
+#include "renderer/true_type_font.h"
+#include "renderer/text_image.h"
+#include "renderer/text_sprite.h"
 
 class MainScene : public Scene {
 public:
diff --git a/03_sdl_basics/17_sdl_widgets/button.cpp b/03_sdl_basics/17_sdl_folder_structure/renderer/button.cpp
similarity index 100%
rename from 03_sdl_basics/17_sdl_widgets/button.cpp
rename to 03_sdl_basics/17_sdl_folder_structure/renderer/button.cpp
diff --git a/03_sdl_basics/17_sdl_widgets/button.h b/03_sdl_basics/17_sdl_folder_structure/renderer/button.h
similarity index 95%
rename from 03_sdl_basics/17_sdl_widgets/button.h
rename to 03_sdl_basics/17_sdl_folder_structure/renderer/button.h
index c7f49a6..da34ef2 100644
--- a/03_sdl_basics/17_sdl_widgets/button.h
+++ b/03_sdl_basics/17_sdl_folder_structure/renderer/button.h
@@ -4,7 +4,7 @@
 
 #include <SDL.h>
 
-#include "rect2.h"
+#include "core/rect2.h"
 #include "sprite.h"
 
 #include <functional>
diff --git a/03_sdl_basics/17_sdl_widgets/camera.cpp b/03_sdl_basics/17_sdl_folder_structure/renderer/camera.cpp
similarity index 100%
rename from 03_sdl_basics/17_sdl_widgets/camera.cpp
rename to 03_sdl_basics/17_sdl_folder_structure/renderer/camera.cpp
diff --git a/03_sdl_basics/17_sdl_widgets/camera.h b/03_sdl_basics/17_sdl_folder_structure/renderer/camera.h
similarity index 91%
rename from 03_sdl_basics/17_sdl_widgets/camera.h
rename to 03_sdl_basics/17_sdl_folder_structure/renderer/camera.h
index dea8d09..3ae59bc 100644
--- a/03_sdl_basics/17_sdl_widgets/camera.h
+++ b/03_sdl_basics/17_sdl_folder_structure/renderer/camera.h
@@ -3,7 +3,7 @@
 
 #include <SDL.h>
 
-#include "rect2.h"
+#include "core/rect2.h"
 
 class Camera {
 public:
diff --git a/03_sdl_basics/17_sdl_widgets/image.cpp b/03_sdl_basics/17_sdl_folder_structure/renderer/image.cpp
similarity index 100%
rename from 03_sdl_basics/17_sdl_widgets/image.cpp
rename to 03_sdl_basics/17_sdl_folder_structure/renderer/image.cpp
diff --git a/03_sdl_basics/17_sdl_widgets/image.h b/03_sdl_basics/17_sdl_folder_structure/renderer/image.h
similarity index 93%
rename from 03_sdl_basics/17_sdl_widgets/image.h
rename to 03_sdl_basics/17_sdl_folder_structure/renderer/image.h
index 86fcdc4..5b2c782 100644
--- a/03_sdl_basics/17_sdl_widgets/image.h
+++ b/03_sdl_basics/17_sdl_folder_structure/renderer/image.h
@@ -1,10 +1,10 @@
 #ifndef IMAGE_H
 #define IMAGE_H
 
-#include "color.h"
-#include "rect2.h"
-#include "string.h"
-#include "vector.h"
+#include "core/color.h"
+#include "core/rect2.h"
+#include "core/string.h"
+#include "core/vector.h"
 #include <SDL.h>
 
 class Image {
diff --git a/03_sdl_basics/17_sdl_widgets/renderer.cpp b/03_sdl_basics/17_sdl_folder_structure/renderer/renderer.cpp
similarity index 99%
rename from 03_sdl_basics/17_sdl_widgets/renderer.cpp
rename to 03_sdl_basics/17_sdl_folder_structure/renderer/renderer.cpp
index 04f74d2..ba3adb9 100644
--- a/03_sdl_basics/17_sdl_widgets/renderer.cpp
+++ b/03_sdl_basics/17_sdl_folder_structure/renderer/renderer.cpp
@@ -2,7 +2,7 @@
 
 #include <cstdio>
 
-#include "math.h"
+#include "core/math.h"
 
 void Renderer::present() {
 	SDL_RenderPresent(_renderer);
diff --git a/03_sdl_basics/17_sdl_widgets/renderer.h b/03_sdl_basics/17_sdl_folder_structure/renderer/renderer.h
similarity index 98%
rename from 03_sdl_basics/17_sdl_widgets/renderer.h
rename to 03_sdl_basics/17_sdl_folder_structure/renderer/renderer.h
index d6c4dcb..516e553 100644
--- a/03_sdl_basics/17_sdl_widgets/renderer.h
+++ b/03_sdl_basics/17_sdl_folder_structure/renderer/renderer.h
@@ -1,8 +1,8 @@
 #ifndef RENDERER_H
 #define RENDERER_H
 
-#include "color.h"
-#include "rect2.h"
+#include "core/color.h"
+#include "core/rect2.h"
 #include "sprite.h"
 #include "texture.h"
 
diff --git a/03_sdl_basics/17_sdl_widgets/sprite.cpp b/03_sdl_basics/17_sdl_folder_structure/renderer/sprite.cpp
similarity index 100%
rename from 03_sdl_basics/17_sdl_widgets/sprite.cpp
rename to 03_sdl_basics/17_sdl_folder_structure/renderer/sprite.cpp
diff --git a/03_sdl_basics/17_sdl_widgets/sprite.h b/03_sdl_basics/17_sdl_folder_structure/renderer/sprite.h
similarity index 97%
rename from 03_sdl_basics/17_sdl_widgets/sprite.h
rename to 03_sdl_basics/17_sdl_folder_structure/renderer/sprite.h
index 50edd9e..2b4e153 100644
--- a/03_sdl_basics/17_sdl_widgets/sprite.h
+++ b/03_sdl_basics/17_sdl_folder_structure/renderer/sprite.h
@@ -3,9 +3,9 @@
 
 #include <SDL.h>
 
-#include "rect2.h"
+#include "core/rect2.h"
 #include "texture.h"
-#include "color.h"
+#include "core/color.h"
 
 class Sprite {
 public:
diff --git a/03_sdl_basics/17_sdl_widgets/text_image.cpp b/03_sdl_basics/17_sdl_folder_structure/renderer/text_image.cpp
similarity index 100%
rename from 03_sdl_basics/17_sdl_widgets/text_image.cpp
rename to 03_sdl_basics/17_sdl_folder_structure/renderer/text_image.cpp
diff --git a/03_sdl_basics/17_sdl_widgets/text_image.h b/03_sdl_basics/17_sdl_folder_structure/renderer/text_image.h
similarity index 92%
rename from 03_sdl_basics/17_sdl_widgets/text_image.h
rename to 03_sdl_basics/17_sdl_folder_structure/renderer/text_image.h
index 2112818..7aad017 100644
--- a/03_sdl_basics/17_sdl_widgets/text_image.h
+++ b/03_sdl_basics/17_sdl_folder_structure/renderer/text_image.h
@@ -3,11 +3,11 @@
 
 #include <SDL.h>
 
-#include "color.h"
+#include "core/color.h"
 #include "image.h"
-#include "string.h"
+#include "core/string.h"
 #include "true_type_font.h"
-#include "vector2.h"
+#include "core/vector2.h"
 
 class TextImage {
 public:
diff --git a/03_sdl_basics/17_sdl_widgets/text_sprite.cpp b/03_sdl_basics/17_sdl_folder_structure/renderer/text_sprite.cpp
similarity index 100%
rename from 03_sdl_basics/17_sdl_widgets/text_sprite.cpp
rename to 03_sdl_basics/17_sdl_folder_structure/renderer/text_sprite.cpp
diff --git a/03_sdl_basics/17_sdl_widgets/text_sprite.h b/03_sdl_basics/17_sdl_folder_structure/renderer/text_sprite.h
similarity index 92%
rename from 03_sdl_basics/17_sdl_widgets/text_sprite.h
rename to 03_sdl_basics/17_sdl_folder_structure/renderer/text_sprite.h
index ae32b26..1ac5799 100644
--- a/03_sdl_basics/17_sdl_widgets/text_sprite.h
+++ b/03_sdl_basics/17_sdl_folder_structure/renderer/text_sprite.h
@@ -5,11 +5,11 @@
 
 #include "sprite.h"
 
-#include "color.h"
+#include "core/color.h"
 #include "image.h"
-#include "string.h"
+#include "core/string.h"
 #include "true_type_font.h"
-#include "vector2.h"
+#include "core/vector2.h"
 #include "text_image.h"
 
 class TextSprite : public Sprite {
diff --git a/03_sdl_basics/17_sdl_widgets/texture.cpp b/03_sdl_basics/17_sdl_folder_structure/renderer/texture.cpp
similarity index 100%
rename from 03_sdl_basics/17_sdl_widgets/texture.cpp
rename to 03_sdl_basics/17_sdl_folder_structure/renderer/texture.cpp
diff --git a/03_sdl_basics/17_sdl_widgets/texture.h b/03_sdl_basics/17_sdl_folder_structure/renderer/texture.h
similarity index 100%
rename from 03_sdl_basics/17_sdl_widgets/texture.h
rename to 03_sdl_basics/17_sdl_folder_structure/renderer/texture.h
diff --git a/03_sdl_basics/17_sdl_widgets/true_type_font.cpp b/03_sdl_basics/17_sdl_folder_structure/renderer/true_type_font.cpp
similarity index 100%
rename from 03_sdl_basics/17_sdl_widgets/true_type_font.cpp
rename to 03_sdl_basics/17_sdl_folder_structure/renderer/true_type_font.cpp
diff --git a/03_sdl_basics/17_sdl_widgets/true_type_font.h b/03_sdl_basics/17_sdl_folder_structure/renderer/true_type_font.h
similarity index 96%
rename from 03_sdl_basics/17_sdl_widgets/true_type_font.h
rename to 03_sdl_basics/17_sdl_folder_structure/renderer/true_type_font.h
index f8808b9..e31052a 100644
--- a/03_sdl_basics/17_sdl_widgets/true_type_font.h
+++ b/03_sdl_basics/17_sdl_folder_structure/renderer/true_type_font.h
@@ -4,9 +4,9 @@
 #include <SDL.h>
 #include <SDL_ttf.h>
 
-#include "color.h"
-#include "string.h"
-#include "vector2.h"
+#include "core/color.h"
+#include "core/string.h"
+#include "core/vector2.h"
 #include "image.h"
 
 class TrueTypeFont {
diff --git a/03_sdl_basics/17_sdl_widgets/scene.cpp b/03_sdl_basics/17_sdl_folder_structure/scene.cpp
similarity index 100%
rename from 03_sdl_basics/17_sdl_widgets/scene.cpp
rename to 03_sdl_basics/17_sdl_folder_structure/scene.cpp
diff --git a/03_sdl_basics/17_sdl_widgets/scene.h b/03_sdl_basics/17_sdl_folder_structure/scene.h
similarity index 100%
rename from 03_sdl_basics/17_sdl_widgets/scene.h
rename to 03_sdl_basics/17_sdl_folder_structure/scene.h
diff --git a/03_sdl_basics/17_sdl_widgets/ti.bmp b/03_sdl_basics/17_sdl_folder_structure/ti.bmp
similarity index 100%
rename from 03_sdl_basics/17_sdl_widgets/ti.bmp
rename to 03_sdl_basics/17_sdl_folder_structure/ti.bmp
diff --git a/03_sdl_basics/17_sdl_widgets/compile.sh b/03_sdl_basics/17_sdl_widgets/compile.sh
deleted file mode 100755
index 709c8c7..0000000
--- a/03_sdl_basics/17_sdl_widgets/compile.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-
-if [ ! -d "obj" ]; then
-    mkdir obj
-fi
-
-if [ ! -d "bin" ]; then
-    mkdir bin
-fi
-
-#-Iinclude
-
-#g++ -Wall -g -c vector2.cpp -o obj/vector2.o
-#g++ -Wall -g -c vector3.cpp -o obj/vector3.o
-#g++ -Wall -g -c int_vector.cpp -o obj/int_vector.o
-
-g++ -Wall -g -c math.cpp -o obj/math.o
-g++ -Wall -g $(sdl2-config --cflags) -c rect2.cpp -o obj/rect2.o
-g++ -Wall -g $(sdl2-config --cflags) -c color.cpp -o obj/color.o
-g++ -Wall -g $(sdl2-config --cflags) -c vector2.cpp -o obj/vector2.o
-g++ -Wall -g $(sdl2-config --cflags) -c vector3.cpp -o obj/vector3.o
-g++ -Wall -g -c string.cpp -o obj/string.o
-
-g++ -Wall -g $(sdl2-config --cflags) -c renderer.cpp -o obj/renderer.o 
-g++ -Wall -g $(sdl2-config --cflags) -c image.cpp -o obj/image.o 
-g++ -Wall -g $(sdl2-config --cflags) -c texture.cpp -o obj/texture.o 
-g++ -Wall -g $(sdl2-config --cflags) -c sprite.cpp -o obj/sprite.o 
-g++ -Wall -g $(sdl2-config --cflags) -c camera.cpp -o obj/camera.o 
-g++ -Wall -g $(sdl2-config --cflags) -c text_image.cpp -o obj/text_image.o 
-g++ -Wall -g $(sdl2-config --cflags) -c text_sprite.cpp -o obj/text_sprite.o 
-
-g++ -Wall -g $(sdl2-config --cflags) -c true_type_font.cpp -o obj/true_type_font.o
-
-g++ -Wall -g $(sdl2-config --cflags) -c button.cpp -o obj/button.o 
-
-g++ -Wall -g $(sdl2-config --cflags) -c scene.cpp -o obj/scene.o 
-g++ -Wall -g $(sdl2-config --cflags) -c application.cpp -o obj/application.o 
-g++ -Wall -g $(sdl2-config --cflags) -c main_scene.cpp -o obj/main_scene.o 
-
-g++ -Wall -g $(sdl2-config --cflags) -c main.cpp -o obj/main.o
-
-g++ -o bin/program obj/math.o obj/rect2.o obj/color.o obj/vector2.o obj/vector3.o obj/string.o obj/renderer.o obj/image.o obj/texture.o obj/sprite.o obj/camera.o obj/text_image.o obj/text_sprite.o  obj/true_type_font.o obj/button.o obj/scene.o obj/application.o obj/main_scene.o   obj/main.o $(sdl2-config --libs) -lSDL2_ttf 
-