X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fapp%2FPreloadState.cpp;h=3b686107a278febd6fcc7f01f0fe06a44fa1b5cf;hb=dbfcb12348b80e2582f710acb1e4ed0011889ba2;hp=389d331bd6034167e755edaad1470d908df17c17;hpb=29ee0558fdd951b25f41005ed721241b1f28aefa;p=blank.git diff --git a/src/app/PreloadState.cpp b/src/app/PreloadState.cpp index 389d331..3b68610 100644 --- a/src/app/PreloadState.cpp +++ b/src/app/PreloadState.cpp @@ -2,15 +2,16 @@ #include "Environment.hpp" #include "../world/ChunkLoader.hpp" +#include "../world/ChunkRenderer.hpp" namespace blank { -PreloadState::PreloadState(Environment &env, ChunkLoader &loader) +PreloadState::PreloadState(Environment &env, ChunkLoader &loader, ChunkRenderer &render) : env(env) , loader(loader) -, font(env.assets.LoadFont("DejaVuSans", 24)) -, progress(font) +, render(render) +, progress(env.assets.large_ui_font) , total(loader.ToLoad()) , per_update(64) { progress.Position(glm::vec3(0.0f), Gravity::CENTER); @@ -27,10 +28,8 @@ void PreloadState::Handle(const SDL_Event &e) { void PreloadState::Update(int dt) { loader.LoadN(per_update); if (loader.ToLoad() == 0) { - for (auto &chunk : loader.Loaded()) { - chunk.CheckUpdate(); - } env.state.Pop(); + render.Update(render.MissingChunks()); } else { progress.Update(total - loader.ToLoad(), total); }