rendering improvements

5 files changed, 40 insertions, 6 deletions

diff --git a/include/config.hpp b/include/config.hpp
index 305f61e..e825299 100644
--- a/include/config.hpp
+++ b/include/config.hpp
@@ -31,6 +31,11 @@ namespace game {
 	 */
 	extern bool FULLSCREEN;
 
+	/**
+	 * V-Sync is enabled if this is true. Only checked at program start.
+	 */
+	extern bool vsync;
+
 	namespace config {
 		/**
 		 * The current volume level of the master channel.
diff --git a/include/font.hpp b/include/font.hpp
index a520c15..7dc7fc6 100644
--- a/include/font.hpp
+++ b/include/font.hpp
@@ -1,8 +1,9 @@
 #ifndef FONT_HPP_
 #define FONT_HPP_
 
-#include <vector>
 #include <map>
+#include <memory>
+#include <vector>
 
 #include <color.hpp>
 #include <render.hpp>
@@ -28,6 +29,7 @@ private:
 
 	static std::string fontFamily;
 	static std::map<int, std::vector<FT_Info>> fontData;
+	static std::vector<std::unique_ptr<GLfloat>> drawData;
 
 	static int currentSize;
 	static Color currentColor;
@@ -46,6 +48,8 @@ public:
 
 	static vec2 putChar(float xx, float yy, char c);
 
+	static void render(void);
+
 	static inline int getSize(void)
 	{ return currentSize; }
 
diff --git a/include/player.hpp b/include/player.hpp
index 17ce2c1..077e798 100644
--- a/include/player.hpp
+++ b/include/player.hpp
@@ -80,8 +80,7 @@ public:
 	 * Gets the width of the player.
 	 * @return the player's width, according to its sprite
 	 */
-    static inline float getWidth(void) 
-    { return game::entities.component<Solid>(player.id())->width; }
+    static float getWidth(void); 
 };
 
 #endif // PLAYER_HPP_
diff --git a/include/thread.hpp b/include/thread.hpp
index 3adc43d..0dd20f9 100644
--- a/include/thread.hpp
+++ b/include/thread.hpp
@@ -12,15 +12,22 @@
 
 class GameThread : public entityx::Receiver<GameThread> {
 private:
+	static std::atomic_bool pause;
+
 	std::atomic_bool die;
 	std::thread thread;
 
 public:
 	GameThread(std::function<void(void)> func) {
 		die.store(false);
+		pause.store(false);
 		thread = std::thread([&](std::function<void(void)> f) {
-			while (!die.load())
-				f();
+			while (!die.load()) {
+				if (!pause.load())
+					f();
+				else
+					std::this_thread::sleep_for(std::chrono::milliseconds(1));
+			}
 		}, func);
 	}
 
@@ -31,6 +38,17 @@ public:
 	inline void stop(void) {
 		die.store(true);
 	}
+
+	static inline void pauseAll(void) {
+		pause.store(true);
+		std::this_thread::sleep_for(std::chrono::milliseconds(10));
+	}
+
+	static inline void resumeAll(void)
+	{ pause.store(false); }
+
+	static inline bool isPaused(void)
+	{ return pause.load(); }
 };
 
-#endif // THREAD_HPP_
\ No newline at end of file
+#endif // THREAD_HPP_
diff --git a/include/world.hpp b/include/world.hpp
index ac55b56..bfd0464 100644
--- a/include/world.hpp
+++ b/include/world.hpp
@@ -136,8 +136,12 @@ private:
 	 */
 	static std::string currentXMLFile;
 
+	static std::string toLoad;
+
 	static std::vector<vec2> stars;
 
+	static int getLineIndex(float x);
+
 public:
 	static std::thread thAmbient;
 
@@ -178,6 +182,10 @@ public:
 	void fight(entityx::Entity entity);
 
 	static void die(void);
+	static void loader(void);
+
+	static inline bool shouldLoad(void)
+	{ return !toLoad.empty(); }
 };
 
 #endif // WORLD_HPP_