fix some inline TODOs

[blank.git] / src / ai / Spawner.cpp

diff --git a/src/ai/Spawner.cpp b/src/ai/Spawner.cpp
index b3a9f240105f34f39b97ca489395dd76c3904cbc..fd449c9a99b8698d9250fe7e044bd09ba782ce11 100644 (file)
--- a/src/ai/Spawner.cpp
+++ b/src/ai/Spawner.cpp
@@ -1,6 +1,8 @@
 #include "Spawner.hpp"
 
+#include "Chaser.hpp"
 #include "RandomWalk.hpp"
+#include "../world/BlockLookup.hpp"
 #include "../world/BlockType.hpp"
 #include "../world/BlockTypeRegistry.hpp"
 #include "../world/Entity.hpp"
@@ -12,17 +14,26 @@ namespace blank {
 Spawner::Spawner(World &world)
 : world(world)
 , controllers()
-, timer(8096)
+, timer(64)
 , despawn_range(128 * 128)
 , spawn_distance(16 * 16)
 , max_entities(16)
 , chunk_range(4) {
+       EntityModel::Buffer buf;
+       for (size_t i = 0; i < 14; ++i) {
+               world.BlockTypes()[i + 1].FillEntityModel(buf);
+               models[i].Update(buf);
+               buf.Clear();
+       }
+
        timer.Start();
        Spawn(world.Player().ChunkCoords(), { 0.5f, 0.5f, 0.5f });
 }
 
 Spawner::~Spawner() {
-
+       for (auto &ctrl : controllers) {
+               delete ctrl;
+       }
 }
 
 
@@ -33,7 +44,7 @@ void Spawner::Update(int dt) {
                TrySpawn();
        }
        for (auto &ctrl : controllers) {
-               ctrl.Update(dt);
+               ctrl->Update(dt);
        }
 }
 
@@ -41,10 +52,11 @@ void Spawner::Update(int dt) {
 void Spawner::CheckDespawn() noexcept {
        const Entity &reference = world.Player();
        for (auto iter = controllers.begin(), end = controllers.end(); iter != end;) {
-               Entity &e = iter->Controlled();
+               Entity &e = (*iter)->Controlled();
                glm::vec3 diff(reference.AbsoluteDifference(e));
                if (dot(diff, diff) > despawn_range) {
                        e.Remove();
+                       delete *iter;
                        iter = controllers.erase(iter);
                } else {
                        ++iter;
@@ -55,13 +67,13 @@ void Spawner::CheckDespawn() noexcept {
 void Spawner::TrySpawn() {
        if (controllers.size() >= max_entities) return;
 
-       glm::tvec3<int> chunk(
+       glm::ivec3 chunk(
                (rand() % (chunk_range * 2 + 1)) - chunk_range,
                (rand() % (chunk_range * 2 + 1)) - chunk_range,
                (rand() % (chunk_range * 2 + 1)) - chunk_range
        );
 
-       glm::tvec3<int> pos(
+       glm::ivec3 pos(
                rand() % Chunk::width,
                rand() % Chunk::height,
                rand() % Chunk::depth
@@ -75,35 +87,40 @@ void Spawner::TrySpawn() {
                return;
        }
 
-       // block check
-       // TODO: avoid force load, abort spawn if chunk unavailble
-       Chunk &tgt_chunk = world.Next(world.PlayerChunk(), chunk);
-       // TODO: don't use visibility for spawn check
-       //       also, check for more than one block space
-       if (tgt_chunk.Type(tgt_chunk.BlockAt(pos)).visible) {
+       // check if the spawn block and the one above it are loaded and inhabitable
+       BlockLookup spawn_block(&world.PlayerChunk(), chunk * Chunk::Extent() + pos);
+       if (!spawn_block || spawn_block.GetType().collide_block) {
+               return;
+       }
+
+       BlockLookup head_block(spawn_block.Next(Block::FACE_UP));
+       if (!head_block || head_block.GetType().collide_block) {
                return;
        }
 
        Spawn(world.Player().ChunkCoords() + chunk, glm::vec3(pos) + glm::vec3(0.5f));
 }
 
-void Spawner::Spawn(const glm::tvec3<int> &chunk, const glm::vec3 &pos) {
-       glm::vec3 color(rand() % 6, rand() % 6, rand() % 6);
-       color = color * 0.15f + 0.25f;
-
+void Spawner::Spawn(const glm::ivec3 &chunk, const glm::vec3 &pos) {
        glm::vec3 rot(0.000001f);
-       rot.x *= (rand() % 32);
-       rot.y *= (rand() % 32);
-       rot.z *= (rand() % 32);
+       rot.x *= (rand() % 1024);
+       rot.y *= (rand() % 1024);
+       rot.z *= (rand() % 1024);
 
        Entity &e = world.AddEntity();
        e.Name("test");
        e.Position(chunk, pos);
        e.Bounds({ { -0.5f, -0.5f, -0.5f }, { 0.5f, 0.5f, 0.5f } });
        e.WorldCollidable(true);
-       e.SetShape(world.BlockTypes()[1].shape, color);
-       e.AngularVelocity(glm::quat(glm::vec3{ 0.00001f, 0.000006f, 0.000013f }));
-       controllers.emplace_back(e);
+       e.GetModel().SetNodeModel(&models[rand() % 14]);
+       e.AngularVelocity(rot);
+       Controller *ctrl;
+       if (rand() % 2) {
+               ctrl = new RandomWalk(e);
+       } else {
+               ctrl = new Chaser(world, e, world.Player());
+       }
+       controllers.emplace_back(ctrl);
 }
 
 }