Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 20:58:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

rename more shapeShape() to be collideShapes()

Browse source
This commit is contained in:
Andrew Meadows 2014-04-09 13:07:54 -07:00
parent f8e66b4e0d
commit e480064e66
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/src/renderer/Model.cpp
View file

@ -592,7 +592,7 @@ bool Model::findCollisions(const QVector<const Shape*> shapes, CollisionList& co
const Shape* theirShape = shapes[i]; const Shape* theirShape = shapes[i];
for (int j = 0; j < _jointShapes.size(); ++j) { for (int j = 0; j < _jointShapes.size(); ++j) {
const Shape* ourShape = _jointShapes[j]; const Shape* ourShape = _jointShapes[j];
if (ShapeCollider::shapeShape(theirShape, ourShape, collisions)) { if (ShapeCollider::collideShapes(theirShape, ourShape, collisions)) {
collided = true; collided = true;
} }
} }
@ -619,7 +619,7 @@ bool Model::findSphereCollisions(const glm::vec3& sphereCenter, float sphereRadi
} while (ancestorIndex != -1); } while (ancestorIndex != -1);
} }
} }
if (ShapeCollider::shapeShape(&sphere, _jointShapes[i], collisions)) { if (ShapeCollider::collideShapes(&sphere, _jointShapes[i], collisions)) {
CollisionInfo* collision = collisions.getLastCollision(); CollisionInfo* collision = collisions.getLastCollision();
collision->_type = MODEL_COLLISION; collision->_type = MODEL_COLLISION;
collision->_data = (void*)(this); collision->_data = (void*)(this);