show net stats in debug overlay

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

diff --git a/src/client/client.cpp b/src/client/client.cpp
index ae1bf7378f59f6ed12494a08de8bd692e3b49aa6..3c30a62495127a52ace02decb18233c845e463f5 100644 (file)
--- a/src/client/client.cpp
+++ b/src/client/client.cpp
@@ -59,6 +59,7 @@ InteractiveState::InteractiveState(MasterState &master, uint32_t player_id)
 , chunk_receiver(world.Chunks(), save)
 , chunk_renderer(player.GetChunks())
 , loop_timer(16)
+, stat_timer(1000)
 , sky(master.GetEnv().loader.LoadCubeMap("skybox"))
 , update_status()
 , chat(master.GetEnv(), *this, *this) {
@@ -75,6 +76,7 @@ InteractiveState::InteractiveState(MasterState &master, uint32_t player_id)
        chunk_renderer.LoadTextures(master.GetEnv().loader, res.tex_index);
        chunk_renderer.FogDensity(master.GetWorldConf().fog_density);
        loop_timer.Start();
+       stat_timer.Start();
        if (save.Exists(player)) {
                save.Read(player);
        }
@@ -105,6 +107,11 @@ void InteractiveState::Handle(const SDL_Event &event) {
                case SDL_KEYDOWN:
                        // 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 {
@@ -136,6 +143,7 @@ void InteractiveState::Handle(const SDL_Event &event) {
 
 void InteractiveState::Update(int dt) {
        loop_timer.Update(dt);
+       stat_timer.Update(dt);
        master.Update(dt);
        chunk_receiver.Update(dt);
 
@@ -158,6 +166,9 @@ void InteractiveState::Update(int dt) {
                input.PushPlayerUpdate(world_dt);
        }
        hud.Display(res.block_types[player.GetInventorySlot() + 1]);
+       if (stat_timer.Hit()) {
+               hud.UpdateNetStats(master);
+       }
        hud.Update(dt);
 
        glm::mat4 trans = player.GetEntity().Transform(player.GetEntity().ChunkCoords());
@@ -191,8 +202,6 @@ void InteractiveState::Handle(const Packet::SpawnEntity &pack) {
        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;
 }
 
 void InteractiveState::Handle(const Packet::DespawnEntity &pack) {
@@ -202,7 +211,6 @@ void InteractiveState::Handle(const Packet::DespawnEntity &pack) {
        for (Entity &entity : world.Entities()) {
                if (entity.ID() == entity_id) {
                        entity.Kill();
-                       cout << "despawned entity #" << entity_id << " (" << entity.Name() << ") at " << entity.AbsolutePosition() << endl;
                        return;
                }
        }