diff options
author | Andy Belle-Isle <drumsetmonkey@gmail.com> | 2019-10-09 02:40:20 -0400 |
---|---|---|
committer | Andy Belle-Isle <drumsetmonkey@gmail.com> | 2019-10-09 02:40:20 -0400 |
commit | f8b062e3fe43ece368c99d1083a929de92b7cff2 (patch) | |
tree | ad6d5d85a0190165f100e505f259a8b4d5aa4915 /src/world.hpp | |
parent | a422f32613441b5313e4a3bb0fab61f8cb87914c (diff) |
Started more advanced collision detetction
Diffstat (limited to 'src/world.hpp')
-rw-r--r-- | src/world.hpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/world.hpp b/src/world.hpp index 0c1275e..2d11706 100644 --- a/src/world.hpp +++ b/src/world.hpp @@ -128,8 +128,10 @@ private: std::vector<std::shared_ptr<SolidLayer>> solidLayers; std::vector<std::shared_ptr<Layer>> drawLayers; - std::vector<std::pair<glm::vec2, glm::vec2>> - getIntersectingPlanes(glm::vec2 origin, glm::vec2 dir); + std::vector<glm::vec3> + getIntersectingPlanes(glm::vec3 origin, Physics &phys); + + bool isSolid(glm::vec3 pos); protected: // RENDER |