X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fapp%2FPreloadState.cpp;fp=src%2Fapp%2FPreloadState.cpp;h=32d0b3a7fb86b8f630753fdfa854f29250bd6af5;hb=376fc1fca87fcdd22dabadf6d01d245ef8c3cedd;hp=c56e4fe5666ecf4ab63f083d052e5c478f4de583;hpb=22b25d4b9cc24e249bc8007757267cea00ab18d3;p=blank.git

diff --git a/src/app/PreloadState.cpp b/src/app/PreloadState.cpp
index c56e4fe..32d0b3a 100644
--- a/src/app/PreloadState.cpp
+++ b/src/app/PreloadState.cpp
@@ -11,8 +11,12 @@ namespace blank {
 PreloadState::PreloadState(Environment &env, ChunkLoader &loader)
 : env(env)
 , loader(loader)
-, per_update(256) {
-
+, font(env.assets.LoadFont("DejaVuSans", 24))
+, progress(font)
+, total(loader.ToLoad())
+, per_update(64) {
+	progress.Position(glm::vec3(0.0f), Gravity::CENTER);
+	progress.Template("Preloading chunks: %d/%d (%d%%)");
 }
 
 
@@ -22,18 +26,17 @@ void PreloadState::Handle(const SDL_Event &) {
 void PreloadState::Update(int dt) {
 	loader.LoadN(per_update);
 	if (loader.ToLoad() == 0) {
-		std::cout << "preload: populating VBOs" << std::endl;
 		for (auto &chunk : loader.Loaded()) {
 			chunk.CheckUpdate();
 		}
-		std::cout << "preload: complete" << std::endl;
 		env.state.Pop();
+	} else {
+		progress.Update(total - loader.ToLoad(), total);
 	}
 }
 
-void PreloadState::Render(Viewport &) {
-	// TODO: make a nice progress bar or some other fancy shit
-	std::cout << "preload: " << loader.ToLoad() << " chunks remaining" << std::endl;
+void PreloadState::Render(Viewport &viewport) {
+	progress.Render(viewport);
 }
 
 }