- player.Bounds({ { -0.5f, -0.5f, -0.5f }, { 0.5f, 0.5f, 0.5f } });
- player.WorldCollidable(true);
- player.Position(config.spawn);
- players.push_back(&player);
- chunks.QueueSurrounding(player.ChunkCoords());
- return &player;
+ entity->Bounds({ { -0.5f, -0.5f, -0.5f }, { 0.5f, 0.5f, 0.5f } });
+ entity->WorldCollidable(true);
+ entity->Position(config.spawn);
+ ChunkIndex *index = &chunks.MakeIndex(entity->ChunkCoords(), 6);
+ players.emplace_back(entity, index);
+ return players.back();
+}
+
+Entity &World::AddEntity() {
+ if (entities.empty()) {
+ entities.emplace_back();
+ entities.back().ID(1);
+ return entities.back();
+ }
+ if (entities.back().ID() < std::numeric_limits<std::uint32_t>::max()) {
+ std::uint32_t id = entities.back().ID() + 1;
+ entities.emplace_back();
+ entities.back().ID(id);
+ return entities.back();
+ }
+ std::uint32_t id = 1;
+ auto position = entities.begin();
+ auto end = entities.end();
+ while (position != end && position->ID() == id) {
+ ++id;
+ ++position;
+ }
+ auto entity = entities.emplace(position);
+ entity->ID(id);
+ return *entity;
+}
+
+Entity *World::AddEntity(std::uint32_t id) {
+ if (entities.empty() || entities.back().ID() < id) {
+ entities.emplace_back();
+ entities.back().ID(id);
+ return &entities.back();
+ }
+
+ auto position = entities.begin();
+ auto end = entities.end();
+ while (position != end && position->ID() < id) {
+ ++position;
+ }
+ if (position != end && position->ID() == id) {
+ return nullptr;
+ }
+ auto entity = entities.emplace(position);
+ entity->ID(id);
+ return &*entity;
+}
+
+Entity &World::ForceAddEntity(std::uint32_t id) {
+ if (entities.empty() || entities.back().ID() < id) {
+ entities.emplace_back();
+ entities.back().ID(id);
+ return entities.back();
+ }
+
+ auto position = entities.begin();
+ auto end = entities.end();
+ while (position != end && position->ID() < id) {
+ ++position;
+ }
+ if (position != end && position->ID() == id) {
+ return *position;
+ }
+ auto entity = entities.emplace(position);
+ entity->ID(id);
+ return *entity;