send player updates from client to server

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

diff --git a/src/client/client.cpp b/src/client/client.cpp
index ac682bb8d8909eb37bfd876541d20f7ad3c58eb0..9c87549a3e27094c1ad8ffc8cc47b3143c550b53 100644 (file)
--- a/src/client/client.cpp
+++ b/src/client/client.cpp
@@ -38,13 +38,19 @@ void InitialState::Render(Viewport &viewport) {
 }
 
 
-InteractiveState::InteractiveState(MasterState &master)
+// TODO: this clutter is a giant mess
+InteractiveState::InteractiveState(MasterState &master, uint32_t player_id)
 : master(master)
 , block_types()
 , save(master.GetEnv().config.GetWorldPath(master.GetWorldConf().name, master.GetClientConf().host))
 , world(block_types, master.GetWorldConf(), save)
 , chunk_renderer(world, master.GetWorldConf().load.load_dist)
-, interface(master.GetInterfaceConf(), master.GetEnv(), world) {
+, interface(
+       master.GetInterfaceConf(),
+       master.GetEnv(),
+       world,
+       *world.AddPlayer(master.GetInterfaceConf().player_name, player_id)
+) {
        TextureIndex tex_index;
        master.GetEnv().loader.LoadBlockTypes("default", block_types, tex_index);
        chunk_renderer.LoadTextures(master.GetEnv().loader, tex_index);
@@ -93,6 +99,8 @@ void InteractiveState::Update(int dt) {
        chunk_renderer.Rebase(interface.Player().ChunkCoords());
        chunk_renderer.Update(dt);
 
+       master.GetClient().SendPlayerUpdate(interface.Player());
+
        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));
@@ -120,7 +128,8 @@ MasterState::MasterState(
 , client_conf(cc)
 , state()
 , client(cc)
-, init_state(*this) {
+, init_state(*this)
+, login_packet(-1) {
        client.GetConnection().SetHandler(this);
 }
 
@@ -130,7 +139,7 @@ void MasterState::Quit() {
 
 
 void MasterState::OnEnter() {
-       client.SendLogin(intf_conf.player_name);
+       login_packet = client.SendLogin(intf_conf.player_name);
        env.state.Push(&init_state);
 }
 
@@ -143,10 +152,6 @@ void MasterState::Handle(const SDL_Event &event) {
 void MasterState::Update(int dt) {
        client.Handle();
        client.Update(dt);
-       if (client.GetConnection().Closed()) {
-               Quit();
-               // TODO: push disconnected message
-       }
 }
 
 
@@ -155,6 +160,19 @@ void MasterState::Render(Viewport &) {
 }
 
 
+void MasterState::OnPacketLost(std::uint16_t id) {
+       if (id == login_packet) {
+               login_packet = client.SendLogin(intf_conf.player_name);
+       }
+}
+
+void MasterState::OnTimeout() {
+       if (client.GetConnection().Closed()) {
+               Quit();
+               // TODO: push disconnected message
+       }
+}
+
 void MasterState::On(const Packet::Join &pack) {
        pack.ReadWorldName(world_conf.name);
 
@@ -165,7 +183,10 @@ void MasterState::On(const Packet::Join &pack) {
                // joining game
                std::cout << "joined game" << std::endl;
        }
-       state.reset(new InteractiveState(*this));
+
+       uint32_t player_id;
+       pack.ReadPlayerID(player_id);
+       state.reset(new InteractiveState(*this, player_id));
 
        pack.ReadPlayer(state->GetInterface().Player());