BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

czdxvxdfvxvxvc

Browse Source
This commit is contained in:
verysecrethero
2015-12-02 16:26:30 +01:00
parent c840183467
commit af294f78b7
2 changed files with 67 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Engine/Core/Collision.cpp
+7 -9
View File
@@ -40,15 +40,13 @@ bool RayAABBIntr(const Ray& ray, const AABB& box)
bool RayVsAABB(const Ray& ray, const AABB& box)
{
glm::vec3 invdir = 1.0f / ray.Direction;
glm::vec3 bMin = box.MinCorner();
glm::vec3 bMax = box.MaxCorner();
float t1 = (bMin.x - ray.Origin.x)*invdir.x;
float t2 = (bMax.x - ray.Origin.x)*invdir.x;
float t3 = (bMin.y - ray.Origin.y)*invdir.y;
float t4 = (bMax.y - ray.Origin.y)*invdir.y;
float t5 = (bMin.z - ray.Origin.z)*invdir.z;
float t6 = (bMax.z - ray.Origin.z)*invdir.z;
float t1 = (box.MinCorner().x - ray.Origin.x)*invdir.x;
float t2 = (box.MaxCorner().x - ray.Origin.x)*invdir.x;
float t3 = (box.MinCorner().y - ray.Origin.y)*invdir.y;
float t4 = (box.MaxCorner().y - ray.Origin.y)*invdir.y;
float t5 = (box.MinCorner().z - ray.Origin.z)*invdir.z;
float t6 = (box.MaxCorner().z - ray.Origin.z)*invdir.z;
float tmin = std::max(std::max(std::min(t1, t2), std::min(t3, t4)), std::min(t5, t6));
float tmax = std::min(std::min(std::max(t1, t2), std::max(t3, t4)), std::max(t5, t6));