diff --git a/bin/crumpet-engine b/bin/crumpet-engine index a5516ff..9ba64ef 100755 Binary files a/bin/crumpet-engine and b/bin/crumpet-engine differ 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 +#include +#include +#include + +#include "entity.h" + class EntityManager { - +public: + EntityManager(): + + virtual ~EntityManager(); +private: + std::map 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(); } }