diff --git a/bin/crumpet-engine b/bin/crumpet-engine index 87ac3d0..d7e557a 100755 Binary files a/bin/crumpet-engine and b/bin/crumpet-engine differ diff --git a/bin/resources/eldritch-ts.png b/bin/resources/eldritch-ts.png new file mode 100644 index 0000000..a3fb4c3 Binary files /dev/null and b/bin/resources/eldritch-ts.png differ diff --git a/src/crumpet-engine/entitymanager/entitybase.cpp b/src/crumpet-engine/entitymanager/entitybase.cpp index 6c3d113..dc25386 100644 --- a/src/crumpet-engine/entitymanager/entitybase.cpp +++ b/src/crumpet-engine/entitymanager/entitybase.cpp @@ -1,8 +1,7 @@ #include "entitybase.h" -EntityBase::EntityBase() - : textureDimensions(0, 0) { - +EntityBase::EntityBase() { + } EntityBase::~EntityBase() { diff --git a/src/crumpet-engine/entitymanager/entitybase.h b/src/crumpet-engine/entitymanager/entitybase.h index a16f5a1..6308086 100644 --- a/src/crumpet-engine/entitymanager/entitybase.h +++ b/src/crumpet-engine/entitymanager/entitybase.h @@ -14,9 +14,6 @@ public: virtual ~EntityBase(); private: - std::string textureRef; - std::string textureSource; - Vec2 textureDimensions; }; #endif diff --git a/src/crumpet-engine/resourcemanager/texturemanager.cpp b/src/crumpet-engine/resourcemanager/texturemanager.cpp index 04761aa..3c0ac1a 100644 --- a/src/crumpet-engine/resourcemanager/texturemanager.cpp +++ b/src/crumpet-engine/resourcemanager/texturemanager.cpp @@ -1,5 +1,7 @@ #include "texturemanager.h" +#include + TextureManager::TextureManager(Renderer* renderer) { m_renderer = renderer; } diff --git a/src/crumpet-engine/resourcemanager/texturemanager.h b/src/crumpet-engine/resourcemanager/texturemanager.h index 9ec9872..ae4e65d 100644 --- a/src/crumpet-engine/resourcemanager/texturemanager.h +++ b/src/crumpet-engine/resourcemanager/texturemanager.h @@ -2,11 +2,12 @@ #define _RESOURCEMANAGER_TEXTUREMANAGER_H_ #include -#include -#include +#include #include #include +#include +#include #include "../renderengine/renderer.h" struct Texture { @@ -17,6 +18,11 @@ struct Texture { std::string name; std::string source; SDL_Texture* texture; + // Vec2* textureDimensions; +}; + +struct TextureMap { + std::vector textures; }; class TextureManager { diff --git a/src/main.cpp b/src/main.cpp index fe599dd..349a462 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -7,14 +7,14 @@ int main(int argc, char** argv) { Game game; game.renderer.createWindow("Crumpet Engine", 600, 400, SCREEN_MODE_VSYNC); - game.textureManager.registerTexture("./resources/mario.png", "mario"); + game.textureManager.registerTexture("./resources/eldritch-ts.png", "Eldritch"); while (!game.renderer.isWindowClosed()) { game.renderer.clear(); game.input.poll(); - Rect rectfrom(0, 0, 1000, 1000); - Rect rectTo(-300, 0, 1000, 1000); - SDL_RenderCopy(game.renderer.SDLRenderer, game.textureManager.getSDLTexture("mario"), rectfrom.ToSDLRect(), rectTo.ToSDLRect()); + Rect rectfrom(0, 0, 100, 100); + Rect rectTo(0, 0, 400, 400); + SDL_RenderCopy(game.renderer.SDLRenderer, game.textureManager.getSDLTexture("Eldritch"), rectfrom.ToSDLRect(), rectTo.ToSDLRect()); game.renderer.update(); } }