X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fai%2FSpawner.cpp;h=064857cd6b51e9c53df88b1957d3a612bd9af9d3;hb=a26ca06878d45d3ce77cbc28b574f2553e121944;hp=fb2a1eafc46c69906826e98c91f0ed117eb70f97;hpb=41652fb3d73f12e6ae4ce7380244a75a4f5c6797;p=blank.git diff --git a/src/ai/Spawner.cpp b/src/ai/Spawner.cpp index fb2a1ea..064857c 100644 --- a/src/ai/Spawner.cpp +++ b/src/ai/Spawner.cpp @@ -2,57 +2,37 @@ #include "Chaser.hpp" #include "RandomWalk.hpp" -#include "../model/shapes.hpp" +#include "../app/TextureIndex.hpp" +#include "../model/Model.hpp" +#include "../model/Skeletons.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, std::uint64_t seed) +Spawner::Spawner(World &world, Skeletons &skeletons, GaloisLFSR &rand) : world(world) +, skeletons(skeletons) , controllers() -, random(seed) +, random(rand) , 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]); - } - +, chunk_range(4) +, skeletons_offset(0) +, skeletons_length(skeletons.size()) +, tex_map() { timer.Start(); - Spawn(world.Player().ChunkCoords(), { 0.5f, 0.5f, 0.5f }); } Spawner::~Spawner() { @@ -62,6 +42,21 @@ Spawner::~Spawner() { } +void Spawner::LimitSkeletons(size_t begin, size_t end) { + if (begin >= skeletons.size() || end > skeletons.size() || begin >= end) { + cout << "warning, skeleton limit out of bounds or invalid range given" << endl; + } else { + skeletons_offset = begin; + skeletons_length = end - begin; + } +} + +void Spawner::LoadTextures(TextureIndex &tex_index) { + tex_map.clear(); + tex_map.push_back(tex_index.GetID("rock-1")); + tex_map.push_back(tex_index.GetID("rock-face")); +} + void Spawner::Update(int dt) { CheckDespawn(); timer.Update(dt); @@ -75,19 +70,28 @@ void Spawner::Update(int dt) { void Spawner::CheckDespawn() noexcept { - const Entity &reference = world.Player(); + const auto &refs = world.Players(); for (auto iter = controllers.begin(), end = controllers.end(); iter != end;) { Entity &e = (*iter)->Controlled(); if (e.Dead()) { delete *iter; iter = controllers.erase(iter); + end = controllers.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 (dot(diff, diff) < despawn_range) { + safe = true; + break; + } + } + if (!safe) { e.Kill(); delete *iter; iter = controllers.erase(iter); + end = controllers.end(); } else { ++iter; } @@ -95,30 +99,27 @@ void Spawner::CheckDespawn() noexcept { } void Spawner::TrySpawn() { - if (controllers.size() >= max_entities) return; - - glm::ivec3 chunk( - (random.Next() % (chunk_range * 2 + 1)) - chunk_range, - (random.Next() % (chunk_range * 2 + 1)) - chunk_range, - (random.Next() % (chunk_range * 2 + 1)) - chunk_range - ); - - glm::ivec3 pos( - random.Next() % Chunk::width, - random.Next() % Chunk::height, - random.Next() % Chunk::depth - ); + if (controllers.size() >= max_entities || skeletons_length == 0) return; + + // select random player to punish + auto &players = world.Players(); + if (players.size() == 0) return; + size_t player_num = 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(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; } @@ -128,29 +129,36 @@ 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) { +void Spawner::Spawn(Entity &reference, const glm::ivec3 &chunk, const glm::vec3 &pos) { glm::vec3 rot(0.000001f); rot.x *= (random.Next() % 1024); rot.y *= (random.Next() % 1024); rot.z *= (random.Next() % 1024); 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[random.Next() % 3].Instantiate(e.GetModel()); + RandomSkeleton().Instantiate(e.GetModel()); + e.GetModel().SetTextures(tex_map); e.AngularVelocity(rot); Controller *ctrl; if (random()) { ctrl = new RandomWalk(e, random.Next()); + e.Name("walker"); } else { - ctrl = new Chaser(world, e, world.Player()); + ctrl = new Chaser(world, e, reference); + e.Name("chaser"); } controllers.emplace_back(ctrl); } +Model &Spawner::RandomSkeleton() noexcept { + std::size_t offset = (random.Next() % skeletons_length) + skeletons_offset; + return skeletons[offset]; +} + }