X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fworld%2FWorld.hpp;h=a1385138edd5fa135d84dba21025b2f4253f9e8b;hb=57f4a76edbfd6c2b6077047e9fba31788d161b44;hp=183fa603209af587d23d18f8f2b0e40c0a98d177;hpb=32909aa3224ec0ed5656721178eb6ad31cd047df;p=blank.git

diff --git a/src/world/World.hpp b/src/world/World.hpp
index 183fa60..a138513 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,9 @@
 
 namespace blank {
 
-class BlockLighting;
-class DirectionalLighting;
+class Assets;
+class EntityCollision;
+class Viewport;
 class WorldCollision;
 
 class World {
@@ -36,36 +37,43 @@ public:
 		ChunkLoader::Config load = ChunkLoader::Config();
 	};
 
-	explicit World(const Config &);
+	World(const Assets &, const Config &, const WorldSave &);
 
+	/// check if this ray hits a block
+	/// depth in the collision is the distance between the ray's
+	/// origin and the intersection point
 	bool Intersection(
 		const Ray &,
 		const glm::mat4 &M,
-		Chunk *&chunk,
-		int &blkid,
-		float &dist,
-		glm::vec3 &normal);
+		WorldCollision &);
 
+	/// check if this ray hits an entity
+	bool Intersection(
+		const Ray &,
+		const glm::mat4 &M,
+		EntityCollision &);
+
+	/// check if given entity intersects with the world
 	bool Intersection(const Entity &e, std::vector<WorldCollision> &);
-	void Resolve(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;