X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fai%2FSpawner.hpp;h=72d2ac136f84c6c7b3228465e3ac959106db5c2a;hb=c4416bc2a5e446d0ba99cfeb50bb5fab287a1c4e;hp=7b56130f5f090aba00cfe9426637b1aa7d7d4bab;hpb=2ea26d9ca5eaeae65daa0edbbaeada8c1f23670e;p=blank.git

diff --git a/src/ai/Spawner.hpp b/src/ai/Spawner.hpp
index 7b56130..72d2ac1 100644
--- a/src/ai/Spawner.hpp
+++ b/src/ai/Spawner.hpp
@@ -2,8 +2,6 @@
 #define BLANK_AI_SPAWNER_HPP_
 
 #include "../app/IntervalTimer.hpp"
-#include "../model/CompositeModel.hpp"
-#include "../model/EntityModel.hpp"
 
 #include <vector>
 #include <glm/glm.hpp>
@@ -11,35 +9,42 @@
 
 namespace blank {
 
-class Controller;
+class Entity;
+class Model;
+class ModelRegistry;
 class World;
 
 class Spawner {
 
 public:
-	explicit Spawner(World &);
+	Spawner(World &, ModelRegistry &);
 	~Spawner();
 
+	void LimitModels(std::size_t begin, std::size_t end);
+
 	void Update(int dt);
 
 private:
 	void CheckDespawn() noexcept;
 	void TrySpawn();
-	void Spawn(const glm::ivec3 &, const glm::vec3 &);
+	void Spawn(Entity &reference, const glm::ivec3 &, const glm::vec3 &);
+
+	Model &RandomModel() noexcept;
 
 private:
 	World &world;
-	std::vector<Controller *> controllers;
+	ModelRegistry &models;
+	std::vector<Entity *> entities;
 
-	EntityModel models[3];
-	CompositeModel skeletons[3];
-
-	IntervalTimer timer;
+	CoarseTimer timer;
 	float despawn_range;
 	float spawn_distance;
 	unsigned int max_entities;
 	int chunk_range;
 
+	std::size_t model_offset;
+	std::size_t model_length;
+
 };
 
 }