X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fclient%2Fclient.cpp;h=ba9fcc9bdfb3c9b9e742deb60d1c7d0dd51f46a5;hb=b3d9f773c94aee99598cbd8e94e614b2c6da1216;hp=ac682bb8d8909eb37bfd876541d20f7ad3c58eb0;hpb=1afc887a2040dfdedfa66913e94ff7a9634f648f;p=blank.git diff --git a/src/client/client.cpp b/src/client/client.cpp index ac682bb..ba9fcc9 100644 --- a/src/client/client.cpp +++ b/src/client/client.cpp @@ -7,6 +7,9 @@ #include "../app/TextureIndex.hpp" #include +#include + +using namespace std; namespace blank { @@ -38,13 +41,19 @@ void InitialState::Render(Viewport &viewport) { } -InteractiveState::InteractiveState(MasterState &master) +// TODO: this clutter is a giant mess +InteractiveState::InteractiveState(MasterState &master, uint32_t player_id) : master(master) , block_types() , save(master.GetEnv().config.GetWorldPath(master.GetWorldConf().name, master.GetClientConf().host)) -, world(block_types, master.GetWorldConf(), save) -, chunk_renderer(world, master.GetWorldConf().load.load_dist) -, interface(master.GetInterfaceConf(), master.GetEnv(), world) { +, world(block_types, master.GetWorldConf()) +, interface( + master.GetInterfaceConf(), + master.GetEnv(), + world, + world.AddPlayer(master.GetInterfaceConf().player_name, player_id) +) +, chunk_renderer(*interface.GetPlayer().chunks) { TextureIndex tex_index; master.GetEnv().loader.LoadBlockTypes("default", block_types, tex_index); chunk_renderer.LoadTextures(master.GetEnv().loader, tex_index); @@ -90,19 +99,23 @@ void InteractiveState::Update(int dt) { interface.Update(dt); world.Update(dt); - chunk_renderer.Rebase(interface.Player().ChunkCoords()); chunk_renderer.Update(dt); - glm::mat4 trans = interface.Player().Transform(interface.Player().ChunkCoords()); + Entity &player = *interface.GetPlayer().entity; + + master.GetClient().SendPlayerUpdate(player); + + glm::mat4 trans = player.Transform(player.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(interface.Player().Position()); - master.GetEnv().audio.Velocity(interface.Player().Velocity()); + master.GetEnv().audio.Position(player.Position()); + master.GetEnv().audio.Velocity(player.Velocity()); master.GetEnv().audio.Orientation(dir, up); } void InteractiveState::Render(Viewport &viewport) { - viewport.WorldPosition(interface.Player().Transform(interface.Player().ChunkCoords())); + Entity &player = *interface.GetPlayer().entity; + viewport.WorldPosition(player.Transform(player.ChunkCoords())); chunk_renderer.Render(viewport); world.Render(viewport); interface.Render(viewport); @@ -120,17 +133,21 @@ MasterState::MasterState( , client_conf(cc) , state() , client(cc) -, init_state(*this) { +, init_state(*this) +, login_packet(-1) { client.GetConnection().SetHandler(this); } void MasterState::Quit() { + if (!client.GetConnection().Closed()) { + client.SendPart(); + } env.state.PopUntil(this); } void MasterState::OnEnter() { - client.SendLogin(intf_conf.player_name); + login_packet = client.SendLogin(intf_conf.player_name); env.state.Push(&init_state); } @@ -143,10 +160,6 @@ void MasterState::Handle(const SDL_Event &event) { void MasterState::Update(int dt) { client.Handle(); client.Update(dt); - if (client.GetConnection().Closed()) { - Quit(); - // TODO: push disconnected message - } } @@ -155,19 +168,36 @@ void MasterState::Render(Viewport &) { } +void MasterState::OnPacketLost(uint16_t id) { + if (id == login_packet) { + login_packet = client.SendLogin(intf_conf.player_name); + } +} + +void MasterState::OnTimeout() { + if (client.GetConnection().Closed()) { + // TODO: push disconnected message + cout << "connection timed out" << endl; + Quit(); + } +} + void MasterState::On(const Packet::Join &pack) { pack.ReadWorldName(world_conf.name); if (state) { // changing worlds - std::cout << "server changing worlds" << std::endl; + cout << "server changing worlds to \"" << world_conf.name << '"' << endl; } else { // joining game - std::cout << "joined game" << std::endl; + cout << "joined game \"" << world_conf.name << '"' << endl; } - state.reset(new InteractiveState(*this)); - pack.ReadPlayer(state->GetInterface().Player()); + uint32_t player_id; + pack.ReadPlayerID(player_id); + state.reset(new InteractiveState(*this, player_id)); + + pack.ReadPlayer(*state->GetInterface().GetPlayer().entity); env.state.PopAfter(this); env.state.Push(state.get()); @@ -176,13 +206,78 @@ void MasterState::On(const Packet::Join &pack) { void MasterState::On(const Packet::Part &pack) { if (state) { // kicked - std::cout << "kicked by server" << std::endl; + cout << "kicked by server" << endl; } else { // join refused - std::cout << "login refused by server" << std::endl; + cout << "login refused by server" << endl; } Quit(); } +void MasterState::On(const Packet::SpawnEntity &pack) { + if (!state) { + cout << "got entity spawn before world was created" << endl; + Quit(); + return; + } + uint32_t entity_id; + pack.ReadEntityID(entity_id); + Entity *entity = state->GetWorld().AddEntity(entity_id); + if (!entity) { + cout << "entity ID inconsistency" << endl; + Quit(); + return; + } + pack.ReadEntity(*entity); + cout << "spawned entity " << entity->Name() << " at " << entity->AbsolutePosition() << endl; +} + +void MasterState::On(const Packet::DespawnEntity &pack) { + if (!state) { + cout << "got entity despawn before world was created" << endl; + Quit(); + return; + } + uint32_t entity_id; + pack.ReadEntityID(entity_id); + for (Entity &entity : state->GetWorld().Entities()) { + if (entity.ID() == entity_id) { + entity.Kill(); + cout << "despawned entity " << entity.Name() << " at " << entity.AbsolutePosition() << endl; + return; + } + } +} + +void MasterState::On(const Packet::EntityUpdate &pack) { + if (!state) { + cout << "got entity update before world was created" << endl; + Quit(); + return; + } + + auto world_iter = state->GetWorld().Entities().begin(); + auto world_end = state->GetWorld().Entities().end(); + + uint32_t count = 0; + pack.ReadEntityCount(count); + + for (uint32_t i = 0; i < count; ++i) { + uint32_t entity_id = 0; + pack.ReadEntityID(entity_id, i); + + while (world_iter != world_end && world_iter->ID() < entity_id) { + ++world_iter; + } + if (world_iter == world_end) { + // nothing can be done from here + return; + } + if (world_iter->ID() == entity_id) { + pack.ReadEntity(*world_iter, i); + } + } +} + } }