yade-dev team mailing list archive

Thread
Date

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

To: yade-dev@xxxxxxxxxxxxxxxxxxx
From: eudoxos at BerliOS <eudoxos@xxxxxxxxxxxxxxx>
Date: Tue, 17 Feb 2009 21:49:03 +0100

Author: eudoxos
Date: 2009-02-17 21:49:02 +0100 (Tue, 17 Feb 2009)
New Revision: 1670

Modified:
   trunk/pkg/common/Engine/StandAloneEngine/PersistentSAPCollider.cpp
Log:
collider mistake hotfix


Modified: trunk/pkg/common/Engine/StandAloneEngine/PersistentSAPCollider.cpp
===================================================================
--- trunk/pkg/common/Engine/StandAloneEngine/PersistentSAPCollider.cpp	2009-02-17 20:47:59 UTC (rev 1669)
+++ trunk/pkg/common/Engine/StandAloneEngine/PersistentSAPCollider.cpp	2009-02-17 20:49:02 UTC (rev 1670)
@@ -191,8 +191,8 @@
 	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 =
-		// only collide if at least one of the bodies is not shadow
-		((!b1->isShadow()) || (!b2->isShadow())) &&
+		// NOT YET IMPLEMENTED: only collide if at least one of the bodies is not shadow
+		// ((!b1->isShadow()) || (!b2->isShadow())) &&
 		// only collide if at least one particle is standalone or they belong to different clumps
 		(b1->isStandalone() || b2->isStandalone() || b1->clumpId!=b2->clumpId ) &&
 		 // do not collide clumps, since they are just containers, never interact