textures

[blank.git] / src / app / app.cpp

diff --git a/src/app/app.cpp b/src/app/app.cpp
index 420dee70aad191c042ac90d719cc01caa70c5fa0..f3c9115faedf3b50c96002efe1c231ee0e0547ed 100644 (file)
--- a/src/app/app.cpp
+++ b/src/app/app.cpp
@@ -7,12 +7,15 @@
 
 #include "init.hpp"
 #include "../audio/Sound.hpp"
+#include "../graphics/ArrayTexture.hpp"
 #include "../graphics/Font.hpp"
+#include "../graphics/Texture.hpp"
 #include "../world/BlockType.hpp"
 #include "../world/Entity.hpp"
 
 #include <iostream>
 #include <stdexcept>
+#include <SDL_image.h>
 
 using std::string;
 
@@ -195,7 +198,8 @@ void StateControl::Commit(Application &app) {
 
 Assets::Assets(const string &base)
 : fonts(base + "fonts/")
-, sounds(base + "sounds/") {
+, sounds(base + "sounds/")
+, textures(base + "textures/") {
 
 }
 
@@ -209,6 +213,35 @@ Sound Assets::LoadSound(const string &name) const {
        return Sound(full.c_str());
 }
 
+Texture Assets::LoadTexture(const string &name) const {
+       string full = textures + name + ".png";
+       Texture tex;
+       SDL_Surface *srf = IMG_Load(full.c_str());
+       if (!srf) {
+               throw SDLError("IMG_Load");
+       }
+       tex.Bind();
+       tex.Data(*srf);
+       SDL_FreeSurface(srf);
+       return tex;
+}
+
+void Assets::LoadTexture(const string &name, ArrayTexture &tex, int layer) const {
+       string full = textures + name + ".png";
+       SDL_Surface *srf = IMG_Load(full.c_str());
+       if (!srf) {
+               throw SDLError("IMG_Load");
+       }
+       tex.Bind();
+       try {
+               tex.Data(layer, *srf);
+       } catch (...) {
+               SDL_FreeSurface(srf);
+               throw;
+       }
+       SDL_FreeSurface(srf);
+}
+
 
 void FrameCounter::EnterFrame() noexcept {
        last_enter = SDL_GetTicks();