#include "../app/Environment.hpp"
#include "../app/init.hpp"
+#include "../geometry/distance.hpp"
#include "../model/Model.hpp"
#include "../io/WorldSave.hpp"
#include "../world/ChunkIndex.hpp"
, sounds()
, save(master.GetEnv().config.GetWorldPath(master.GetWorldConf().name, master.GetConfig().net.host))
, world(res.block_types, master.GetWorldConf())
-, player(*world.AddPlayer(master.GetConfig().player.name))
+, player(*world.AddPlayer(master.GetConfig().player.name, player_id))
, hud(master.GetEnv(), master.GetConfig(), player)
, 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_receiver(master.GetClient(), world.Chunks(), save)
, chunk_renderer(player.GetChunks())
, loop_timer(16)
+, stat_timer(1000)
, sky(master.GetEnv().loader.LoadCubeMap("skybox"))
-, update_status() {
+, update_status()
+, chat(master.GetEnv(), *this, *this)
+, time_skipped(0)
+, packets_skipped(0) {
if (!save.Exists()) {
save.Write(master.GetWorldConf());
}
chunk_renderer.LoadTextures(master.GetEnv().loader, res.tex_index);
chunk_renderer.FogDensity(master.GetWorldConf().fog_density);
loop_timer.Start();
- if (save.Exists(player)) {
- save.Read(player);
+ stat_timer.Start();
+}
+
+void InteractiveState::OnResume() {
+ OnFocus();
+}
+
+void InteractiveState::OnPause() {
+ OnBlur();
+}
+
+void InteractiveState::OnFocus() {
+ if (master.GetConfig().input.mouse) {
+ master.GetEnv().window.GrabMouse();
}
+ interface.Unlock();
}
-void InteractiveState::OnEnter() {
- master.GetEnv().window.GrabMouse();
+void InteractiveState::OnBlur() {
+ master.GetEnv().window.ReleaseMouse();
+ interface.Lock();
}
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) {
+ chat.Clear();
+ master.GetEnv().state.Push(&chat);
+ hud.KeepMessages(true);
+ } else if (event.key.keysym.sym == SDLK_SLASH) {
+ chat.Preset("/");
+ master.GetEnv().state.Push(&chat);
+ hud.KeepMessages(true);
+ } else {
+ interface.HandlePress(event.key);
+ }
break;
case SDL_KEYUP:
interface.HandleRelease(event.key);
}
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(res.block_types[player.GetInventorySlot() + 1]);
loop_timer.Update(dt);
+ stat_timer.Update(dt);
master.Update(dt);
chunk_receiver.Update(dt);
- hud.Update(dt);
int world_dt = 0;
while (loop_timer.HitOnce()) {
world.Update(loop_timer.Interval());
}
chunk_renderer.Update(dt);
+ if (input.BlockFocus()) {
+ hud.FocusBlock(input.BlockFocus().GetChunk(), input.BlockFocus().block);
+ } else if (input.EntityFocus()) {
+ hud.FocusEntity(input.EntityFocus().GetEntity());
+ } else {
+ hud.FocusNone();
+ }
if (world_dt > 0) {
- input.PushPlayerUpdate(world_dt);
+ if (input.UpdateImportant() || packets_skipped >= master.NetStat().SuggestedPacketSkip()) {
+ input.PushPlayerUpdate(time_skipped + world_dt);
+ time_skipped = 0;
+ packets_skipped = 0;
+ } else {
+ time_skipped += world_dt;
+ ++packets_skipped;
+ }
}
+ hud.Display(res.block_types[player.GetInventorySlot() + 1]);
+ if (stat_timer.Hit()) {
+ hud.UpdateNetStats(master.NetStat());
+ }
+ hud.Update(dt);
glm::mat4 trans = player.GetEntity().Transform(player.GetEntity().ChunkCoords());
glm::vec3 dir(trans * glm::vec4(0.0f, 0.0f, -1.0f, 0.0f));
}
void InteractiveState::Render(Viewport &viewport) {
- viewport.WorldPosition(
- player.GetEntity().Transform(player.GetEntity().ChunkCoords())
- * player.GetEntity().GetModel().EyesTransform());
+ viewport.WorldPosition(player.GetEntity().ViewTransform(player.GetEntity().ChunkCoords()));
if (master.GetConfig().video.world) {
chunk_renderer.Render(viewport);
world.Render(viewport);
+ if (master.GetConfig().video.debug) {
+ world.RenderDebug(viewport);
+ }
sky.Render(viewport);
}
hud.Render(viewport);
Entity &entity = world.ForceAddEntity(entity_id);
UpdateEntity(entity_id, pack.Seq());
pack.ReadEntity(entity);
- uint32_t skel_id;
- pack.ReadSkeletonID(skel_id);
- if (skel_id > 0 && skel_id <= res.models.size()) {
- Model &skel = res.models.Get(skel_id);
- skel.Instantiate(entity.GetModel());
+ 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;
}
void InteractiveState::Handle(const Packet::DespawnEntity &pack) {
for (Entity &entity : world.Entities()) {
if (entity.ID() == entity_id) {
entity.Kill();
- cout << "despawned entity #" << entity_id << " (" << entity.Name() << ") at " << entity.AbsolutePosition() << endl;
return;
}
}
auto world_end = world.Entities().end();
uint32_t count = 0;
+ glm::ivec3 base;
pack.ReadEntityCount(count);
+ pack.ReadChunkBase(base);
+ EntityState state;
for (uint32_t i = 0; i < count; ++i) {
uint32_t entity_id = 0;
}
if (world_iter->ID() == entity_id) {
if (UpdateEntity(entity_id, pack.Seq())) {
- pack.ReadEntityState(world_iter->GetState(), i);
+ pack.ReadEntityState(state, base, i);
+ world_iter->SetState(state);
}
}
}
}
}
+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) {
}
}
+void InteractiveState::NextCamera() {
+ if (iszero(master.GetEnv().viewport.CameraOffset())) {
+ master.GetEnv().viewport.OffsetCamera(glm::vec3(0.0f, 0.0f, -5.0f));
+ } else {
+ master.GetEnv().viewport.OffsetCamera(glm::vec3(0.0f, 0.0f, 0.0f));
+ }
+}
+
void InteractiveState::Exit() {
save.Write(player);
master.Quit();
}
+void InteractiveState::OnLineSubmit(const string &line) {
+ if (!line.empty()) {
+ master.GetClient().SendMessage(1, 0, line);
+ }
+}
+
MasterState::MasterState(
Environment &env,
}
-void MasterState::Handle(const SDL_Event &event) {
+void MasterState::Handle(const SDL_Event &) {
}
pack.ReadPlayerID(player_id);
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);
+ EntityState player_state;
+ pack.ReadPlayerState(player_state);
+ state->GetPlayer().GetEntity().SetState(player_state);
env.state.PopAfter(this);
env.state.Push(state.get());
}
-void MasterState::On(const Packet::Part &pack) {
+void MasterState::On(const Packet::Part &) {
Quit();
if (state) {
// kicked
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;
+ }
+}
+
}
}
projects / blank.git / blobdiff