X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fapp%2FWorldState.cpp;h=db8c9635c22a57a734d902fdd06ac8bd873dec17;hb=4e3d9c23940c4511623b5bf328cbbe42641c4b30;hp=243b0a1dc519d42ba18d1e6350e60864896480ba;hpb=41652fb3d73f12e6ae4ce7380244a75a4f5c6797;p=blank.git

diff --git a/src/app/WorldState.cpp b/src/app/WorldState.cpp
index 243b0a1..db8c963 100644
--- a/src/app/WorldState.cpp
+++ b/src/app/WorldState.cpp
@@ -1,6 +1,7 @@
 #include "WorldState.hpp"
 
 #include "Environment.hpp"
+#include "init.hpp"
 #include "TextureIndex.hpp"
 
 #include <SDL.h>
@@ -19,12 +20,12 @@ WorldState::WorldState(
 , world(block_types, wc, save)
 , chunk_renderer(world, wc.load.load_dist)
 , spawner(world, wc.gen.seed)
-, interface(ic, env, world)
+, interface(ic, env, world, *world.AddPlayer(ic.player_name))
 , preload(env, world.Loader(), chunk_renderer)
 , unload(env, world.Loader()) {
 	TextureIndex tex_index;
-	env.assets.LoadBlockTypes("default", block_types, tex_index);
-	chunk_renderer.LoadTextures(env.assets, tex_index);
+	env.loader.LoadBlockTypes("default", block_types, tex_index);
+	chunk_renderer.LoadTextures(env.loader, tex_index);
 	chunk_renderer.FogDensity(wc.fog_density);
 	// TODO: better solution for initializing HUD
 	interface.SelectNext();
@@ -33,6 +34,7 @@ WorldState::WorldState(
 
 void WorldState::OnEnter() {
 	env.state.Push(&preload);
+	env.window.GrabMouse();
 }
 
 
@@ -68,20 +70,19 @@ void WorldState::Update(int dt) {
 	interface.Update(dt);
 	spawner.Update(dt);
 	world.Update(dt);
-	chunk_renderer.Rebase(world.Player().ChunkCoords());
+	chunk_renderer.Rebase(interface.Player().ChunkCoords());
 	chunk_renderer.Update(dt);
 
-	glm::mat4 trans = world.Player().Transform(world.Player().ChunkCoords());
+	glm::mat4 trans = interface.Player().Transform(interface.Player().ChunkCoords());
 	glm::vec3 dir(trans * glm::vec4(0.0f, 0.0f, -1.0f, 0.0f));
 	glm::vec3 up(trans * glm::vec4(0.0f, 1.0f, 0.0f, 0.0f));
-	env.audio.Position(world.Player().Position());
-	env.audio.Velocity(world.Player().Velocity());
+	env.audio.Position(interface.Player().Position());
+	env.audio.Velocity(interface.Player().Velocity());
 	env.audio.Orientation(dir, up);
-
 }
 
 void WorldState::Render(Viewport &viewport) {
-	viewport.WorldPosition(world.Player().Transform(world.Player().ChunkCoords()));
+	viewport.WorldPosition(interface.Player().Transform(interface.Player().ChunkCoords()));
 	chunk_renderer.Render(viewport);
 	world.Render(viewport);
 	interface.Render(viewport);