X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fworld%2FWorld.hpp;h=10710fbd6667a2dc8ac957d8068dae4564a392ab;hb=12744a2f68b3c9496076d6d7b6fb3581ff78472a;hp=183fa603209af587d23d18f8f2b0e40c0a98d177;hpb=32909aa3224ec0ed5656721178eb6ad31cd047df;p=blank.git diff --git a/src/world/World.hpp b/src/world/World.hpp index 183fa60..10710fb 100644 --- a/src/world/World.hpp +++ b/src/world/World.hpp @@ -14,8 +14,7 @@ namespace blank { -class BlockLighting; -class DirectionalLighting; +class Viewport; class WorldCollision; class World { @@ -47,7 +46,7 @@ public: glm::vec3 &normal); bool Intersection(const Entity &e, std::vector &); - void Resolve(const Entity &e, std::vector &); + void Resolve(Entity &e, std::vector &); BlockTypeRegistry &BlockTypes() { return blockType; } @@ -59,7 +58,7 @@ public: void Update(int dt); - void Render(BlockLighting &, DirectionalLighting &); + void Render(Viewport &); private: BlockTypeRegistry blockType;