From 620311fb15953984c2fe37917d678f9b3aaa00b6 Mon Sep 17 00:00:00 2001
From: Clyne Sullivan <tullivan99@gmail.com>
Date: Thu, 12 Jan 2017 09:27:43 -0500
Subject: fixes, main cleanup

---
 include/common.hpp     |  1 -
 include/components.hpp | 14 +++-----------
 include/engine.hpp     |  7 -------
 include/render.hpp     |  3 +++
 include/window.hpp     |  4 +++-
 5 files changed, 9 insertions(+), 20 deletions(-)

(limited to 'include')

diff --git a/include/common.hpp b/include/common.hpp
index 12231dc..abfd28b 100644
--- a/include/common.hpp
+++ b/include/common.hpp
@@ -14,7 +14,6 @@
 #include <algorithm>
 #include <list>
 #include <iterator>
-#include <unordered_map>
 
 // alternative windows thread library
 #ifndef __WIN32__
diff --git a/include/components.hpp b/include/components.hpp
index 00ac8fa..2ec7a28 100644
--- a/include/components.hpp
+++ b/include/components.hpp
@@ -336,19 +336,11 @@ private:
 	std::string loadTexString;
 	Texture loadTexResult;
 
-	float fadeIntensity;
-	bool fadeIn;
 public:
-	RenderSystem(void)
-		: fadeIntensity(1), fadeIn(true) {}
-
 	Texture loadTexture(const std::string& file);
-	void update(entityx::EntityManager &en, entityx::EventManager &ev, entityx::TimeDelta dt) override;
-
-	void fade(void);
-	void fadeLock(void);
-	void unfade(void);
-	void unfadeLock(void);
+	void update(entityx::EntityManager &en, entityx::EventManager &ev, entityx::TimeDelta dt) override
+	{ (void)en; (void)ev; (void)dt; }
+	void render(void);
 };
 
 class DialogSystem : public entityx::System<DialogSystem>, public entityx::Receiver<DialogSystem> {
diff --git a/include/engine.hpp b/include/engine.hpp
index a331e50..417522d 100644
--- a/include/engine.hpp
+++ b/include/engine.hpp
@@ -39,13 +39,6 @@ public:
 	 */
 	void init(void);
 
-	/**
-	 * Updates all rendering systems.
-	 * @param dt the delta time
-	 */
-    void render(entityx::TimeDelta dt);
-	void resetRender(entityx::TimeDelta dt);
-
 	/**
 	 * Updates all logic systems.
 	 * @param dt the delta time
diff --git a/include/render.hpp b/include/render.hpp
index 0a2adcd..cf58519 100644
--- a/include/render.hpp
+++ b/include/render.hpp
@@ -74,6 +74,9 @@ namespace Render {
     void useShader(Shader *s);
 
     void drawRect(vec2 ll, vec2 ur, float z);
+
+	void init(void);
+	void render(const int& fps);
 }
 
 #endif // RENDER_HPP_
diff --git a/include/window.hpp b/include/window.hpp
index 5cf05ea..d53a2bf 100644
--- a/include/window.hpp
+++ b/include/window.hpp
@@ -36,7 +36,9 @@ public:
 	void die(void);
 
 	void configure(entityx::EventManager &ev);
-    void update(entityx::EntityManager &en, entityx::EventManager &ev, entityx::TimeDelta dt) override;
+    void update(entityx::EntityManager &en, entityx::EventManager &ev, entityx::TimeDelta dt) override
+	{ (void)en; (void)ev; (void)dt; }
+	void render(void);
 	void receive(const WindowResizeEvent&);	
 	void receive(const ScreenshotEvent&);
 };
-- 
cgit v1.2.3