X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fclient%2Fclient.cpp;h=26e0e0df748c64cd70f0807ae00e90b4bb7d1dbf;hb=10a310869c61cc52046e165f36ac9639fe9d0c69;hp=fd4fbee8bad7c3b68362bb4950cebd2ecf2a3406;hpb=fcb9cdbbb01dbe4a86981e1529df451d7d5e8256;p=blank.git diff --git a/src/client/client.cpp b/src/client/client.cpp index fd4fbee..26e0e0d 100644 --- a/src/client/client.cpp +++ b/src/client/client.cpp @@ -51,7 +51,7 @@ InteractiveState::InteractiveState(MasterState &master, uint32_t player_id) , 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)) +, player(*world.AddPlayer(master.GetConfig().player.name, player_id)) , hud(master.GetEnv(), master.GetConfig(), player) , manip(master.GetEnv().audio, sounds, player.GetEntity()) , input(world, player, master.GetClient()) @@ -60,7 +60,8 @@ InteractiveState::InteractiveState(MasterState &master, uint32_t player_id) , 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()); } @@ -79,14 +80,41 @@ InteractiveState::InteractiveState(MasterState &master, uint32_t player_id) } } -void InteractiveState::OnEnter() { - master.GetEnv().window.GrabMouse(); +void InteractiveState::OnResume() { + OnFocus(); +} + +void InteractiveState::OnPause() { + OnBlur(); +} + +void InteractiveState::OnFocus() { + if (master.GetConfig().input.mouse) { + master.GetEnv().window.GrabMouse(); + } + interface.Unlock(); +} + +void InteractiveState::OnBlur() { + master.GetEnv().window.ReleaseMouse(); + interface.Lock(); } 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) { + chat.Clear(); + master.GetEnv().state.Push(&chat); + hud.KeepMessages(true); + } else if (event.key.keysym.sym == SDLK_SLASH) { + chat.Preset("/"); + master.GetEnv().state.Push(&chat); + hud.KeepMessages(true); + } else { + interface.HandlePress(event.key); + } break; case SDL_KEYUP: interface.HandleRelease(event.key); @@ -112,20 +140,10 @@ void InteractiveState::Handle(const SDL_Event &event) { } void InteractiveState::Update(int dt) { - input.Update(dt); - if (input.BlockFocus()) { - hud.FocusBlock(input.BlockFocus().GetChunk(), input.BlockFocus().block); - } else if (input.EntityFocus()) { - hud.FocusEntity(*input.EntityFocus().entity); - } else { - hud.FocusNone(); - } - hud.Display(res.block_types[player.GetInventorySlot() + 1]); loop_timer.Update(dt); master.Update(dt); chunk_receiver.Update(dt); - hud.Update(dt); int world_dt = 0; while (loop_timer.HitOnce()) { world.Update(loop_timer.Interval()); @@ -134,9 +152,18 @@ void InteractiveState::Update(int dt) { } chunk_renderer.Update(dt); + if (input.BlockFocus()) { + hud.FocusBlock(input.BlockFocus().GetChunk(), input.BlockFocus().block); + } else if (input.EntityFocus()) { + hud.FocusEntity(*input.EntityFocus().entity); + } else { + hud.FocusNone(); + } if (world_dt > 0) { input.PushPlayerUpdate(world_dt); } + hud.Display(res.block_types[player.GetInventorySlot() + 1]); + hud.Update(dt); glm::mat4 trans = player.GetEntity().Transform(player.GetEntity().ChunkCoords()); glm::vec3 dir(trans * glm::vec4(0.0f, 0.0f, -1.0f, 0.0f)); @@ -147,7 +174,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); @@ -162,11 +191,10 @@ void InteractiveState::Handle(const Packet::SpawnEntity &pack) { Entity &entity = world.ForceAddEntity(entity_id); UpdateEntity(entity_id, pack.Seq()); pack.ReadEntity(entity); - uint32_t skel_id; - pack.ReadSkeletonID(skel_id); - if (skel_id > 0 && skel_id <= res.models.size()) { - Model &skel = res.models.Get(skel_id); - skel.Instantiate(entity.GetModel()); + uint32_t model_id; + pack.ReadModelID(model_id); + if (model_id > 0 && model_id <= res.models.size()) { + res.models.Get(model_id).Instantiate(entity.GetModel()); } cout << "spawned entity #" << entity_id << " (" << entity.Name() << ") at " << entity.AbsolutePosition() << endl; @@ -190,7 +218,10 @@ void InteractiveState::Handle(const Packet::EntityUpdate &pack) { auto world_end = world.Entities().end(); uint32_t count = 0; + glm::ivec3 base; pack.ReadEntityCount(count); + pack.ReadChunkBase(base); + EntityState state; for (uint32_t i = 0; i < count; ++i) { uint32_t entity_id = 0; @@ -205,7 +236,8 @@ void InteractiveState::Handle(const Packet::EntityUpdate &pack) { } if (world_iter->ID() == entity_id) { if (UpdateEntity(entity_id, pack.Seq())) { - pack.ReadEntityState(world_iter->GetState(), i); + pack.ReadEntityState(state, base, i); + world_iter->SetState(state); } } } @@ -263,6 +295,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) { @@ -304,6 +342,12 @@ void InteractiveState::Exit() { master.Quit(); } +void InteractiveState::OnLineSubmit(const string &line) { + if (!line.empty()) { + master.GetClient().SendMessage(1, 0, line); + } +} + MasterState::MasterState( Environment &env, @@ -379,9 +423,9 @@ void MasterState::On(const Packet::Join &pack) { pack.ReadPlayerID(player_id); 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); + EntityState player_state; + pack.ReadPlayerState(player_state); + state->GetPlayer().GetEntity().SetState(player_state); env.state.PopAfter(this); env.state.Push(state.get()); @@ -456,5 +500,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; + } +} + } }