diff options
author | Kae <80987908+Novaenia@users.noreply.github.com> | 2023-07-06 19:26:28 +1000 |
---|---|---|
committer | Kae <80987908+Novaenia@users.noreply.github.com> | 2023-07-06 19:26:28 +1000 |
commit | fe4cc1961888db364bbc70cfe0e7a15ec27a5c5b (patch) | |
tree | db5357973b2e2ef368b6c1f81a701b8ea75b9a9b /source/client/StarClientApplication.cpp | |
parent | f75d1f0b5a78bfce56bde4fe57b8d1193a340e74 (diff) |
Change pure string format calls to use fmt::to_string
Diffstat (limited to 'source/client/StarClientApplication.cpp')
-rw-r--r-- | source/client/StarClientApplication.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/client/StarClientApplication.cpp b/source/client/StarClientApplication.cpp index d58ed69..2ed90ab 100644 --- a/source/client/StarClientApplication.cpp +++ b/source/client/StarClientApplication.cpp @@ -234,7 +234,7 @@ void ClientApplication::renderInit(RendererPtr renderer) { }; loadEffectConfig("world"); - loadEffectConfig("default"); + loadEffectConfig("interface"); if (m_root->configuration()->get("limitTextureAtlasSize").optBool().value(false)) renderer->setSizeLimitEnabled(true); @@ -389,11 +389,11 @@ void ClientApplication::render() { WorldClientPtr worldClient = m_universeClient->worldClient(); RendererPtr renderer = Application::renderer(); + renderer->switchEffectConfig("world"); if (worldClient) { auto totalStart = Time::monotonicMicroseconds(); auto start = totalStart; - renderer->switchEffectConfig("world"); worldClient->render(m_renderData, TilePainter::BorderTileSize); LogMap::set("client_render_world_client", strf(u8"{:05d}\u00b5s", Time::monotonicMicroseconds() - start)); @@ -404,10 +404,10 @@ void ClientApplication::render() { start = Time::monotonicMicroseconds(); m_mainInterface->renderInWorldElements(); LogMap::set("client_render_world_elements", strf(u8"{:05d}\u00b5s", Time::monotonicMicroseconds() - start)); - renderer->switchEffectConfig("default"); LogMap::set("client_render_world_total", strf(u8"{:05d}\u00b5s", Time::monotonicMicroseconds() - totalStart)); } + renderer->switchEffectConfig("interface"); auto start = Time::monotonicMicroseconds(); m_mainInterface->render(); m_cinematicOverlay->render(); @@ -879,8 +879,8 @@ void ClientApplication::updateRunning() { LogMap::set("player_vel", strf("[ ^#f45;{:4.2f}^reset;, ^#49f;{:4.2f}^reset; ]", m_player->velocity()[0], m_player->velocity()[1])); LogMap::set("player_aim", strf("[ ^#f45;{:4.2f}^reset;, ^#49f;{:4.2f}^reset; ]", aimPosition[0], aimPosition[1])); if (m_universeClient->worldClient()) { - LogMap::set("tile_liquid_level", strf("{}", m_universeClient->worldClient()->liquidLevel(Vec2I::floor(aimPosition)).level)); - LogMap::set("tile_dungeon_id", strf("{}", m_universeClient->worldClient()->dungeonId(Vec2I::floor(aimPosition)))); + LogMap::set("tile_liquid_level", toString(m_universeClient->worldClient()->liquidLevel(Vec2I::floor(aimPosition)).level)); + LogMap::set("tile_dungeon_id", toString(m_universeClient->worldClient()->dungeonId(Vec2I::floor(aimPosition)))); } if (m_mainInterface->currentState() == MainInterface::ReturnToTitle) |