X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fai%2FSpawner.cpp;h=13a8f52e6f44eb8be438faee0553d185da1af06f;hb=13e676a6e49128ebc6c63b8dd08bef51d360e8e9;hp=6a692b11077b47f3d7b871505d0ab2db0ab606d3;hpb=dbfcb12348b80e2582f710acb1e4ed0011889ba2;p=blank.git

diff --git a/src/ai/Spawner.cpp b/src/ai/Spawner.cpp
index 6a692b1..13a8f52 100644
--- a/src/ai/Spawner.cpp
+++ b/src/ai/Spawner.cpp
@@ -2,17 +2,20 @@
 
 #include "Chaser.hpp"
 #include "RandomWalk.hpp"
-#include "../model/shapes.hpp"
+#include "../model/CompositeModel.hpp"
+#include "../model/Skeletons.hpp"
 #include "../world/BlockLookup.hpp"
 #include "../world/BlockType.hpp"
+#include "../world/ChunkIndex.hpp"
 #include "../world/Entity.hpp"
 #include "../world/World.hpp"
 
 
 namespace blank {
 
-Spawner::Spawner(World &world, std::uint64_t seed)
+Spawner::Spawner(World &world, Skeletons &skeletons, std::uint64_t seed)
 : world(world)
+, skeletons(skeletons)
 , controllers()
 , random(seed)
 , timer(64)
@@ -20,37 +23,6 @@ Spawner::Spawner(World &world, std::uint64_t seed)
 , 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]);
-	}
-
 	timer.Start();
 }
 
@@ -80,11 +52,12 @@ void Spawner::CheckDespawn() noexcept {
 		if (e.Dead()) {
 			delete *iter;
 			iter = controllers.erase(iter);
+			end = controllers.end();
 			continue;
 		}
 		bool safe = false;
-		for (const Entity *ref : refs) {
-			glm::vec3 diff(ref->AbsoluteDifference(e));
+		for (const Player &ref : refs) {
+			glm::vec3 diff(ref.entity->AbsoluteDifference(e));
 			if (dot(diff, diff) < despawn_range) {
 				safe = true;
 				break;
@@ -94,6 +67,7 @@ void Spawner::CheckDespawn() noexcept {
 			e.Kill();
 			delete *iter;
 			iter = controllers.erase(iter);
+			end = controllers.end();
 		} else {
 			++iter;
 		}
@@ -106,13 +80,11 @@ void Spawner::TrySpawn() {
 	// select random player to punish
 	auto &players = world.Players();
 	if (players.size() == 0) return;
-	Entity &player = *players[random.Next<unsigned short>() % players.size()];
+	const Player &player = players[random.Next<unsigned short>() % players.size()];
 
-	glm::ivec3 chunk(
-		(random.Next<unsigned char>() % (chunk_range * 2 + 1)) - chunk_range,
-		(random.Next<unsigned char>() % (chunk_range * 2 + 1)) - chunk_range,
-		(random.Next<unsigned char>() % (chunk_range * 2 + 1)) - chunk_range
-	);
+	int index = random.Next<unsigned int>() % player.chunks->TotalChunks();
+
+	glm::ivec3 chunk(player.chunks->PositionOf(index));
 
 	glm::ivec3 pos(
 		random.Next<unsigned char>() % Chunk::width,
@@ -120,18 +92,15 @@ void Spawner::TrySpawn() {
 		random.Next<unsigned char>() % Chunk::depth
 	);
 
-
 	// distance check
-	glm::vec3 diff(glm::vec3(chunk * Chunk::Extent() - pos) + 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.Loader().Loaded(player.ChunkCoords()),
-		chunk * Chunk::Extent() + pos);
+	BlockLookup spawn_block((*player.chunks)[index], pos);
 	if (!spawn_block || spawn_block.GetType().collide_block) {
 		return;
 	}
@@ -141,7 +110,7 @@ void Spawner::TrySpawn() {
 		return;
 	}
 
-	Spawn(player, player.ChunkCoords() + chunk, glm::vec3(pos) + glm::vec3(0.5f));
+	Spawn(*player.entity, chunk, glm::vec3(pos) + glm::vec3(0.5f));
 }
 
 void Spawner::Spawn(Entity &reference, const glm::ivec3 &chunk, const glm::vec3 &pos) {
@@ -155,7 +124,7 @@ void Spawner::Spawn(Entity &reference, const glm::ivec3 &chunk, const glm::vec3
 	e.Position(chunk, pos);
 	e.Bounds({ { -0.5f, -0.5f, -0.5f }, { 0.5f, 0.5f, 0.5f } });
 	e.WorldCollidable(true);
-	skeletons[random.Next<unsigned char>() % 3].Instantiate(e.GetModel());
+	skeletons[random.Next<unsigned char>() % skeletons.Size()].Instantiate(e.GetModel());
 	e.AngularVelocity(rot);
 	Controller *ctrl;
 	if (random()) {