Add minimal gui code

.gitignore

@@ -18,6 +18,8 @@ Release/
 
 # Dependencies
 SFML**
+include/
+lib/
 
 # Scons
 .sconsign.dblite

SConstruct

@@ -15,7 +15,7 @@ print("--- Using compiler: {}".format(env["CXX"]))
 
 # Link libraries
 LINUX_LIBS = ["stdc++", "sfml-graphics", "sfml-window", "sfml-system", "tgui"]
-WIN_LIBS = ["sfml-graphics", "sfml-window", "sfml-system"]
+WIN_LIBS = ["tgui", "sfml-graphics", "sfml-window", "sfml-system"]
 MINGW_LIBS = ["-static-libgcc", "-static-libstdc++", "sfml-graphics", "sfml-window", "sfml-system"]
 
 # Compiler/Linker flags

src/game/Map.cpp

@@ -37,7 +37,9 @@ void Map::loadMinimap() {
         }
     }
 
-    texture.loadFromImage(image);
+    sf::Texture tex;
+    tex.loadFromImage(image);
+    texture = tex;
     minimap.setTexture(texture);
     minimap.setPosition(minimapPos);
     minimap.setScale(minimapScale);
@@ -46,7 +48,7 @@ void Map::loadMinimap() {
 }
 
 void Map::drawMinimap(sf::RenderWindow& window) {
-    window.draw(minimap);
+    minimap.draw(window, sf::RenderStates::Default);
 }
 
 // Save minimap as a image to disk

src/game/Map.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include <SFML/Graphics.hpp>
+#include <TGUI/Widgets/Canvas.hpp>
 #include <string>
 #include <unordered_map>
 
@@ -23,14 +24,14 @@ class Map {
 
 private:
     sf::Image image;
-    sf::Texture texture;
-    sf::Sprite minimap;
+    tgui::Texture texture;
+    tgui::Sprite minimap;
 
     sf::Color background = sf::Color(170, 170, 170, transparency);
     sf::Color border = sf::Color(100, 100, 100, transparency);
     sf::Color unknown = sf::Color(12, 247, 12, transparency);
 
-    const std::string minimapPath = "minimap.png";
+    const std::string minimapPath = "./minimap.png";
 
     // TODO: Load map from elsewhere
     int map[24][24] = {

src/states/GameState.cpp

@@ -8,6 +8,7 @@ bool GameState::input(const sf::Event& event) {
     if (event.key.code == sf::Keyboard::Escape) {
         context.window->close();
     }
+    gui.handleEvent(event);
     return true;
 }
 
@@ -17,5 +18,7 @@ bool GameState::update(float delta) {
 }
 
 void GameState::draw() {
-    player1.draw(*context.window);
+    sf::RenderWindow& window = *context.window;
+    player1.draw(window);
+    gui.draw();
 }

src/states/State.cpp

@@ -6,7 +6,7 @@ State::SharedContext::SharedContext(sf::RenderWindow& window, TextureHolder& tex
 }
 
 State::State(StateManager& stateManager, SharedContext context)
-    : stateManager(&stateManager), context(context) {
+    : stateManager(&stateManager), context(context), gui(*context.window) {
 }
 
 State::~State() {

src/states/State.h

@@ -1,5 +1,6 @@
 #pragma once
 
+#include <TGUI/Gui.hpp>
 #include <memory>
 
 #include "StateType.h"
@@ -29,6 +30,7 @@ class State {
     void requestPop();
     void requestClear();
     SharedContext context;
+    tgui::Gui gui;
 
 private:
     StateManager* stateManager;