only do collisions on entities moving toward each other

ZappoMan committed 12 years ago

Commit 9cc1fe31 parent 2cfa14d1 file · +1 −1Browse files

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

Unified · Split

libraries/entities/src/EntityCollisionSystem.cpp+1−1

@@ -116,7 +116,7 @@ void EntityCollisionSystem::updateCollisionWithEntities(EntityItem* entityA) { · 115 unmodified lines
116	glm::vec3 relativeVelocity = entityA->getVelocity() - entityB->getVelocity();	116	glm::vec3 relativeVelocity = entityA->getVelocity() - entityB->getVelocity();
117		117
118	bool movingTowardEachOther = glm::dot(relativeVelocity, penetrationInTreeUnits) > 0.0f;	118	bool movingTowardEachOther = glm::dot(relativeVelocity, penetrationInTreeUnits) > 0.0f;
119	bool doCollisions = true;	119	bool doCollisions = movingTowardEachOther; // don't do collisions if the entities are moving away from each other
120		120
121	if (doCollisions) {	121	if (doCollisions) {
122	quint64 now = usecTimestampNow();	122	quint64 now = usecTimestampNow();