summaryrefslogtreecommitdiffstats
path: root/src/RendererSection.hpp
diff options
context:
space:
mode:
authorLaG1924 <12997935+LaG1924@users.noreply.github.com>2017-10-17 20:33:13 +0200
committerLaG1924 <12997935+LaG1924@users.noreply.github.com>2018-01-13 03:39:32 +0100
commita6e0c9ce9b6c468d0e622ffb5c05eba664ea4f47 (patch)
tree160309441fbe58921d9483e8d12e8d2e57955b97 /src/RendererSection.hpp
parent2017-10-15 (diff)
downloadAltCraft-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 '')
-rw-r--r--src/RendererSection.hpp27
1 files changed, 12 insertions, 15 deletions
diff --git a/src/RendererSection.hpp b/src/RendererSection.hpp
index 6745987..26068e4 100644
--- a/src/RendererSection.hpp
+++ b/src/RendererSection.hpp
@@ -1,17 +1,18 @@
#pragma once
+#include <vector>
+#include <array>
+
+#include <glm/mat4x4.hpp>
#include <GL/glew.h>
-#include <glm/detail/type_mat.hpp>
-#include <glm/vec2.hpp>
-#include <glm/detail/type_mat4x4.hpp>
-#include <glm/gtx/transform.hpp>
-#include <easylogging++.h>
-
-#include "AssetManager.hpp"
-#include "Section.hpp"
-#include "World.hpp"
+
#include "Vector.hpp"
-#include "Renderer.hpp"
+#include "Block.hpp"
+
+class BlockModel;
+class AssetManager;
+class World;
+class RenderState;
struct RendererSectionData {
std::vector<glm::mat4> models;
@@ -28,8 +29,6 @@ private:
std::array<unsigned char, 16 * 16 * 16> GetBlockVisibilityData(World *world);
- AssetManager& am = AssetManager::Instance();
-
std::vector<std::pair<BlockId, const BlockModel *>> idModels;
const BlockModel* GetInternalBlockModel(const BlockId& id);
@@ -42,9 +41,7 @@ private:
inline const BlockId& GetBlockId(int x, int y, int z) {
return blockIdData[y * 256 +z * 16 + x];
- }
-
-
+ }
};