X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fai%2FSpawner.cpp;h=7b6e4b2e8b730cb31ca91f133d9010e5e3caeca8;hb=33b37e7242e4cbfa76e4a0d6e5bb54223b541162;hp=946e3519c3fb359d8d6bba766c36d42adb4440df;hpb=b066e776622f96e906600a0c4a08de392bd03676;p=blank.git

diff --git a/src/ai/Spawner.cpp b/src/ai/Spawner.cpp
index 946e351..7b6e4b2 100644
--- a/src/ai/Spawner.cpp
+++ b/src/ai/Spawner.cpp
@@ -2,8 +2,9 @@
 
 #include "Chaser.hpp"
 #include "RandomWalk.hpp"
-#include "../model/CompositeModel.hpp"
-#include "../model/Skeletons.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"
@@ -17,18 +18,18 @@ using namespace std;
 
 namespace blank {
 
-Spawner::Spawner(World &world, Skeletons &skeletons, uint64_t seed)
+Spawner::Spawner(World &world, ModelRegistry &models, GaloisLFSR &rand)
 : world(world)
-, skeletons(skeletons)
+, models(models)
 , controllers()
-, random(seed)
+, random(rand)
 , timer(64)
 , despawn_range(128 * 128)
 , spawn_distance(16 * 16)
 , max_entities(16)
 , chunk_range(4)
-, skeletons_offset(0)
-, skeletons_length(skeletons.Size()) {
+, model_offset(0)
+, model_length(models.size()) {
 	timer.Start();
 }
 
@@ -39,12 +40,12 @@ 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;
+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 {
-		skeletons_offset = begin;
-		skeletons_length = end - begin;
+		model_offset = begin;
+		model_length = end - begin;
 	}
 }
 
@@ -90,7 +91,7 @@ void Spawner::CheckDespawn() noexcept {
 }
 
 void Spawner::TrySpawn() {
-	if (controllers.size() >= max_entities || skeletons_length == 0) return;
+	if (controllers.size() >= max_entities || model_length == 0) return;
 
 	// select random player to punish
 	auto &players = world.Players();
@@ -101,15 +102,7 @@ void Spawner::TrySpawn() {
 	}
 	const Player &player = *i;
 
-	int index = random.Next<unsigned int>() % player.GetChunks().TotalChunks();
-
-	glm::ivec3 chunk(player.GetChunks().PositionOf(index));
-
-	glm::ivec3 pos(
-		random.Next<unsigned char>() % Chunk::width,
-		random.Next<unsigned char>() % Chunk::height,
-		random.Next<unsigned char>() % Chunk::depth
-	);
+	BlockLookup spawn_block(player.GetChunks().RandomBlock(random));
 
 	// distance check
 	//glm::vec3 diff(glm::vec3(chunk * Chunk::Extent() - pos) + player.entity->Position());
@@ -119,7 +112,6 @@ void Spawner::TrySpawn() {
 	//}
 
 	// check if the spawn block and the one above it are loaded and inhabitable
-	BlockLookup spawn_block(player.GetChunks()[index], pos);
 	if (!spawn_block || spawn_block.GetType().collide_block) {
 		return;
 	}
@@ -129,21 +121,15 @@ void Spawner::TrySpawn() {
 		return;
 	}
 
-	Spawn(player.GetEntity(), chunk, glm::vec3(pos) + glm::vec3(0.5f));
+	Spawn(player.GetEntity(), spawn_block.GetChunk().Position(), spawn_block.GetBlockCoords());
 }
 
 void Spawner::Spawn(Entity &reference, const glm::ivec3 &chunk, const glm::vec3 &pos) {
-	glm::vec3 rot(0.000001f);
-	rot.x *= (random.Next<unsigned short>() % 1024);
-	rot.y *= (random.Next<unsigned short>() % 1024);
-	rot.z *= (random.Next<unsigned short>() % 1024);
-
 	Entity &e = world.AddEntity();
 	e.Position(chunk, pos);
 	e.Bounds({ { -0.5f, -0.5f, -0.5f }, { 0.5f, 0.5f, 0.5f } });
 	e.WorldCollidable(true);
-	RandomSkeleton().Instantiate(e.GetModel());
-	e.AngularVelocity(rot);
+	RandomModel().Instantiate(e.GetModel());
 	Controller *ctrl;
 	if (random()) {
 		ctrl = new RandomWalk(e, random.Next<std::uint64_t>());
@@ -155,9 +141,9 @@ void Spawner::Spawn(Entity &reference, const glm::ivec3 &chunk, const glm::vec3
 	controllers.emplace_back(ctrl);
 }
 
-CompositeModel &Spawner::RandomSkeleton() noexcept {
-	std::size_t offset = (random.Next<std::size_t>() % skeletons_length) + skeletons_offset;
-	return skeletons[offset];
+Model &Spawner::RandomModel() noexcept {
+	std::size_t offset = (random.Next<std::size_t>() % model_length) + model_offset;
+	return models[offset];
 }
 
 }