#include "Server.hpp"
#include "../app/init.hpp"
+#include "../model/CompositeModel.hpp"
#include "../world/ChunkIndex.hpp"
#include "../world/Entity.hpp"
#include "../world/World.hpp"
: server(server)
, conn(addr)
, player(nullptr, nullptr)
+, player_model(nullptr)
, spawns()
, confirm_wait(0)
+, entity_updates()
, player_update_state()
, player_update_pack(0)
, player_update_timer(1500)
SendDespawn(*local_iter);
} else {
// update
- SendUpdate(*local_iter);
+ QueueUpdate(*local_iter);
}
++global_iter;
++local_iter;
SendDespawn(*local_iter);
++local_iter;
}
+ SendUpdates();
CheckPlayerFix();
CheckChunkQueue();
++confirm_wait;
}
-void ClientConnection::SendUpdate(SpawnStatus &status) {
+void ClientConnection::QueueUpdate(SpawnStatus &status) {
// don't send updates while spawn not ack'd or despawn sent
- if (status.spawn_pack != -1 || status.despawn_pack != -1) return;
+ if (status.spawn_pack == -1 && status.despawn_pack == -1) {
+ entity_updates.push_back(&status);
+ }
+}
- // TODO: pack entity updates
+void ClientConnection::SendUpdates() {
auto pack = Prepare<Packet::EntityUpdate>();
- pack.WriteEntityCount(1);
- pack.WriteEntity(*status.entity, 0);
- Send(Packet::EntityUpdate::GetSize(1));
+ int entity_pos = 0;
+ for (SpawnStatus *status : entity_updates) {
+ pack.WriteEntity(*status->entity, entity_pos);
+ ++entity_pos;
+ if (entity_pos == Packet::EntityUpdate::MAX_ENTITIES) {
+ pack.WriteEntityCount(entity_pos);
+ Send(Packet::EntityUpdate::GetSize(entity_pos));
+ pack = Prepare<Packet::EntityUpdate>();
+ entity_pos = 0;
+ }
+ }
+ if (entity_pos > 0) {
+ pack.WriteEntityCount(entity_pos);
+ Send(Packet::EntityUpdate::GetSize(entity_pos));
+ }
+ entity_updates.clear();
}
void ClientConnection::CheckPlayerFix() {
}
}
}
+ if (HasPlayerModel()) {
+ GetPlayerModel().Instantiate(player.entity->GetModel());
+ }
cout << "player \"" << player.entity->Name() << "\" joined" << endl;
}
chunk_queue.clear();
}
+void ClientConnection::SetPlayerModel(const CompositeModel &m) noexcept {
+ player_model = &m;
+ if (HasPlayer()) {
+ m.Instantiate(PlayerEntity().GetModel());
+ }
+}
+
+bool ClientConnection::HasPlayerModel() const noexcept {
+ return player_model;
+}
+
+const CompositeModel &ClientConnection::GetPlayerModel() const noexcept {
+ return *player_model;
+}
+
void ClientConnection::OnPacketReceived(uint16_t seq) {
if (transmitter.Waiting()) {
transmitter.Ack(seq);
: serv_sock(nullptr)
, serv_pack{ -1, nullptr, 0 }
, clients()
-, world(world) {
+, world(world)
+, player_model(nullptr) {
serv_sock = SDLNet_UDP_Open(conf.port);
if (!serv_sock) {
throw NetError("SDLNet_UDP_Open");
}
}
clients.emplace_back(*this, addr);
+ if (HasPlayerModel()) {
+ clients.back().SetPlayerModel(GetPlayerModel());
+ }
return clients.back();
}
void Server::Update(int dt) {
for (list<ClientConnection>::iterator client(clients.begin()), end(clients.end()); client != end;) {
- client->Update(dt);
if (client->Disconnected()) {
client = clients.erase(client);
} else {
}
}
+void Server::SetPlayerModel(const CompositeModel &m) noexcept {
+ player_model = &m;
+ for (ClientConnection &client : clients) {
+ client.SetPlayerModel(m);
+ }
+}
+
+bool Server::HasPlayerModel() const noexcept {
+ return player_model;
+}
+
+const CompositeModel &Server::GetPlayerModel() const noexcept {
+ return *player_model;
+}
+
}
}