X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fai%2FSpawner.cpp;h=2c5a94ca117e0d4c94175d4484a0eddeaef11f82;hb=dcd54cacda98c2c0f7cf0c7a9131fb858d8ee10a;hp=1120b5b320c5987d415243314d3c58cf7c33ce37;hpb=2ea26d9ca5eaeae65daa0edbbaeada8c1f23670e;p=blank.git diff --git a/src/ai/Spawner.cpp b/src/ai/Spawner.cpp index 1120b5b..2c5a94c 100644 --- a/src/ai/Spawner.cpp +++ b/src/ai/Spawner.cpp @@ -1,92 +1,85 @@ #include "Spawner.hpp" -#include "Chaser.hpp" -#include "RandomWalk.hpp" -#include "../model/shapes.hpp" +#include "AIController.hpp" + +#include "../model/Model.hpp" +#include "../model/ModelRegistry.hpp" +#include "../rand/GaloisLFSR.hpp" #include "../world/BlockLookup.hpp" #include "../world/BlockType.hpp" +#include "../world/ChunkIndex.hpp" #include "../world/Entity.hpp" #include "../world/World.hpp" +#include + +using namespace std; + namespace blank { -Spawner::Spawner(World &world) +Spawner::Spawner(World &world, ModelRegistry &models) : world(world) -, controllers() +, models(models) +, entities() , timer(64) , despawn_range(128 * 128) , spawn_distance(16 * 16) -, max_entities(16) -, chunk_range(4) { - EntityModel::Buffer buf; - { - AABB bounds{{ -0.25f, -0.5f, -0.25f }, { 0.25f, 0.5f, 0.25f }}; - CuboidShape shape(bounds); - shape.Vertices(buf, 1.0f); - buf.colors.resize(shape.VertexCount(), { 1.0f, 1.0f, 0.0f }); - models[0].Update(buf); - skeletons[0].Bounds(bounds); - skeletons[0].SetNodeModel(&models[0]); - } - { - AABB bounds{{ -0.5f, -0.25f, -0.5f }, { 0.5f, 0.25f, 0.5f }}; - CuboidShape shape(bounds); - buf.Clear(); - shape.Vertices(buf, 2.0f); - buf.colors.resize(shape.VertexCount(), { 0.0f, 1.0f, 1.0f }); - models[1].Update(buf); - skeletons[1].Bounds(bounds); - skeletons[1].SetNodeModel(&models[1]); - } - { - AABB bounds{{ -0.5f, -0.5f, -0.5f }, { 0.5f, 0.5f, 0.5f }}; - StairShape shape(bounds, { 0.4f, 0.4f }); - buf.Clear(); - shape.Vertices(buf, 3.0f); - buf.colors.resize(shape.VertexCount(), { 1.0f, 0.0f, 1.0f }); - models[2].Update(buf); - skeletons[2].Bounds(bounds); - skeletons[2].SetNodeModel(&models[2]); - } - +, max_entities(32) +, chunk_range(4) +, model_offset(0) +, model_length(models.size()) { timer.Start(); - Spawn(world.Player().ChunkCoords(), { 0.5f, 0.5f, 0.5f }); } Spawner::~Spawner() { - for (auto &ctrl : controllers) { - delete ctrl; + for (Entity *e : entities) { + e->UnRef(); } } +void Spawner::LimitModels(size_t begin, size_t end) { + if (begin >= models.size() || end > models.size() || begin >= end) { + cout << "warning, models limit out of bounds or invalid range given" << endl; + } else { + model_offset = begin; + model_length = end - begin; + } +} + void Spawner::Update(int dt) { CheckDespawn(); timer.Update(dt); if (timer.Hit()) { TrySpawn(); } - for (auto &ctrl : controllers) { - ctrl->Update(dt); - } } void Spawner::CheckDespawn() noexcept { - const Entity &reference = world.Player(); - for (auto iter = controllers.begin(), end = controllers.end(); iter != end;) { - Entity &e = (*iter)->Controlled(); + const auto &refs = world.Players(); + for (auto iter = entities.begin(), end = entities.end(); iter != end;) { + Entity &e = (**iter); if (e.Dead()) { - delete *iter; - iter = controllers.erase(iter); + e.UnRef(); + iter = entities.erase(iter); + end = entities.end(); continue; } - glm::vec3 diff(reference.AbsoluteDifference(e)); - if (dot(diff, diff) > despawn_range) { + bool safe = false; + for (const Player &ref : refs) { + glm::vec3 diff(ref.GetEntity().AbsoluteDifference(e)); + if (glm::length2(diff) < despawn_range) { + safe = true; + break; + } + } + if (!safe) { e.Kill(); - delete *iter; - iter = controllers.erase(iter); + e.UnRef(); + iter = entities.erase(iter); + end = entities.end(); } else { ++iter; } @@ -94,30 +87,27 @@ void Spawner::CheckDespawn() noexcept { } void Spawner::TrySpawn() { - if (controllers.size() >= max_entities) return; - - 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::ivec3 pos( - rand() % Chunk::width, - rand() % Chunk::height, - rand() % Chunk::depth - ); + 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 = world.Random().Next() % 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(world.Random())); // distance check - glm::vec3 diff(glm::vec3(chunk * Chunk::Extent() - pos) + world.Player().Position()); - float dist = dot(diff, diff); - if (dist > despawn_range || dist < spawn_distance) { - return; - } + //glm::vec3 diff(glm::vec3(chunk * Chunk::Extent() - pos) + player.entity->Position()); + //float dist = dot(diff, diff); + //if (dist > despawn_range || dist < spawn_distance) { + // return; + //} // 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; } @@ -127,29 +117,24 @@ void Spawner::TrySpawn() { return; } - Spawn(world.Player().ChunkCoords() + chunk, glm::vec3(pos) + glm::vec3(0.5f)); + Spawn(player.GetEntity(), spawn_block.GetChunk().Position(), spawn_block.GetBlockCoords()); } -void Spawner::Spawn(const glm::ivec3 &chunk, const glm::vec3 &pos) { - glm::vec3 rot(0.000001f); - rot.x *= (rand() % 1024); - rot.y *= (rand() % 1024); - rot.z *= (rand() % 1024); - +void Spawner::Spawn(Entity &reference, const glm::ivec3 &chunk, const glm::vec3 &pos) { Entity &e = world.AddEntity(); - e.Name("spawned"); e.Position(chunk, pos); e.Bounds({ { -0.5f, -0.5f, -0.5f }, { 0.5f, 0.5f, 0.5f } }); e.WorldCollidable(true); - skeletons[rand() % 3].Instantiate(e.GetModel()); - e.AngularVelocity(rot); - Controller *ctrl; - if (rand() % 2) { - ctrl = new RandomWalk(e); - } else { - ctrl = new Chaser(world, e, world.Player()); - } - controllers.emplace_back(ctrl); + RandomModel().Instantiate(e.GetModel()); + e.SetController(new AIController(world, e)); + e.Name("spawned"); + e.Ref(); + entities.emplace_back(&e); +} + +Model &Spawner::RandomModel() noexcept { + std::size_t offset = (world.Random().Next() % model_length) + model_offset; + return models[offset]; } }