From 71d364d9d8b80fad541dc883c727d8984c247f4b Mon Sep 17 00:00:00 2001 From: Bram Verhulst Date: Thu, 4 Apr 2024 13:49:38 +0200 Subject: [PATCH] Added inheritance for the screen system basic edge detection for tile rendering --- .idea/.idea.Motherload/.idea/workspace.xml | 476 ++---------------- Game/GridSystem/WorldGridManager.cpp | 37 ++ Game/GridSystem/WorldGridManager.h | 3 + Game/GridSystem/WorldTile.cpp | 52 +- Game/GridSystem/WorldTile.h | 11 +- Game/Gui/Button.cpp | 8 +- Game/Gui/Button.h | 1 + Game/Gui/Screens/FuelScreen.cpp | 37 ++ Game/Gui/Screens/ScreenManager.cpp | 35 +- Game/WorldLevel.cpp | 22 +- Game/WorldLevel.h | 2 +- Resources/gui/close.png | Bin 0 -> 1117 bytes Resources/gui/fuel/10dollars.png | Bin 0 -> 15223 bytes Resources/gui/fuel/25dollars.png | Bin 0 -> 15428 bytes Resources/gui/fuel/50dollars.png | Bin 0 -> 15429 bytes Resources/gui/fuel/5dollars.png | Bin 0 -> 15184 bytes Resources/gui/fuel/background.png | Bin 0 -> 179341 bytes Resources/gui/fuel/fillTank.png | Bin 0 -> 31786 bytes Resources/gui/sell/background.png | Bin 0 -> 83257 bytes .../tiles/dirt/sidepieces/bottomLeft.png | Bin 0 -> 484 bytes .../tiles/dirt/sidepieces/bottomRight.png | Bin 0 -> 481 bytes Resources/tiles/dirt/sidepieces/topLeft.png | Bin 0 -> 252 bytes Resources/tiles/dirt/sidepieces/topRight.png | Bin 0 -> 484 bytes 23 files changed, 203 insertions(+), 481 deletions(-) create mode 100644 Resources/gui/close.png create mode 100644 Resources/gui/fuel/10dollars.png create mode 100644 Resources/gui/fuel/25dollars.png create mode 100644 Resources/gui/fuel/50dollars.png create mode 100644 Resources/gui/fuel/5dollars.png create mode 100644 Resources/gui/fuel/background.png create mode 100644 Resources/gui/fuel/fillTank.png create mode 100644 Resources/gui/sell/background.png create mode 100644 Resources/tiles/dirt/sidepieces/bottomLeft.png create mode 100644 Resources/tiles/dirt/sidepieces/bottomRight.png create mode 100644 Resources/tiles/dirt/sidepieces/topLeft.png create mode 100644 Resources/tiles/dirt/sidepieces/topRight.png diff --git a/.idea/.idea.Motherload/.idea/workspace.xml b/.idea/.idea.Motherload/.idea/workspace.xml index 6d98451..537d389 100644 --- a/.idea/.idea.Motherload/.idea/workspace.xml +++ b/.idea/.idea.Motherload/.idea/workspace.xml @@ -10,27 +10,18 @@