Merge branch 'OctTree' of github.com:teamfisk/TacticalZ into OctTree

# Conflicts: # include/Engine/Core/Collision.h # src/Engine/Core/Collision.cpp
2015-12-03 17:11:35 +01:00
parent 2f13f5da7a 464650c370
commit abb61d2cd6
9 changed files with 587 additions and 25 deletions
@@ -3,12 +3,13 @@

 #include "Core/Ray.h"
 #include "Core/AABB.h"
+#include <algorithm>

 namespace Collision
 {

 bool RayAABBIntr(const Ray& ray, const AABB& box);
-
+bool RayVsAABB(const Ray& ray, const AABB& box);
 }

 #endif