From c880f00a1441330fa7dfea10ff1c6450936e805c Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Thu, 25 Sep 2014 14:54:06 -0700 Subject: [PATCH] make sure to scale default octree shape collision to meters --- libraries/octree/src/OctreeElement.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/libraries/octree/src/OctreeElement.cpp b/libraries/octree/src/OctreeElement.cpp index 61187dea03..271e885d17 100644 --- a/libraries/octree/src/OctreeElement.cpp +++ b/libraries/octree/src/OctreeElement.cpp @@ -1373,6 +1373,7 @@ bool OctreeElement::findSpherePenetration(const glm::vec3& center, float radius, bool OctreeElement::findShapeCollisions(const Shape* shape, CollisionList& collisions) const { AACube cube = getAACube(); + cube.scale(TREE_SCALE); return ShapeCollider::collideShapeWithAACubeLegacy(shape, cube.calcCenter(), cube.getScale(), collisions); }