diff options
author | LaG1924 <12997935+LaG1924@users.noreply.github.com> | 2018-03-27 12:46:39 +0200 |
---|---|---|
committer | LaG1924 <12997935+LaG1924@users.noreply.github.com> | 2018-03-28 15:18:21 +0200 |
commit | 0e981d742b1f6ac098b909661923937eedd272db (patch) | |
tree | 44f4cd7c0c6fe2adf9c7db6ee4842bfcf852bd4d /src/AssetManager.hpp | |
parent | Removed that ugly texture of night sky (diff) | |
download | AltCraft-0e981d742b1f6ac098b909661923937eedd272db.tar AltCraft-0e981d742b1f6ac098b909661923937eedd272db.tar.gz AltCraft-0e981d742b1f6ac098b909661923937eedd272db.tar.bz2 AltCraft-0e981d742b1f6ac098b909661923937eedd272db.tar.lz AltCraft-0e981d742b1f6ac098b909661923937eedd272db.tar.xz AltCraft-0e981d742b1f6ac098b909661923937eedd272db.tar.zst AltCraft-0e981d742b1f6ac098b909661923937eedd272db.zip |
Diffstat (limited to 'src/AssetManager.hpp')
-rw-r--r-- | src/AssetManager.hpp | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/src/AssetManager.hpp b/src/AssetManager.hpp index 37031be..c386f7c 100644 --- a/src/AssetManager.hpp +++ b/src/AssetManager.hpp @@ -6,6 +6,8 @@ #include <GL/glew.h> #include <glm/vec4.hpp> +#include <glm/vec3.hpp> +#include <glm/mat4x4.hpp> #include "Vector.hpp" #include "Block.hpp" @@ -124,6 +126,15 @@ struct BlockModel { }; std::vector<ElementData> Elements; + + struct ParsedFace { + ElementData::FaceDirection visibility; + glm::mat4 transform; + glm::vec4 texture; + glm::vec3 color; + }; + + std::vector<ParsedFace> parsedFaces; }; inline bool operator==(const BlockModel::ElementData::FaceData::Uv &lhs, @@ -164,4 +175,6 @@ public: void LoadBlockModels(); std::string GetAssetNameByBlockId(BlockId block); + + void ParseBlockModels(); }; |