From 8866f33c09ab1217a32881ccf09beb708e66e0bd Mon Sep 17 00:00:00 2001 From: Bram Verhulst Date: Thu, 16 May 2024 02:04:36 +0200 Subject: [PATCH] Add Text rendering and Hull / Fuel Meters --- .idea/.idea.Motherload/.idea/workspace.xml | 140 ++++------------ Engine/Text.cpp | 16 +- Engine/Text.h | 3 + Game/Game.cpp | 2 +- Game/Game.vcxproj | 152 +++++++++++++++++- .../GroundTileTypeManager.cpp | 0 Game/{ => GridSystem}/GroundTileTypeManager.h | 0 Game/Gui/GuiText.cpp | 26 +++ Game/Gui/GuiText.h | 20 +++ Game/Gui/Screens/MainScreen.cpp | 24 ++- Game/Gui/Screens/MainScreen.h | 7 + Game/Levels/World/Building.cpp | 4 +- Game/Levels/World/WorldLevel.cpp | 5 +- Game/Levels/World/WorldLevel.h | 3 +- Game/Player.cpp | 2 +- Resources/fonts/Arial.ttf | Bin 0 -> 23928 bytes Resources/gui/main/fuel/fuel.png | Bin 58466 -> 34241 bytes Resources/gui/main/hull/hull.png | Bin 0 -> 36043 bytes 18 files changed, 286 insertions(+), 118 deletions(-) rename Game/{ => GridSystem}/GroundTileTypeManager.cpp (100%) rename Game/{ => GridSystem}/GroundTileTypeManager.h (100%) create mode 100644 Game/Gui/GuiText.cpp create mode 100644 Game/Gui/GuiText.h create mode 100644 Resources/fonts/Arial.ttf create mode 100644 Resources/gui/main/hull/hull.png diff --git a/.idea/.idea.Motherload/.idea/workspace.xml b/.idea/.idea.Motherload/.idea/workspace.xml index 14ac547..562475c 100644 --- a/.idea/.idea.Motherload/.idea/workspace.xml +++ b/.idea/.idea.Motherload/.idea/workspace.xml @@ -11,22 +11,21 @@ - - + + + + - - - - - - + + + + + - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -155,28 +78,28 @@ - { - "keyToString": { - "C++ Project.Game.executor": "Debug", - "RunOnceActivity.OpenProjectViewOnStart": "true", - "RunOnceActivity.ShowReadmeOnStart": "true", - "ignore.virus.scanning.warn.message": "true", - "node.js.detected.package.eslint": "true", - "node.js.detected.package.tslint": "true", - "node.js.selected.package.eslint": "(autodetect)", - "node.js.selected.package.tslint": "(autodetect)", - "nodejs_package_manager_path": "npm", - "settings.editor.selected.configurable": "preferences.pluginManager", - "vue.rearranger.settings.migration": "true" + +}]]> @@ -324,7 +247,10 @@ - + + + +