diff options
author | LaG1924 <12997935+LaG1924@users.noreply.github.com> | 2017-05-12 15:49:50 +0200 |
---|---|---|
committer | LaG1924 <12997935+LaG1924@users.noreply.github.com> | 2017-05-12 15:49:50 +0200 |
commit | e62817b8252974b8a98393275874ee303840bf13 (patch) | |
tree | 4565935f06e369f4a84410b0c098958e07a750c7 /graphics/AssetManager.hpp | |
parent | 2017-05-10 (diff) | |
download | AltCraft-e62817b8252974b8a98393275874ee303840bf13.tar AltCraft-e62817b8252974b8a98393275874ee303840bf13.tar.gz AltCraft-e62817b8252974b8a98393275874ee303840bf13.tar.bz2 AltCraft-e62817b8252974b8a98393275874ee303840bf13.tar.lz AltCraft-e62817b8252974b8a98393275874ee303840bf13.tar.xz AltCraft-e62817b8252974b8a98393275874ee303840bf13.tar.zst AltCraft-e62817b8252974b8a98393275874ee303840bf13.zip |
Diffstat (limited to 'graphics/AssetManager.hpp')
-rw-r--r-- | graphics/AssetManager.hpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/graphics/AssetManager.hpp b/graphics/AssetManager.hpp index 81be7c4..b2ff570 100644 --- a/graphics/AssetManager.hpp +++ b/graphics/AssetManager.hpp @@ -2,19 +2,15 @@ #include <fstream> #include <string> -#include <SOIL.h> #include <map> #include "../json.hpp" +#include "Texture.hpp" struct Asset { std::string name = ""; std::string hash = ""; union AssetData{ - struct TextureData{ - int width; - int height; - unsigned char *imageData; - } texture; + Texture *texture; } data; size_t size = 0; enum AssetType { @@ -38,12 +34,15 @@ class AssetManager { AssetManager &operator=(const AssetManager &); std::map<std::string, Asset> assets; -public: + static AssetManager &instance() { static AssetManager assetManager; return assetManager; } + static std::string GetPathToAsset(std::string AssetName); +public: + static Asset &GetAsset(std::string AssetName); static void LoadAsset(std::string AssetName); |