}
-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) {
+, interface(
+ master.GetInterfaceConf(),
+ master.GetEnv(),
+ world,
+ *world.AddPlayer(master.GetInterfaceConf().player_name, player_id)
+) {
TextureIndex tex_index;
master.GetEnv().loader.LoadBlockTypes("default", block_types, tex_index);
chunk_renderer.LoadTextures(master.GetEnv().loader, tex_index);
chunk_renderer.Rebase(interface.Player().ChunkCoords());
chunk_renderer.Update(dt);
+ master.GetClient().SendPlayerUpdate(interface.Player());
+
glm::mat4 trans = interface.Player().Transform(interface.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));
, client_conf(cc)
, state()
, client(cc)
-, init_state(*this) {
+, init_state(*this)
+, login_packet(-1) {
client.GetConnection().SetHandler(this);
}
void MasterState::OnEnter() {
- client.SendLogin(intf_conf.player_name);
+ login_packet = client.SendLogin(intf_conf.player_name);
env.state.Push(&init_state);
}
void MasterState::Update(int dt) {
client.Handle();
client.Update(dt);
- if (client.GetConnection().Closed()) {
- Quit();
- // TODO: push disconnected message
- }
}
}
+void MasterState::OnPacketLost(std::uint16_t id) {
+ if (id == login_packet) {
+ login_packet = client.SendLogin(intf_conf.player_name);
+ }
+}
+
+void MasterState::OnTimeout() {
+ if (client.GetConnection().Closed()) {
+ Quit();
+ // TODO: push disconnected message
+ }
+}
+
void MasterState::On(const Packet::Join &pack) {
pack.ReadWorldName(world_conf.name);
// joining game
std::cout << "joined game" << std::endl;
}
- state.reset(new InteractiveState(*this));
+
+ uint32_t player_id;
+ pack.ReadPlayerID(player_id);
+ state.reset(new InteractiveState(*this, player_id));
pack.ReadPlayer(state->GetInterface().Player());