special treatment for players

[blank.git] / src / world / World.hpp

diff --git a/src/world/World.hpp b/src/world/World.hpp
index 2c343dc7fd5a857e87c4705ee6ed1d972d311643..3981b28e336f9dcf8e28ee84411486d1e23121d2 100644 (file)
--- a/src/world/World.hpp
+++ b/src/world/World.hpp
@@ -1,12 +1,9 @@
 #ifndef BLANK_WORLD_WORLD_HPP_
 #define BLANK_WORLD_WORLD_HPP_
 
-#include "BlockTypeRegistry.hpp"
 #include "ChunkLoader.hpp"
 #include "Entity.hpp"
 #include "Generator.hpp"
-#include "../graphics/ArrayTexture.hpp"
-#include "../model/shapes.hpp"
 
 #include <list>
 #include <vector>
@@ -15,7 +12,8 @@
 
 namespace blank {
 
-class Assets;
+class BlockTypeRegistry;
+class EntityCollision;
 class Viewport;
 class WorldCollision;
 
@@ -37,44 +35,55 @@ public:
                ChunkLoader::Config load = ChunkLoader::Config();
        };
 
-       World(const Assets &, const Config &, const WorldSave &);
+       World(const BlockTypeRegistry &, const Config &, const WorldSave &);
 
+       /// check if this ray hits a block
+       /// depth in the collision is the distance between the ray's
+       /// origin and the intersection point
+       /// M is the global transform for given reference chunk
        bool Intersection(
                const Ray &,
                const glm::mat4 &M,
-               Chunk *&chunk,
-               int &blkid,
-               float &dist,
-               glm::vec3 &normal);
+               const Chunk::Pos &reference,
+               WorldCollision &);
 
+       /// check if this ray hits an entity
+       /// intersections with the reference are not tested
+       /// M is the global transform for the chunk of given reference entity
+       bool Intersection(
+               const Ray &,
+               const glm::mat4 &M,
+               const Entity &reference,
+               EntityCollision &);
+
+       /// check if given entity intersects with the world
        bool Intersection(const Entity &e, std::vector<WorldCollision> &);
        void Resolve(Entity &e, std::vector<WorldCollision> &);
 
-       BlockTypeRegistry &BlockTypes() noexcept { return blockType; }
+       const BlockTypeRegistry &BlockTypes() noexcept { return block_type; }
        ChunkLoader &Loader() noexcept { return chunks; }
 
-       Entity &Player() { return *player; }
+       /// add player with given name
+       /// returns nullptr if the name is already taken
+       Entity *AddPlayer(const std::string &name);
        Entity &AddEntity() { entities.emplace_back(); return entities.back(); }
 
-       Chunk &PlayerChunk();
-       Chunk &Next(const Chunk &to, const glm::ivec3 &dir);
+       const std::vector<Entity *> &Players() const noexcept { return players; }
+       const std::list<Entity> &Entities() const noexcept { return entities; }
 
        void Update(int dt);
 
        void Render(Viewport &);
 
 private:
-       BlockTypeRegistry blockType;
-       CuboidShape blockShape;
-       StairShape stairShape;
-       CuboidShape slabShape;
+       Config config;
 
-       ArrayTexture block_tex;
+       const BlockTypeRegistry &block_type;
 
        Generator generate;
        ChunkLoader chunks;
 
-       Entity *player;
+       std::vector<Entity *> players;
        std::list<Entity> entities;
 
        glm::vec3 light_direction;