X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fui%2Fui.cpp;h=8563f7ded08409344be3957f7620640268ca7e3f;hb=b4e5dad2ed5c7e77573de413f3bf5be88577856d;hp=6c7ab6aa49ff53163b734c271e5fc0b92cf4bff9;hpb=225a7e66ed3f3f03ab458ab39c914ed55cd69600;p=blank.git diff --git a/src/ui/ui.cpp b/src/ui/ui.cpp index 6c7ab6a..8563f7d 100644 --- a/src/ui/ui.cpp +++ b/src/ui/ui.cpp @@ -17,7 +17,7 @@ #include "../graphics/Viewport.hpp" #include "../io/TokenStreamReader.hpp" #include "../model/bounds.hpp" -#include "../net/ConnectionHandler.hpp" +#include "../net/CongestionControl.hpp" #include "../world/BlockLookup.hpp" #include "../world/World.hpp" #include "../world/WorldManipulator.hpp" @@ -381,19 +381,21 @@ void HUD::PostMessage(const char *msg) { } -void HUD::UpdateNetStats(const ConnectionHandler &conn) { +void HUD::UpdateNetStats(const CongestionControl &stat) { + if (!config.video.debug) return; + std::stringstream s; s << std::fixed << std::setprecision(1) - << "TX: " << conn.Upstream() - << "KB/s, RX: " << conn.Downstream() << "KB/s"; + << "TX: " << stat.Upstream() + << "KB/s, RX: " << stat.Downstream() << "KB/s"; bandwidth_text.Set(env.assets.small_ui_font, s.str()); s.str(""); - s << "RTT: " << conn.RoundTripTime() << "ms"; + s << "RTT: " << stat.RoundTripTime() << "ms"; rtt_text.Set(env.assets.small_ui_font, s.str()); s.str(""); - s << "Packet loss: " << (conn.PacketLoss() * 100.0f) << "%"; + s << "Packet loss: " << (stat.PacketLoss() * 100.0f) << "%"; packet_loss_text.Set(env.assets.small_ui_font, s.str()); show_net = true; @@ -431,6 +433,8 @@ void HUD::Render(Viewport &viewport) noexcept { if (block_visible) { DirectionalLighting &world_prog = viewport.HUDProgram(); world_prog.SetLightDirection({ 1.0f, 3.0f, 5.0f }); + world_prog.SetLightColor({ 1.0f, 1.0f, 1.0f }); + world_prog.SetAmbientColor({ 0.1f, 0.1f, 0.1f }); // disable distance fog world_prog.SetFogDensity(0.0f);