X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fworld.hpp;h=8ca03a25b73c82285b441731b589206266332c13;hb=753be639d7d04f9f7415db9fc2721485c531f0a1;hp=ce44c7c1144352c4c31aedfb0505f86ea5317e05;hpb=f62562b0f87d571bd7b32ae2f8ca659c24e9911b;p=blank.git

diff --git a/src/world.hpp b/src/world.hpp
index ce44c7c..8ca03a2 100644
--- a/src/world.hpp
+++ b/src/world.hpp
@@ -1,9 +1,11 @@
 #ifndef BLANK_WORLD_HPP_
 #define BLANK_WORLD_HPP_
 
+#include "controller.hpp"
 #include "geometry.hpp"
 #include "model.hpp"
 #include "noise.hpp"
+#include "shader.hpp"
 #include "shape.hpp"
 
 #include <list>
@@ -179,8 +181,14 @@ public:
 	BlockTypeRegistry &BlockTypes() { return blockType; }
 	std::list<Chunk> &LoadedChunks() { return chunks; }
 
+	FPSController &Controller() { return player; }
+
 	Chunk &Next(const Chunk &, const glm::vec3 &dir);
 
+	void Update(int dt);
+
+	void Render(DirectionalLighting &);
+
 private:
 	Chunk &Generate(const glm::vec3 &);
 
@@ -193,6 +201,8 @@ private:
 	SimplexNoise blockNoise;
 	SimplexNoise colorNoise;
 
+	FPSController player;
+
 	std::list<Chunk> chunks;
 
 };