From 68802b5749ad16f1e763f8eaf19c961c82027aeb Mon Sep 17 00:00:00 2001
From: Ben <playsplane@gmail.com>
Date: Thu, 29 Nov 2018 14:52:24 +0000
Subject: [PATCH] Added some to the entity code and changed up the header for
 ResourceManager to include a virtual destructor

---
 bin/crumpet-engine                            | Bin 108480 -> 108528 bytes
 src/crumpet-engine/crumpet-engine.h           |   1 +
 src/crumpet-engine/entitymanager/entity.h     |   3 +++
 src/crumpet-engine/entitymanager/entitybase.h |   3 +++
 .../entitymanager/entitymanager.cpp           |   7 +++++++
 .../entitymanager/entitymanager.h             |  14 +++++++++++++-
 src/crumpet-engine/game.cpp                   |   3 ++-
 src/crumpet-engine/game.h                     |   2 ++
 .../resourcemanager/resourcemanager.h         |   2 ++
 src/main.cpp                                  |   4 +++-
 10 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/bin/crumpet-engine b/bin/crumpet-engine
index a5516ffe785e3b13d014d91f2697e11e0c492a1d..9ba64ef614d94b2e244338c4a32b880390e545b2 100755
GIT binary patch
delta 6408
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
WJG4i&fwH+fwBKnRWm|S=QU425@6#6m

delta 6235
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
A!~g&Q

diff --git a/src/crumpet-engine/crumpet-engine.h b/src/crumpet-engine/crumpet-engine.h
index 0bdd7c4..33152da 100644
--- a/src/crumpet-engine/crumpet-engine.h
+++ b/src/crumpet-engine/crumpet-engine.h
@@ -1,5 +1,6 @@
 #pragma once
 
 #include "game.h"
+#include "rect.h"
 
 #undef main
diff --git a/src/crumpet-engine/entitymanager/entity.h b/src/crumpet-engine/entitymanager/entity.h
index 3db9c22..0864625 100644
--- a/src/crumpet-engine/entitymanager/entity.h
+++ b/src/crumpet-engine/entitymanager/entity.h
@@ -3,5 +3,8 @@
 #include "entitybase.h"
 
 class Entity : public EntityBase {
+public:
+    Entity();
 
+    virtual ~Entity();
 };
diff --git a/src/crumpet-engine/entitymanager/entitybase.h b/src/crumpet-engine/entitymanager/entitybase.h
index 20d4d3e..bd27ae6 100644
--- a/src/crumpet-engine/entitymanager/entitybase.h
+++ b/src/crumpet-engine/entitymanager/entitybase.h
@@ -1,5 +1,8 @@
 #pragma once
 
 class EntityBase {
+public:
+    EntityBase();
 
+    virtual ~EntityBase();
 };
diff --git a/src/crumpet-engine/entitymanager/entitymanager.cpp b/src/crumpet-engine/entitymanager/entitymanager.cpp
index 9f87137..c87b5ad 100644
--- a/src/crumpet-engine/entitymanager/entitymanager.cpp
+++ b/src/crumpet-engine/entitymanager/entitymanager.cpp
@@ -1,2 +1,9 @@
 #include "entitymanager.h"
 
+EntityManager::EntityManager() {
+
+}
+
+EntityManager::~EntityManager() {
+    
+}
diff --git a/src/crumpet-engine/entitymanager/entitymanager.h b/src/crumpet-engine/entitymanager/entitymanager.h
index 3be1dbf..048cf2d 100644
--- a/src/crumpet-engine/entitymanager/entitymanager.h
+++ b/src/crumpet-engine/entitymanager/entitymanager.h
@@ -1,5 +1,17 @@
 #pragma once
 
+#include <string>
+#include <iostream>
+#include <map>
+#include <vector>
+
+#include "entity.h"
+
 class EntityManager {
-    
+public:
+    EntityManager():
+
+    virtual ~EntityManager();
+private:
+    std::map<std::string, Entity> m_activeEntities;
 };
diff --git a/src/crumpet-engine/game.cpp b/src/crumpet-engine/game.cpp
index 121a0d1..33b4293 100644
--- a/src/crumpet-engine/game.cpp
+++ b/src/crumpet-engine/game.cpp
@@ -3,7 +3,8 @@
 Game::Game()
     : input(&renderer) 
     , resourceManager(&renderer) 
-    , textureManager(resourceManager.textureManager) {
+    , textureManager(resourceManager.textureManager) 
+    , entityManager() {
 
 }
 
diff --git a/src/crumpet-engine/game.h b/src/crumpet-engine/game.h
index 7d14e60..7c8be7c 100644
--- a/src/crumpet-engine/game.h
+++ b/src/crumpet-engine/game.h
@@ -7,6 +7,7 @@
 
 #include "renderengine/renderer.h"
 #include "resourcemanager/resourcemanager.h"
+#include "entitymanager/entitymanager.h"
 #include "input/input.h"
 
 class Game {
@@ -15,6 +16,7 @@ public:
 
     ResourceManger resourceManager;
     TextureManager textureManager;
+    EntityManager entityManager;
     Renderer renderer;
     Input input;
 
diff --git a/src/crumpet-engine/resourcemanager/resourcemanager.h b/src/crumpet-engine/resourcemanager/resourcemanager.h
index b486ee6..bf2748d 100644
--- a/src/crumpet-engine/resourcemanager/resourcemanager.h
+++ b/src/crumpet-engine/resourcemanager/resourcemanager.h
@@ -7,4 +7,6 @@ public:
     ResourceManger(Renderer* renderer) : textureManager(renderer) {};
 
     TextureManager textureManager;
+
+    virtual ~ResourceManger();
 };
diff --git a/src/main.cpp b/src/main.cpp
index 6b9d44a..397bbc0 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -9,7 +9,9 @@ int main(int argc, char** argv) {
 	while (!game.renderer.isWindowClosed()) {
 		game.renderer.clear();
 		game.input.poll();
-		SDL_RenderCopy(game.renderer.SDLRenderer, game.textureManager.getTexture("mario"), NULL, NULL);
+		Rect rectfrom(0, 0, 1000, 1000);
+		Rect rectTo(-300, 0, 1000, 1000);
+		SDL_RenderCopy(game.renderer.SDLRenderer, game.textureManager.getTexture("mario"), rectfrom.ToSDLRect(), rectTo.ToSDLRect());
 		game.renderer.update();
 	}
 }