X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fclient%2Fclient.cpp;h=91d6aed6992e7327fc23116fcea59c9f902c8c00;hb=933ca0fe6c660e482edd45742d981f2de59a32df;hp=8a3d1c89c98e36a17c645852172f3d92d9cfb0eb;hpb=cf5ce8220483bb062740eeaedde6474928fd5e0e;p=blank.git diff --git a/src/client/client.cpp b/src/client/client.cpp index 8a3d1c8..91d6aed 100644 --- a/src/client/client.cpp +++ b/src/client/client.cpp @@ -1,3 +1,4 @@ +#include "ChunkRequester.hpp" #include "InitialState.hpp" #include "InteractiveState.hpp" #include "MasterState.hpp" @@ -6,6 +7,9 @@ #include "../app/init.hpp" #include "../app/TextureIndex.hpp" #include "../model/CompositeModel.hpp" +#include "../io/WorldSave.hpp" +#include "../world/ChunkIndex.hpp" +#include "../world/ChunkStore.hpp" #include #include @@ -16,6 +20,63 @@ using namespace std; namespace blank { namespace client { +ChunkRequester::ChunkRequester( + ChunkStore &store, + const WorldSave &save +) noexcept +: store(store) +, save(save) { + +} + +void ChunkRequester::Update(int dt) { + // check if there's chunks waiting to be loaded + LoadN(10); + + // store a few chunks as well + constexpr int max_save = 10; + int saved = 0; + for (Chunk &chunk : store) { + if (chunk.ShouldUpdateSave()) { + save.Write(chunk); + ++saved; + if (saved >= max_save) { + break; + } + } + } +} + +int ChunkRequester::ToLoad() const noexcept { + return store.EstimateMissing(); +} + +void ChunkRequester::LoadOne() { + if (!store.HasMissing()) return; + + Chunk::Pos pos = store.NextMissing(); + Chunk *chunk = store.Allocate(pos); + if (!chunk) { + // chunk store corrupted? + return; + } + + if (save.Exists(pos)) { + save.Read(*chunk); + // TODO: request chunk from server with cache tag + } else { + // TODO: request chunk from server + } +} + +void ChunkRequester::LoadN(std::size_t n) { + std::size_t end = std::min(n, std::size_t(ToLoad())); + for (std::size_t i = 0; i < end && store.HasMissing(); ++i) { + LoadOne(); + } +} + + InitialState::InitialState(MasterState &master) : master(master) , message() { @@ -46,25 +107,30 @@ void InitialState::Render(Viewport &viewport) { InteractiveState::InteractiveState(MasterState &master, uint32_t player_id) : master(master) , block_types() -, save(master.GetEnv().config.GetWorldPath(master.GetWorldConf().name, master.GetClientConf().host)) +, save(master.GetEnv().config.GetWorldPath(master.GetWorldConf().name, master.GetConfig().net.host)) , world(block_types, master.GetWorldConf()) -, interface( - master.GetInterfaceConf(), - master.GetEnv(), - world, - world.AddPlayer(master.GetInterfaceConf().player_name, player_id) -) -, chunk_renderer(*interface.GetPlayer().chunks) +, player(*world.AddPlayer(master.GetConfig().player.name)) +, hud(master.GetEnv(), master.GetConfig(), player) +, manip(master.GetEnv(), player.GetEntity()) +, input(world, player, master.GetClient()) +, interface(master.GetConfig(), master.GetEnv().keymap, input, *this) +// TODO: looks like chunk requester and receiver can and should be merged +, chunk_requester(world.Chunks(), save) +, chunk_receiver(world.Chunks()) +, chunk_renderer(player.GetChunks()) , skeletons() -, update_timer(16) { +, loop_timer(16) +, sky(master.GetEnv().loader.LoadCubeMap("skybox")) { + if (!save.Exists()) { + save.Write(master.GetWorldConf()); + } TextureIndex tex_index; master.GetEnv().loader.LoadBlockTypes("default", block_types, tex_index); + interface.SetInventorySlots(block_types.Size() - 1); chunk_renderer.LoadTextures(master.GetEnv().loader, tex_index); chunk_renderer.FogDensity(master.GetWorldConf().fog_density); skeletons.Load(); - // TODO: better solution for initializing HUD - interface.SelectNext(); - update_timer.Start(); + loop_timer.Start(); } void InteractiveState::OnEnter() { @@ -100,48 +166,126 @@ void InteractiveState::Handle(const SDL_Event &event) { } void InteractiveState::Update(int dt) { + input.Update(dt); + if (input.BlockFocus()) { + hud.FocusBlock(input.BlockFocus().GetChunk(), input.BlockFocus().block); + } else if (input.EntityFocus()) { + hud.FocusEntity(*input.EntityFocus().entity); + } else { + hud.FocusNone(); + } + hud.Display(block_types[player.GetInventorySlot() + 1]); + loop_timer.Update(dt); master.Update(dt); - - interface.Update(dt); - world.Update(dt); + chunk_receiver.Update(dt); + chunk_requester.Update(dt); + + hud.Update(dt); + int world_dt = 0; + while (loop_timer.HitOnce()) { + world.Update(loop_timer.Interval()); + world_dt += loop_timer.Interval(); + loop_timer.PopIteration(); + } chunk_renderer.Update(dt); - update_timer.Update(dt); - - Entity &player = *interface.GetPlayer().entity; - - if (update_timer.Hit()) { - master.GetClient().SendPlayerUpdate(player); + if (world_dt > 0) { + input.PushPlayerUpdate(world_dt); } - glm::mat4 trans = player.Transform(player.ChunkCoords()); + glm::mat4 trans = player.GetEntity().Transform(player.GetEntity().ChunkCoords()); glm::vec3 dir(trans * glm::vec4(0.0f, 0.0f, -1.0f, 0.0f)); glm::vec3 up(trans * glm::vec4(0.0f, 1.0f, 0.0f, 0.0f)); - master.GetEnv().audio.Position(player.Position()); - master.GetEnv().audio.Velocity(player.Velocity()); + master.GetEnv().audio.Position(player.GetEntity().Position()); + master.GetEnv().audio.Velocity(player.GetEntity().Velocity()); master.GetEnv().audio.Orientation(dir, up); } void InteractiveState::Render(Viewport &viewport) { - Entity &player = *interface.GetPlayer().entity; - viewport.WorldPosition(player.Transform(player.ChunkCoords())); - chunk_renderer.Render(viewport); - world.Render(viewport); - interface.Render(viewport); + viewport.WorldPosition(player.GetEntity().Transform(player.GetEntity().ChunkCoords())); + if (master.GetConfig().video.world) { + chunk_renderer.Render(viewport); + world.Render(viewport); + sky.Render(viewport); + } + hud.Render(viewport); +} + +void InteractiveState::MergePlayerCorrection(std::uint16_t pack, const EntityState &state) { + input.MergePlayerCorrection(pack, state); +} + +void InteractiveState::Handle(const Packet::BlockUpdate &pack) { + glm::ivec3 pos; + pack.ReadChunkCoords(pos); + Chunk *chunk = player.GetChunks().Get(pos); + if (!chunk) { + // this change doesn't concern us + return; + } + uint32_t count = 0; + pack.ReadBlockCount(count); + for (uint32_t i = 0; i < count; ++i) { + uint16_t index; + Block block; + pack.ReadIndex(index, i); + pack.ReadBlock(block, i); + if (index < Chunk::size && block.type < block_types.Size()) { + manip.SetBlock(*chunk, index, block); + } + } +} + +void InteractiveState::SetAudio(bool b) { + master.GetConfig().audio.enabled = b; + if (b) { + hud.PostMessage("Audio enabled"); + } else { + hud.PostMessage("Audio disabled"); + } +} + +void InteractiveState::SetVideo(bool b) { + master.GetConfig().video.world = b; + if (b) { + hud.PostMessage("World rendering enabled"); + } else { + hud.PostMessage("World rendering disabled"); + } +} + +void InteractiveState::SetHUD(bool b) { + master.GetConfig().video.hud = b; + if (b) { + hud.PostMessage("HUD rendering enabled"); + } else { + hud.PostMessage("HUD rendering disabled"); + } +} + +void InteractiveState::SetDebug(bool b) { + master.GetConfig().video.debug = b; + if (b) { + hud.PostMessage("Debug rendering enabled"); + } else { + hud.PostMessage("Debug rendering disabled"); + } +} + +void InteractiveState::Exit() { + master.Quit(); } MasterState::MasterState( Environment &env, - const World::Config &wc, - const Interface::Config &ic, - const Client::Config &cc) + Config &config, + const World::Config &wc) : env(env) +, config(config) , world_conf(wc) -, intf_conf(ic) -, client_conf(cc) , state() -, client(cc) +, client(config.net) , init_state(*this) , login_packet(-1) , update_status() @@ -159,7 +303,7 @@ void MasterState::Quit() { void MasterState::OnEnter() { - login_packet = client.SendLogin(intf_conf.player_name); + login_packet = client.SendLogin(config.player.name); env.state.Push(&init_state); } @@ -183,7 +327,7 @@ void MasterState::Render(Viewport &) { void MasterState::OnPacketLost(uint16_t id) { if (id == login_packet) { - login_packet = client.SendLogin(intf_conf.player_name); + login_packet = client.SendLogin(config.player.name); } } @@ -212,7 +356,7 @@ void MasterState::On(const Packet::Join &pack) { pack.ReadPlayerID(player_id); state.reset(new InteractiveState(*this, player_id)); - pack.ReadPlayerState(state->GetInterface().GetPlayer().entity->GetState()); + pack.ReadPlayerState(state->GetPlayer().GetEntity().GetState()); env.state.PopAfter(this); env.state.Push(state.get()); @@ -246,7 +390,8 @@ void MasterState::On(const Packet::SpawnEntity &pack) { if (skel) { skel->Instantiate(entity.GetModel()); } - cout << "spawned entity " << entity.Name() << " at " << entity.AbsolutePosition() << endl; + cout << "spawned entity #" << entity_id << " (" << entity.Name() + << ") at " << entity.AbsolutePosition() << endl; } void MasterState::On(const Packet::DespawnEntity &pack) { @@ -261,7 +406,7 @@ void MasterState::On(const Packet::DespawnEntity &pack) { for (Entity &entity : state->GetWorld().Entities()) { if (entity.ID() == entity_id) { entity.Kill(); - cout << "despawned entity " << entity.Name() << " at " << entity.AbsolutePosition() << endl; + cout << "despawned entity #" << entity_id << " (" << entity.Name() << ") at " << entity.AbsolutePosition() << endl; return; } } @@ -306,7 +451,7 @@ bool MasterState::UpdateEntity(uint32_t entity_id, uint16_t seq) { return true; } - int pack_diff = int16_t(seq) - int16_t(entry->second.last_packet); + int16_t pack_diff = int16_t(seq) - int16_t(entry->second.last_packet); int time_diff = update_timer.Elapsed() - entry->second.last_update; entry->second.last_update = update_timer.Elapsed(); @@ -322,5 +467,44 @@ void MasterState::ClearEntity(uint32_t entity_id) { update_status.erase(entity_id); } +void MasterState::On(const Packet::PlayerCorrection &pack) { + if (!state) { + cout << "got player correction without a player :S" << endl; + Quit(); + return; + } + uint16_t pack_seq; + EntityState corrected_state; + pack.ReadPacketSeq(pack_seq); + pack.ReadPlayerState(corrected_state); + state->MergePlayerCorrection(pack_seq, corrected_state); +} + +void MasterState::On(const Packet::ChunkBegin &pack) { + if (!state) { + cout << "got chunk data, but the world has not been created yet" << endl; + cout << "great, this will totally screw up everything :(" << endl; + return; + } + state->GetChunkReceiver().Handle(pack); +} + +void MasterState::On(const Packet::ChunkData &pack) { + if (!state) { + cout << "got chunk data, but the world has not been created yet" << endl; + cout << "great, this will totally screw up everything :(" << endl; + return; + } + state->GetChunkReceiver().Handle(pack); +} + +void MasterState::On(const Packet::BlockUpdate &pack) { + if (!state) { + cout << "received block update, but the world has not been created yet" << endl; + return; + } + state->Handle(pack); +} + } }