X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fclient%2Fclient.cpp;h=91d6aed6992e7327fc23116fcea59c9f902c8c00;hb=933ca0fe6c660e482edd45742d981f2de59a32df;hp=521b149ae824185cd44fda750f9ec38c48917ba7;hpb=2e3774eb3f2d5d23a08731175b168566457e2192;p=blank.git diff --git a/src/client/client.cpp b/src/client/client.cpp index 521b149..91d6aed 100644 --- a/src/client/client.cpp +++ b/src/client/client.cpp @@ -8,6 +8,7 @@ #include "../app/TextureIndex.hpp" #include "../model/CompositeModel.hpp" #include "../io/WorldSave.hpp" +#include "../world/ChunkIndex.hpp" #include "../world/ChunkStore.hpp" #include @@ -106,32 +107,29 @@ 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) -) +, 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(*interface.GetPlayer().chunks) +, chunk_renderer(player.GetChunks()) , skeletons() , loop_timer(16) -, sky(master.GetEnv().loader.LoadCubeMap("skybox")) -, player_hist() { +, 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(); loop_timer.Start(); } @@ -168,12 +166,21 @@ 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); chunk_receiver.Update(dt); chunk_requester.Update(dt); - interface.Update(dt); + hud.Update(dt); int world_dt = 0; while (loop_timer.HitOnce()) { world.Update(loop_timer.Interval()); @@ -182,118 +189,103 @@ void InteractiveState::Update(int dt) { } chunk_renderer.Update(dt); - Entity &player = *interface.GetPlayer().entity; - if (world_dt > 0) { - PushPlayerUpdate(player, world_dt); + 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::PushPlayerUpdate(const Entity &player, int dt) { - std::uint16_t packet = master.GetClient().SendPlayerUpdate(player); - if (player_hist.size() < 16) { - player_hist.emplace_back(player.GetState(), dt, packet); - } else { - auto entry = player_hist.begin(); - entry->state = player.GetState(); - entry->delta_t = dt; - entry->packet = packet; - player_hist.splice(player_hist.end(), player_hist, entry); +void InteractiveState::Render(Viewport &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(uint16_t seq, const EntityState &corrected_state) { - if (player_hist.empty()) return; - - auto entry = player_hist.begin(); - auto end = player_hist.end(); +void InteractiveState::MergePlayerCorrection(std::uint16_t pack, const EntityState &state) { + input.MergePlayerCorrection(pack, state); +} - // we may have received an older packet - int pack_diff = int16_t(seq) - int16_t(entry->packet); - if (pack_diff < 0) { - // indeed we have, just ignore it +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; } - - // drop anything older than the fix - while (entry != end) { - pack_diff = int16_t(seq) - int16_t(entry->packet); - if (pack_diff > 0) { - entry = player_hist.erase(entry); - } else { - break; + 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); } } +} - EntityState replay_state(corrected_state); - EntityState &player_state = interface.GetPlayer().entity->GetState(); - - if (entry != end) { - entry->state.chunk_pos = replay_state.chunk_pos; - entry->state.block_pos = replay_state.block_pos; - ++entry; +void InteractiveState::SetAudio(bool b) { + master.GetConfig().audio.enabled = b; + if (b) { + hud.PostMessage("Audio enabled"); + } else { + hud.PostMessage("Audio disabled"); } +} - while (entry != end) { - replay_state.velocity = entry->state.velocity; - replay_state.Update(entry->delta_t); - entry->state.chunk_pos = replay_state.chunk_pos; - entry->state.block_pos = replay_state.block_pos; - ++entry; +void InteractiveState::SetVideo(bool b) { + master.GetConfig().video.world = b; + if (b) { + hud.PostMessage("World rendering enabled"); + } else { + hud.PostMessage("World rendering disabled"); } +} - glm::vec3 displacement(replay_state.Diff(player_state)); - const float disp_squared = dot(displacement, displacement); - - if (disp_squared < 16.0f * numeric_limits::epsilon()) { - return; +void InteractiveState::SetHUD(bool b) { + master.GetConfig().video.hud = b; + if (b) { + hud.PostMessage("HUD rendering enabled"); + } else { + hud.PostMessage("HUD rendering disabled"); } +} - // if offset > 10cm, warp the player - // otherwise, move at most 1cm per frame towards - // the fixed position (160ms, so shouldn't be too noticeable) - constexpr float warp_thresh = 0.01f; // (1/10)^2 - constexpr float max_disp = 0.0001f; // (1/100)^2 - - if (disp_squared > warp_thresh) { - player_state.chunk_pos = replay_state.chunk_pos; - player_state.block_pos = replay_state.block_pos; - } else if (disp_squared < max_disp) { - player_state.block_pos += displacement; +void InteractiveState::SetDebug(bool b) { + master.GetConfig().video.debug = b; + if (b) { + hud.PostMessage("Debug rendering enabled"); } else { - displacement *= 0.01f / sqrt(disp_squared); - player_state.block_pos += displacement; + hud.PostMessage("Debug rendering disabled"); } } -void InteractiveState::Render(Viewport &viewport) { - Entity &player = *interface.GetPlayer().entity; - viewport.WorldPosition(player.Transform(player.ChunkCoords())); - chunk_renderer.Render(viewport); - world.Render(viewport); - sky.Render(viewport); - interface.Render(viewport); +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() @@ -311,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); } @@ -335,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); } } @@ -364,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()); @@ -506,5 +498,13 @@ void MasterState::On(const Packet::ChunkData &pack) { 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); +} + } }