Changed some files so it works with the changes in master. (weaponsystem,capturepoint,some tests)

This commit is contained in:
verysecrethero
2016-01-21 17:36:47 +01:00
parent 4d60f387ed
commit deb6ff1b16
5 changed files with 10 additions and 11 deletions
+1 -2
View File
@@ -52,8 +52,7 @@ void RegionTestOld(Tree& tree)
template<typename Tree>
void RegionTest(Tree& tree)
{
AABB aabb;
aabb.CreateFromCenter(glm::vec3(rand() % LEVEL_BOUNDS, rand() % LEVEL_BOUNDS, rand() % LEVEL_BOUNDS),
AABB aabb = AABB::FromOriginSize(glm::vec3(rand() % LEVEL_BOUNDS, rand() % LEVEL_BOUNDS, rand() % LEVEL_BOUNDS),
glm::vec3(rand() % MAXSIZE, rand() % MAXSIZE, rand() % MAXSIZE));
std::vector<AABB> outVec;
tree.ObjectsInSameRegion(aabb, outVec);