display focused entity in debug overlay

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

diff --git a/src/ai/Spawner.cpp b/src/ai/Spawner.cpp
index b0b9bcb5127575cc0b254105ec669ed80216d274..b0ded15ab771121763f93c72bf1604164c12aa70 100644 (file)
--- a/src/ai/Spawner.cpp
+++ b/src/ai/Spawner.cpp
@@ -2,6 +2,7 @@
 
 #include "Chaser.hpp"
 #include "RandomWalk.hpp"
+#include "../world/BlockLookup.hpp"
 #include "../world/BlockType.hpp"
 #include "../world/BlockTypeRegistry.hpp"
 #include "../world/Entity.hpp"
@@ -13,11 +14,18 @@ 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 });
 }
@@ -79,12 +87,14 @@ 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;
        }
 
@@ -92,20 +102,17 @@ void Spawner::TrySpawn() {
 }
 
 void Spawner::Spawn(const glm::ivec3 &chunk, const glm::vec3 &pos) {
-       glm::vec3 color(rand() % 6, rand() % 6, rand() % 6);
-       color = color * 0.15f + 0.25f;
-
        glm::vec3 rot(0.000001f);
        rot.x *= (rand() % 1024);
        rot.y *= (rand() % 1024);
        rot.z *= (rand() % 1024);
 
        Entity &e = world.AddEntity();
-       e.Name("test");
+       e.Name("spawned");
        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, 2);
+       e.GetModel().SetNodeModel(&models[rand() % 14]);
        e.AngularVelocity(rot);
        Controller *ctrl;
        if (rand() % 2) {