X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fclient%2Fclient.cpp;h=44163f6cc17b74b9cb548b3bd93242e6028b6a90;hb=1d225566f79566e2dbbad8cb2876696f4c074ff5;hp=236fa1a41fe0872a35d5a819da2f186fa764b998;hpb=9c5308ba4108bd842af6d9d2e893ea575a7e6ca8;p=blank.git

diff --git a/src/client/client.cpp b/src/client/client.cpp
index 236fa1a..44163f6 100644
--- a/src/client/client.cpp
+++ b/src/client/client.cpp
@@ -48,22 +48,29 @@ void InitialState::Render(Viewport &viewport) {
 InteractiveState::InteractiveState(MasterState &master, uint32_t player_id)
 : master(master)
 , res()
+, sounds()
 , save(master.GetEnv().config.GetWorldPath(master.GetWorldConf().name, master.GetConfig().net.host))
 , world(res.block_types, master.GetWorldConf())
 , player(*world.AddPlayer(master.GetConfig().player.name))
 , hud(master.GetEnv(), master.GetConfig(), player)
-, manip(master.GetEnv(), player.GetEntity())
+, manip(master.GetEnv().audio, sounds, player.GetEntity())
 , input(world, player, master.GetClient())
 , interface(master.GetConfig(), master.GetEnv().keymap, input, *this)
 , chunk_receiver(world.Chunks(), save)
 , chunk_renderer(player.GetChunks())
 , loop_timer(16)
 , sky(master.GetEnv().loader.LoadCubeMap("skybox"))
-, update_status() {
+, update_status()
+, chat(master.GetEnv(), *this, *this) {
 	if (!save.Exists()) {
 		save.Write(master.GetWorldConf());
 	}
 	res.Load(master.GetEnv().loader, "default");
+	if (res.models.size() < 1) {
+		throw std::runtime_error("need at least one model to run");
+	}
+	res.models[0].Instantiate(player.GetEntity().GetModel());
+	sounds.Load(master.GetEnv().loader, res.snd_index);
 	interface.SetInventorySlots(res.block_types.size() - 1);
 	chunk_renderer.LoadTextures(master.GetEnv().loader, res.tex_index);
 	chunk_renderer.FogDensity(master.GetWorldConf().fog_density);
@@ -80,7 +87,13 @@ void InteractiveState::OnEnter() {
 void InteractiveState::Handle(const SDL_Event &event) {
 	switch (event.type) {
 		case SDL_KEYDOWN:
-			interface.HandlePress(event.key);
+			// TODO: move to interface
+			if (event.key.keysym.sym == SDLK_RETURN) {
+				master.GetEnv().state.Push(&chat);
+				hud.KeepMessages(true);
+			} else {
+				interface.HandlePress(event.key);
+			}
 			break;
 		case SDL_KEYUP:
 			interface.HandleRelease(event.key);
@@ -141,7 +154,9 @@ void InteractiveState::Update(int dt) {
 }
 
 void InteractiveState::Render(Viewport &viewport) {
-	viewport.WorldPosition(player.GetEntity().Transform(player.GetEntity().ChunkCoords()));
+	viewport.WorldPosition(
+		player.GetEntity().Transform(player.GetEntity().ChunkCoords())
+		* player.GetEntity().GetModel().EyesTransform());
 	if (master.GetConfig().video.world) {
 		chunk_renderer.Render(viewport);
 		world.Render(viewport);
@@ -257,6 +272,12 @@ void InteractiveState::Handle(const Packet::BlockUpdate &pack) {
 	}
 }
 
+void InteractiveState::Handle(const Packet::Message &pack) {
+	string msg;
+	pack.ReadMessage(msg);
+	hud.PostMessage(msg);
+}
+
 void InteractiveState::SetAudio(bool b) {
 	master.GetConfig().audio.enabled = b;
 	if (b) {
@@ -298,6 +319,10 @@ void InteractiveState::Exit() {
 	master.Quit();
 }
 
+void InteractiveState::OnLineSubmit(const string &line) {
+	master.GetClient().SendMessage(1, 0, line);
+}
+
 
 MasterState::MasterState(
 	Environment &env,
@@ -374,6 +399,8 @@ void MasterState::On(const Packet::Join &pack) {
 	state.reset(new InteractiveState(*this, player_id));
 
 	pack.ReadPlayerState(state->GetPlayer().GetEntity().GetState());
+	glm::vec3 orient(glm::eulerAngles(state->GetPlayer().GetEntity().Orientation()));
+	state->GetPlayerController().TurnHead(orient.x, orient.y);
 
 	env.state.PopAfter(this);
 	env.state.Push(state.get());
@@ -448,5 +475,15 @@ void MasterState::On(const Packet::BlockUpdate &pack) {
 	state->Handle(pack);
 }
 
+void MasterState::On(const Packet::Message &pack) {
+	if (state) {
+		state->Handle(pack);
+	} else {
+		string msg;
+		pack.ReadMessage(msg);
+		cout << "got message before interface was created: " << msg << endl;
+	}
+}
+
 }
 }