diff options
author | LaG1924 <12997935+LaG1924@users.noreply.github.com> | 2017-10-17 20:33:13 +0200 |
---|---|---|
committer | LaG1924 <12997935+LaG1924@users.noreply.github.com> | 2018-01-13 03:39:32 +0100 |
commit | a6e0c9ce9b6c468d0e622ffb5c05eba664ea4f47 (patch) | |
tree | 160309441fbe58921d9483e8d12e8d2e57955b97 /src/AssetManager.hpp | |
parent | 2017-10-15 (diff) | |
download | AltCraft-a6e0c9ce9b6c468d0e622ffb5c05eba664ea4f47.tar AltCraft-a6e0c9ce9b6c468d0e622ffb5c05eba664ea4f47.tar.gz AltCraft-a6e0c9ce9b6c468d0e622ffb5c05eba664ea4f47.tar.bz2 AltCraft-a6e0c9ce9b6c468d0e622ffb5c05eba664ea4f47.tar.lz AltCraft-a6e0c9ce9b6c468d0e622ffb5c05eba664ea4f47.tar.xz AltCraft-a6e0c9ce9b6c468d0e622ffb5c05eba664ea4f47.tar.zst AltCraft-a6e0c9ce9b6c468d0e622ffb5c05eba664ea4f47.zip |
Diffstat (limited to 'src/AssetManager.hpp')
-rw-r--r-- | src/AssetManager.hpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/AssetManager.hpp b/src/AssetManager.hpp index 7cb7f8f..1169b7d 100644 --- a/src/AssetManager.hpp +++ b/src/AssetManager.hpp @@ -1,15 +1,16 @@ #pragma once +#include <string> +#include <vector> #include <map> -#include <optional> #include <GL/glew.h> #include <glm/vec4.hpp> -#include <nlohmann/json.hpp> -#include "Block.hpp" -#include "Texture.hpp" #include "Vector.hpp" +#include "Block.hpp" + +class Texture; struct TextureCoordinates { TextureCoordinates(float x = -1, float y = -1, float w = -1, float h = -1) : x(x), y(y), w(w), h(h) {} |