fix client's player entity ID

[blank.git] / src / client / client.cpp

diff --git a/src/client/client.cpp b/src/client/client.cpp
index 89e306bee60cb775dc1a61ff63b976f8a296a95a..9e4ba501b141f3420b2b8eb957429da39e7be5be 100644 (file)
--- 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,11 +60,16 @@ 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());
        }
        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);
@@ -82,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);
@@ -143,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);
@@ -158,11 +171,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;
@@ -186,7 +198,9 @@ 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);
 
        for (uint32_t i = 0; i < count; ++i) {
                uint32_t entity_id = 0;
@@ -201,7 +215,7 @@ 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(world_iter->GetState(), base, i);
                        }
                }
        }
@@ -259,6 +273,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) {
@@ -300,6 +320,10 @@ void InteractiveState::Exit() {
        master.Quit();
 }
 
+void InteractiveState::OnLineSubmit(const string &line) {
+       master.GetClient().SendMessage(1, 0, line);
+}
+
 
 MasterState::MasterState(
        Environment &env,
@@ -376,6 +400,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());
@@ -450,5 +476,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;
+       }
+}
+
 }
 }