glm backwards compatibility

[blank.git] / src / ai / Spawner.hpp

diff --git a/src/ai/Spawner.hpp b/src/ai/Spawner.hpp
index 6591ef93d3a519648203526276608f437e0cd6ee..daa5f7873390b41de1d9be6db9f2f395d8b87fe3 100644 (file)
--- a/src/ai/Spawner.hpp
+++ b/src/ai/Spawner.hpp
@@ -2,29 +2,25 @@
 #define BLANK_AI_SPAWNER_HPP_
 
 #include "../app/IntervalTimer.hpp"
+#include "../graphics/glm.hpp"
 
 #include <vector>
-#include <glm/glm.hpp>
 
 
 namespace blank {
 
-class Controller;
 class Entity;
-class GaloisLFSR;
 class Model;
-class Skeletons;
-class TextureIndex;
+class ModelRegistry;
 class World;
 
 class Spawner {
 
 public:
-       Spawner(World &, Skeletons &, GaloisLFSR &);
+       Spawner(World &, ModelRegistry &);
        ~Spawner();
 
-       void LimitSkeletons(std::size_t begin, std::size_t end);
-       void LoadTextures(TextureIndex &);
+       void LimitModels(std::size_t begin, std::size_t end);
 
        void Update(int dt);
 
@@ -33,25 +29,21 @@ private:
        void TrySpawn();
        void Spawn(Entity &reference, const glm::ivec3 &, const glm::vec3 &);
 
-       Model &RandomSkeleton() noexcept;
+       Model &RandomModel() noexcept;
 
 private:
        World &world;
-       Skeletons &skeletons;
-       std::vector<Controller *> controllers;
+       ModelRegistry &models;
+       std::vector<Entity *> entities;
 
-       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::vector<float> tex_map;
+       std::size_t model_offset;
+       std::size_t model_length;
 
 };