History

No more .f

Atlante45 committed 11 years ago

Commit ae3bcc81 parent c2adc6259 files · +278 −278Browse files

Showing the changes to libraries/entities/src/EntityCollisionSystem.cpp (1 of 59 files). Show all

Unified · Split

libraries/entities/src/EntityCollisionSystem.cpp+1−1
@@ -265,7 +265,7 @@ void EntityCollisionSystem::updateCollisionWithAvatars(EntityItem* entity) { · 264 unmodified lines
265265 collision->_addedVelocity /= (float)(TREE_SCALE);
266266 glm::vec3 relativeVelocity = collision->_addedVelocity - entity->getVelocity();
267267
268− if (glm::dot(relativeVelocity, collision->_penetration) <= 0.f) {
268+ if (glm::dot(relativeVelocity, collision->_penetration) <= 0.0f) {
269269 // only collide when Entity and collision point are moving toward each other
270270 // (doing this prevents some "collision snagging" when Entity penetrates the object)
271271 collision->_penetration /= (float)(TREE_SCALE);