#include "Spawner.hpp"
-#include "Chaser.hpp"
-#include "RandomWalk.hpp"
+#include "AIController.hpp"
+
#include "../model/Model.hpp"
#include "../model/ModelRegistry.hpp"
#include "../rand/GaloisLFSR.hpp"
namespace blank {
-Spawner::Spawner(World &world, ModelRegistry &models, GaloisLFSR &rand)
+Spawner::Spawner(World &world, ModelRegistry &models)
: world(world)
, models(models)
-, controllers()
-, random(rand)
+, entities()
, timer(64)
, despawn_range(128 * 128)
, spawn_distance(16 * 16)
-, max_entities(16)
+, max_entities(32)
, chunk_range(4)
, model_offset(0)
, model_length(models.size()) {
}
Spawner::~Spawner() {
- for (auto &ctrl : controllers) {
- delete ctrl;
+ for (Entity *e : entities) {
+ e->UnRef();
}
}
if (timer.Hit()) {
TrySpawn();
}
- for (auto &ctrl : controllers) {
- ctrl->Update(dt);
- }
}
void Spawner::CheckDespawn() noexcept {
const auto &refs = world.Players();
- for (auto iter = controllers.begin(), end = controllers.end(); iter != end;) {
- Entity &e = (*iter)->Controlled();
+ for (auto iter = entities.begin(), end = entities.end(); iter != end;) {
+ Entity &e = (**iter);
if (e.Dead()) {
- delete *iter;
- iter = controllers.erase(iter);
- end = controllers.end();
+ e.UnRef();
+ iter = entities.erase(iter);
+ end = entities.end();
continue;
}
bool safe = false;
}
if (!safe) {
e.Kill();
- delete *iter;
- iter = controllers.erase(iter);
- end = controllers.end();
+ e.UnRef();
+ iter = entities.erase(iter);
+ end = entities.end();
} else {
++iter;
}
}
void Spawner::TrySpawn() {
- if (controllers.size() >= max_entities || model_length == 0) return;
+ if (entities.size() >= max_entities || model_length == 0) return;
// select random player to punish
auto &players = world.Players();
if (players.size() == 0) return;
- size_t player_num = random.Next<unsigned short>() % players.size();
+ size_t player_num = world.Random().Next<unsigned short>() % players.size();
auto i = players.begin(), end = players.end();
for (; player_num > 0 && i != end; ++i, --player_num) {
}
const Player &player = *i;
- BlockLookup spawn_block(player.GetChunks().RandomBlock(random));
+ BlockLookup spawn_block(player.GetChunks().RandomBlock(world.Random()));
// distance check
//glm::vec3 diff(glm::vec3(chunk * Chunk::Extent() - pos) + player.entity->Position());
e.Bounds({ { -0.5f, -0.5f, -0.5f }, { 0.5f, 0.5f, 0.5f } });
e.WorldCollidable(true);
RandomModel().Instantiate(e.GetModel());
- Controller *ctrl;
- if (random()) {
- ctrl = new RandomWalk(e, random.Next<std::uint64_t>());
- e.Name("walker");
- } else {
- ctrl = new Chaser(world, e, reference);
- e.Name("chaser");
- }
- controllers.emplace_back(ctrl);
+ e.SetController(new AIController(world, e));
+ e.Name("spawned");
+ e.Ref();
+ entities.emplace_back(&e);
}
Model &Spawner::RandomModel() noexcept {
- std::size_t offset = (random.Next<std::size_t>() % model_length) + model_offset;
+ std::size_t offset = (world.Random().Next<std::size_t>() % model_length) + model_offset;
return models[offset];
}