X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fserver%2FServerState.cpp;h=76686b0c616119b935a7c0819751f760a8140efa;hb=aee07b0f8d8c0d9af66dd7507938d83985d53833;hp=e16872ffe74c094030ace36c87a92a7c566cfcfa;hpb=9240fdf2e68ee014da0d0a89a7fb2f29ebf28e2d;p=blank.git

diff --git a/src/server/ServerState.cpp b/src/server/ServerState.cpp
index e16872f..76686b0 100644
--- a/src/server/ServerState.cpp
+++ b/src/server/ServerState.cpp
@@ -1,7 +1,7 @@
 #include "ServerState.hpp"
 
 #include "../app/Environment.hpp"
-#include "../app/TextureIndex.hpp"
+#include "../io/WorldSave.hpp"
 #include "../net/io.hpp"
 
 #include <iostream>
@@ -18,21 +18,23 @@ ServerState::ServerState(
 	const Config &config
 )
 : env(env)
-, block_types()
-, world(block_types, wc)
-, spawn_index(world.Chunks().MakeIndex(wc.spawn, 3))
+, res()
+, world(res.block_types, wc)
 , generator(gc)
 , chunk_loader(world.Chunks(), generator, ws)
-, skeletons()
-, spawner(world, skeletons, env.rng)
-, server(config.net, world, ws)
+, spawner(world, res.models)
+, server(config.net, world, wc, ws)
 , loop_timer(16) {
-	TextureIndex tex_index;
-	env.loader.LoadBlockTypes("default", block_types, tex_index);
-	generator.LoadTypes(block_types);
-	skeletons.LoadHeadless();
-	spawner.LimitSkeletons(1, skeletons.size());
-	server.SetPlayerModel(skeletons[0]);
+	res.Load(env.loader, "default");
+	if (res.models.size() < 2) {
+		throw std::runtime_error("need at least two models to run");
+	}
+	generator.LoadTypes(res.block_types);
+	spawner.LimitModels(1, res.models.size());
+	server.SetPlayerModel(res.models[0]);
+
+	std::cout << "loading spawn chunks" << std::endl;
+	chunk_loader.LoadN(chunk_loader.ToLoad());
 
 	loop_timer.Start();
 
@@ -40,12 +42,18 @@ ServerState::ServerState(
 }
 
 ServerState::~ServerState() {
-	world.Chunks().UnregisterIndex(spawn_index);
+
 }
 
 
 void ServerState::Handle(const SDL_Event &event) {
 	if (event.type == SDL_QUIT) {
+		std::cout << "saving remaining chunks" << std::endl;
+		for (Chunk &chunk : world.Chunks()) {
+			if (chunk.ShouldUpdateSave()) {
+				chunk_loader.SaveFile().Write(chunk);
+			}
+		}
 		env.state.PopAll();
 	}
 }
@@ -53,6 +61,15 @@ void ServerState::Handle(const SDL_Event &event) {
 
 void ServerState::Update(int dt) {
 	loop_timer.Update(dt);
+	if (!loop_timer.HitOnce() && loop_timer.IntervalRemain() > 1) {
+		server.Wait(loop_timer.IntervalRemain() - 1);
+		return;
+	}
+	if (dt == 0 && !server.Ready()) {
+		// effectively wait in a spin loop
+		return;
+	}
+
 	server.Handle();
 	int world_dt = 0;
 	while (loop_timer.HitOnce()) {
@@ -65,10 +82,13 @@ void ServerState::Update(int dt) {
 	if (world_dt > 0) {
 		server.Update(world_dt);
 	}
+	if (world_dt > 32) {
+		std::cout << "world dt at " << world_dt << "ms!" << std::endl;
+	}
 }
 
 
-void ServerState::Render(Viewport &viewport) {
+void ServerState::Render(Viewport &) {
 
 }