Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-23 21:05:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

use glm::modf() for less code

Browse source
This commit is contained in:
Andrew Meadows 2014-04-22 14:26:52 -07:00
parent 364431328f
commit f3fd81ca59
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libraries/shared/src/ShapeCollider.cpp
View file

@ -607,10 +607,9 @@ bool sphereAACube(const glm::vec3& sphereCenter, float sphereRadius, const glm::
CollisionInfo* collision = collisions.getNewCollision(); CollisionInfo* collision = collisions.getNewCollision();
if (collision) { if (collision) {
// penetration is parallel to box side direction // penetration is parallel to box side direction
BA /= maxBA;
glm::vec3 direction; glm::vec3 direction;
modff(BA.x/maxBA, &(direction.x)); glm::modf(BA, direction);
modff(BA.y/maxBA, &(direction.y));
modff(BA.z/maxBA, &(direction.z));
direction = glm::normalize(direction); direction = glm::normalize(direction);
collision->_penetration = glm::dot(surfaceAB, direction) * direction; collision->_penetration = glm::dot(surfaceAB, direction) * direction;
// contactPoint is on surface of A // contactPoint is on surface of A