yade-dev team mailing list archive

Thread
Date

[svn] r1708 - trunk/pkg/common/Engine/StandAloneEngine

To: yade-dev@xxxxxxxxxxxxxxxxxxx
From: sega at BerliOS <sega@xxxxxxxxxxxxxxx>
Date: Tue, 3 Mar 2009 09:47:28 +0100

Author: sega
Date: 2009-03-03 09:47:27 +0100 (Tue, 03 Mar 2009)
New Revision: 1708

Modified:
   trunk/pkg/common/Engine/StandAloneEngine/PersistentSAPCollider.cpp
Log:
Fix typo in PersistentSAPCollider


Modified: trunk/pkg/common/Engine/StandAloneEngine/PersistentSAPCollider.cpp
===================================================================
--- trunk/pkg/common/Engine/StandAloneEngine/PersistentSAPCollider.cpp	2009-03-01 20:52:50 UTC (rev 1707)
+++ trunk/pkg/common/Engine/StandAloneEngine/PersistentSAPCollider.cpp	2009-03-03 08:47:27 UTC (rev 1708)
@@ -217,7 +217,7 @@
 	int offset1=3*id1, offset2=3*id2;
 	const shared_ptr<Body>& b1(Body::byId(body_id_t(id1),rootBody)), b2(Body::byId(body_id_t(id2),rootBody));
 	bool overlap =
-		Collider::mayCollide(b1.get(),b2.get());
+		Collider::mayCollide(b1.get(),b2.get()) &&
 		// AABB collisions: 
 		!(
 			maxima[offset1  ]<minima[offset2  ] || maxima[offset2  ]<minima[offset1  ] ||