summaryrefslogtreecommitdiffstats
path: root/src/AssetManager.hpp
diff options
context:
space:
mode:
authorLaG1924 <12997935+LaG1924@users.noreply.github.com>2018-08-09 21:09:29 +0200
committerLaG1924 <12997935+LaG1924@users.noreply.github.com>2018-08-09 21:09:29 +0200
commitcea95bd7351d66c72832f1688666cd9ef214a23f (patch)
tree770d5d27da7b9f27b973b86f325ea307042831d7 /src/AssetManager.hpp
parentWorkaround for liquids (diff)
downloadAltCraft-cea95bd7351d66c72832f1688666cd9ef214a23f.tar
AltCraft-cea95bd7351d66c72832f1688666cd9ef214a23f.tar.gz
AltCraft-cea95bd7351d66c72832f1688666cd9ef214a23f.tar.bz2
AltCraft-cea95bd7351d66c72832f1688666cd9ef214a23f.tar.lz
AltCraft-cea95bd7351d66c72832f1688666cd9ef214a23f.tar.xz
AltCraft-cea95bd7351d66c72832f1688666cd9ef214a23f.tar.zst
AltCraft-cea95bd7351d66c72832f1688666cd9ef214a23f.zip
Diffstat (limited to 'src/AssetManager.hpp')
-rw-r--r--src/AssetManager.hpp36
1 files changed, 18 insertions, 18 deletions
diff --git a/src/AssetManager.hpp b/src/AssetManager.hpp
index e05ba31..992bd51 100644
--- a/src/AssetManager.hpp
+++ b/src/AssetManager.hpp
@@ -14,6 +14,24 @@
#include "Block.hpp"
#include "TextureAtlas.hpp"
+enum FaceDirection {
+ down,
+ up,
+ north,
+ south,
+ west,
+ east,
+ none,
+};
+
+struct ParsedFace {
+ FaceDirection visibility;
+ glm::mat4 transform;
+ glm::vec4 texture;
+ float layer;
+ glm::vec3 color;
+};
+
struct BlockModel {
bool IsBlock = false;
std::string BlockName;
@@ -56,16 +74,6 @@ struct BlockModel {
bool shade = true;
- enum FaceDirection {
- down,
- up,
- north,
- south,
- west,
- east,
- none,
- };
-
struct FaceData {
struct Uv {
int x1, y1, x2, y2;
@@ -82,14 +90,6 @@ struct BlockModel {
std::vector<ElementData> Elements;
- struct ParsedFace {
- ElementData::FaceDirection visibility;
- glm::mat4 transform;
- glm::vec4 texture;
- float layer;
- glm::vec3 color;
- };
-
std::vector<ParsedFace> parsedFaces;
};