allow multiple meshes per entity

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

diff --git a/src/ai/Spawner.cpp b/src/ai/Spawner.cpp
index 8a3e75e3db737abbea177f5fba71da66b39eb1f7..e5bc68f9d97461d2396de2076b338f025c0d967e 100644 (file)
--- a/src/ai/Spawner.cpp
+++ b/src/ai/Spawner.cpp
@@ -18,6 +18,13 @@ Spawner::Spawner(World &world)
 , 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 });
 }
@@ -59,13 +66,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
@@ -91,27 +98,24 @@ void Spawner::TrySpawn() {
        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 }));
+       e.GetModel().SetNodeModel(&models[rand() % 14]);
+       e.AngularVelocity(rot);
        Controller *ctrl;
        if (rand() % 2) {
                ctrl = new RandomWalk(e);
        } else {
-               ctrl = new Chaser(e, world.Player());
+               ctrl = new Chaser(world, e, world.Player());
        }
        controllers.emplace_back(ctrl);
 }