X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fworld%2FWorld.hpp;h=6d27d12b8ab97f03fc6ef05688ae771a4348ccdd;hb=b0c2d423138dfb4849c679b3fb93e4336dcf5845;hp=9ec4cb2faf7fae204c53672e0b1f6e800a09e9dc;hpb=955fbb45dedb570520fc45d2ce69f420bed2ad08;p=blank.git

diff --git a/src/world/World.hpp b/src/world/World.hpp
index 9ec4cb2..6d27d12 100644
--- a/src/world/World.hpp
+++ b/src/world/World.hpp
@@ -5,7 +5,7 @@
 #include "ChunkLoader.hpp"
 #include "Entity.hpp"
 #include "Generator.hpp"
-#include "../model/shapes.hpp"
+#include "../graphics/ArrayTexture.hpp"
 
 #include <list>
 #include <vector>
@@ -14,8 +14,8 @@
 
 namespace blank {
 
-class BlockLighting;
-class DirectionalLighting;
+class Assets;
+class Viewport;
 class WorldCollision;
 
 class World {
@@ -36,8 +36,9 @@ public:
 		ChunkLoader::Config load = ChunkLoader::Config();
 	};
 
-	explicit World(const Config &);
+	World(const Assets &, const Config &, const WorldSave &);
 
+	// check if this ray hits a block
 	bool Intersection(
 		const Ray &,
 		const glm::mat4 &M,
@@ -46,26 +47,34 @@ public:
 		float &dist,
 		glm::vec3 &normal);
 
+	// check if this ray hits an entity
+	bool Intersection(
+		const Ray &,
+		const glm::mat4 &M,
+		Entity *&entity,
+		float &dist,
+		glm::vec3 &normal);
+
 	bool Intersection(const Entity &e, std::vector<WorldCollision> &);
 	void Resolve(Entity &e, std::vector<WorldCollision> &);
 
-	BlockTypeRegistry &BlockTypes() { return blockType; }
+	BlockTypeRegistry &BlockTypes() noexcept { return block_type; }
+	ChunkLoader &Loader() noexcept { return chunks; }
 
 	Entity &Player() { return *player; }
 	Entity &AddEntity() { entities.emplace_back(); return entities.back(); }
 
 	Chunk &PlayerChunk();
-	Chunk &Next(const Chunk &to, const glm::tvec3<int> &dir);
+	Chunk &Next(const Chunk &to, const glm::ivec3 &dir);
 
 	void Update(int dt);
 
-	void Render(BlockLighting &, DirectionalLighting &);
+	void Render(Viewport &);
 
 private:
-	BlockTypeRegistry blockType;
-	CuboidShape blockShape;
-	StairShape stairShape;
-	CuboidShape slabShape;
+	BlockTypeRegistry block_type;
+
+	ArrayTexture block_tex;
 
 	Generator generate;
 	ChunkLoader chunks;