X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fclient%2Fclient.cpp;h=9e4ba501b141f3420b2b8eb957429da39e7be5be;hb=8de9eb53c9ae92c6bfa8f01cf6659b683fe2155d;hp=2618d98f3b0e0d1e1c0810c7b2f6db8bbb7964a1;hpb=a26ca06878d45d3ce77cbc28b574f2553e121944;p=blank.git diff --git a/src/client/client.cpp b/src/client/client.cpp index 2618d98..9e4ba50 100644 --- a/src/client/client.cpp +++ b/src/client/client.cpp @@ -4,7 +4,6 @@ #include "../app/Environment.hpp" #include "../app/init.hpp" -#include "../app/TextureIndex.hpp" #include "../model/Model.hpp" #include "../io/WorldSave.hpp" #include "../world/ChunkIndex.hpp" @@ -48,33 +47,32 @@ void InitialState::Render(Viewport &viewport) { // TODO: this clutter is a giant mess InteractiveState::InteractiveState(MasterState &master, uint32_t player_id) : master(master) -, shapes() -, block_types() +, res() +, sounds() , save(master.GetEnv().config.GetWorldPath(master.GetWorldConf().name, master.GetConfig().net.host)) -, world(block_types, master.GetWorldConf()) -, player(*world.AddPlayer(master.GetConfig().player.name)) +, world(res.block_types, master.GetWorldConf()) +, player(*world.AddPlayer(master.GetConfig().player.name, player_id)) , hud(master.GetEnv(), master.GetConfig(), player) -, manip(master.GetEnv(), player.GetEntity()) +, manip(master.GetEnv().audio, sounds, player.GetEntity()) , input(world, player, master.GetClient()) , interface(master.GetConfig(), master.GetEnv().keymap, input, *this) , chunk_receiver(world.Chunks(), save) , chunk_renderer(player.GetChunks()) -, skeletons() , loop_timer(16) , sky(master.GetEnv().loader.LoadCubeMap("skybox")) -, tex_map() -, update_status() { +, update_status() +, chat(master.GetEnv(), *this, *this) { if (!save.Exists()) { save.Write(master.GetWorldConf()); } - TextureIndex tex_index; - master.GetEnv().loader.LoadShapes("default", shapes); - master.GetEnv().loader.LoadBlockTypes("default", block_types, tex_index, shapes); - skeletons.Load(shapes); - tex_map.push_back(tex_index.GetID("rock-1")); - tex_map.push_back(tex_index.GetID("rock-face")); - interface.SetInventorySlots(block_types.size() - 1); - chunk_renderer.LoadTextures(master.GetEnv().loader, tex_index); + res.Load(master.GetEnv().loader, "default"); + if (res.models.size() < 1) { + throw std::runtime_error("need at least one model to run"); + } + res.models[0].Instantiate(player.GetEntity().GetModel()); + sounds.Load(master.GetEnv().loader, res.snd_index); + interface.SetInventorySlots(res.block_types.size() - 1); + chunk_renderer.LoadTextures(master.GetEnv().loader, res.tex_index); chunk_renderer.FogDensity(master.GetWorldConf().fog_density); loop_timer.Start(); if (save.Exists(player)) { @@ -89,7 +87,13 @@ void InteractiveState::OnEnter() { void InteractiveState::Handle(const SDL_Event &event) { switch (event.type) { case SDL_KEYDOWN: - interface.HandlePress(event.key); + // TODO: move to interface + if (event.key.keysym.sym == SDLK_RETURN) { + master.GetEnv().state.Push(&chat); + hud.KeepMessages(true); + } else { + interface.HandlePress(event.key); + } break; case SDL_KEYUP: interface.HandleRelease(event.key); @@ -123,7 +127,7 @@ void InteractiveState::Update(int dt) { } else { hud.FocusNone(); } - hud.Display(block_types[player.GetInventorySlot() + 1]); + hud.Display(res.block_types[player.GetInventorySlot() + 1]); loop_timer.Update(dt); master.Update(dt); chunk_receiver.Update(dt); @@ -150,7 +154,9 @@ void InteractiveState::Update(int dt) { } void InteractiveState::Render(Viewport &viewport) { - viewport.WorldPosition(player.GetEntity().Transform(player.GetEntity().ChunkCoords())); + viewport.WorldPosition( + player.GetEntity().Transform(player.GetEntity().ChunkCoords()) + * player.GetEntity().GetModel().EyesTransform()); if (master.GetConfig().video.world) { chunk_renderer.Render(viewport); world.Render(viewport); @@ -165,12 +171,10 @@ void InteractiveState::Handle(const Packet::SpawnEntity &pack) { Entity &entity = world.ForceAddEntity(entity_id); UpdateEntity(entity_id, pack.Seq()); pack.ReadEntity(entity); - uint32_t skel_id; - pack.ReadSkeletonID(skel_id); - Model *skel = skeletons.ByID(skel_id); - if (skel) { - skel->Instantiate(entity.GetModel()); - entity.GetModel().SetTextures(tex_map); + uint32_t model_id; + pack.ReadModelID(model_id); + if (model_id > 0 && model_id <= res.models.size()) { + res.models.Get(model_id).Instantiate(entity.GetModel()); } cout << "spawned entity #" << entity_id << " (" << entity.Name() << ") at " << entity.AbsolutePosition() << endl; @@ -194,7 +198,9 @@ void InteractiveState::Handle(const Packet::EntityUpdate &pack) { auto world_end = world.Entities().end(); uint32_t count = 0; + glm::ivec3 base; pack.ReadEntityCount(count); + pack.ReadChunkBase(base); for (uint32_t i = 0; i < count; ++i) { uint32_t entity_id = 0; @@ -209,7 +215,7 @@ void InteractiveState::Handle(const Packet::EntityUpdate &pack) { } if (world_iter->ID() == entity_id) { if (UpdateEntity(entity_id, pack.Seq())) { - pack.ReadEntityState(world_iter->GetState(), i); + pack.ReadEntityState(world_iter->GetState(), base, i); } } } @@ -261,12 +267,18 @@ void InteractiveState::Handle(const Packet::BlockUpdate &pack) { Block block; pack.ReadIndex(index, i); pack.ReadBlock(block, i); - if (index < Chunk::size && block.type < block_types.size()) { + if (index < Chunk::size && block.type < res.block_types.size()) { manip.SetBlock(*chunk, index, block); } } } +void InteractiveState::Handle(const Packet::Message &pack) { + string msg; + pack.ReadMessage(msg); + hud.PostMessage(msg); +} + void InteractiveState::SetAudio(bool b) { master.GetConfig().audio.enabled = b; if (b) { @@ -308,6 +320,10 @@ void InteractiveState::Exit() { master.Quit(); } +void InteractiveState::OnLineSubmit(const string &line) { + master.GetClient().SendMessage(1, 0, line); +} + MasterState::MasterState( Environment &env, @@ -384,6 +400,8 @@ void MasterState::On(const Packet::Join &pack) { state.reset(new InteractiveState(*this, player_id)); pack.ReadPlayerState(state->GetPlayer().GetEntity().GetState()); + glm::vec3 orient(glm::eulerAngles(state->GetPlayer().GetEntity().Orientation())); + state->GetPlayerController().TurnHead(orient.x, orient.y); env.state.PopAfter(this); env.state.Push(state.get()); @@ -458,5 +476,15 @@ void MasterState::On(const Packet::BlockUpdate &pack) { state->Handle(pack); } +void MasterState::On(const Packet::Message &pack) { + if (state) { + state->Handle(pack); + } else { + string msg; + pack.ReadMessage(msg); + cout << "got message before interface was created: " << msg << endl; + } +} + } }