From 71760514fc044f273914c17b1510fa3cf10419b3 Mon Sep 17 00:00:00 2001
From: LaG1924 <12997935+LaG1924@users.noreply.github.com>
Date: Fri, 21 Apr 2017 18:31:43 +0500
Subject: 2017-04-21

---
 Display.hpp | 35 +++++++++++++++++++++++++++++++----
 1 file changed, 31 insertions(+), 4 deletions(-)

(limited to 'Display.hpp')

diff --git a/Display.hpp b/Display.hpp
index bb1f946..d7a9089 100644
--- a/Display.hpp
+++ b/Display.hpp
@@ -1,17 +1,44 @@
 #pragma once
 
 #include <SFML/Graphics.hpp>
+#include <thread>
+#include <mutex>
+#include <condition_variable>
 #include "World.hpp"
 
 class Display {
     sf::RenderWindow *window;
-    World* world;
+    std::map<PositionI, std::array<sf::Texture,16>> sectionTextures;
+    World *world;
+    bool isGameStarted = false;
+    std::condition_variable &gameStartWaiter;
+    std::mutex gameStartMutex;
+
+    //utility methods
+    void pollEvents();
+
+    void renderWorld();
+
+    void Update();
+
+    sf::Texture &GetSectionTexture(PositionI pos);
+
+    //gameState vars
+    sf::Vector2f mousePos;
+    int renderLayer = 70;
+    //int currentId = 0;
+    bool isClicked = false;
+    int coeff = 10;
+    double frameTime = 0;
 public:
-    Display(int w=1280,int h=720,std::string title="AltCraft");
+    Display(int w, int h, std::string title, World *world, std::condition_variable &gameStartWaiter);
+
     ~Display();
-    void SetWorld(World* wrd);
-    void Update();
+
     bool IsClosed();
+
     void SetPlayerPos(float x, float z);
+
+    void MainLoop();
 };
 
-- 
cgit v1.2.3