X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fai%2FSpawner.hpp;h=f99029e28f7fdec7b1f08f34d4ef6ff9ef28d269;hb=fa3c4a14546d73ddc2671cd5cc58208839bf7173;hp=d0c6f97c4695cbdf9db26202c8e8b8be4bf176fb;hpb=8fdc24f0b3fb287f5d4e1c7d1f85ad85d5ed2414;p=blank.git

diff --git a/src/ai/Spawner.hpp b/src/ai/Spawner.hpp
index d0c6f97..f99029e 100644
--- a/src/ai/Spawner.hpp
+++ b/src/ai/Spawner.hpp
@@ -2,7 +2,6 @@
 #define BLANK_AI_SPAWNER_HPP_
 
 #include "../app/IntervalTimer.hpp"
-#include "../rand/GaloisLFSR.hpp"
 
 #include <vector>
 #include <glm/glm.hpp>
@@ -10,19 +9,19 @@
 
 namespace blank {
 
-class CompositeModel;
-class Controller;
 class Entity;
-class Skeletons;
+class GaloisLFSR;
+class Model;
+class ModelRegistry;
 class World;
 
 class Spawner {
 
 public:
-	Spawner(World &, Skeletons &, std::uint64_t seed);
+	Spawner(World &, ModelRegistry &, GaloisLFSR &);
 	~Spawner();
 
-	void LimitSkeletons(std::size_t begin, std::size_t end);
+	void LimitModels(std::size_t begin, std::size_t end);
 
 	void Update(int dt);
 
@@ -31,23 +30,23 @@ private:
 	void TrySpawn();
 	void Spawn(Entity &reference, const glm::ivec3 &, const glm::vec3 &);
 
-	CompositeModel &RandomSkeleton() noexcept;
+	Model &RandomModel() noexcept;
 
 private:
 	World &world;
-	Skeletons &skeletons;
-	std::vector<Controller *> controllers;
+	ModelRegistry &models;
+	std::vector<Entity *> entities;
 
-	GaloisLFSR random;
+	GaloisLFSR &random;
 
-	IntervalTimer timer;
+	CoarseTimer timer;
 	float despawn_range;
 	float spawn_distance;
 	unsigned int max_entities;
 	int chunk_range;
 
-	std::size_t skeletons_offset;
-	std::size_t skeletons_length;
+	std::size_t model_offset;
+	std::size_t model_length;
 
 };