yade-dev team mailing list archive

Thread
Date

[svn] r1465 - eudoxos

To: yade-dev@xxxxxxxxxxxxxxxxxxx
From: Janek Kozicki <janek_listy@xxxxx>
Date: Wed, 20 Aug 2008 12:02:00 +0200
Face: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwBAMAAAClLOS0AAAALVBMVEUBAQEtLS1KSkpRUVFXV1dYWFhjY2Nzc3N3d3eHh4eKioqdnZ24uLjLy8vc3NxVIagyAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH2AIVEzgS1fgQtQAAAjRJREFUOMtt1DFv00AUAOAzFQNbjigSyoQaRaBMhKgLUyKXpVNNeUpk9vyDqFJhQ1kiBuaqAwJCqvPtSLY7RlTn5+5IdnYkkt/AOyfxXVLe5vf53Z1875kd34tOEax8djmj6GyjhB5bxz50GdsVZr9fqRjZwAtKOJw5Wqs2MMZ16ALHsaDncF7xAHix1oEFHAB8f+pRjcO4gfZDykcYzbiucRolOLUJ6kjA0xtVt+A6TySlM0RajIpK6DzwKZ/nOYbF/gclHMo1ZOHYY/+Ha+AWuM+3oMS4eeqYzZ8FiCltgUqI8cd2wwAVpJk+8LWYjBtnJdQpHQqJMd4Oxt4bU9ESiFGc5hkqaH74asAX4iabP5I5gZ+qjgGlJCqZa3h3lxhoeVcSE1qLQC4sqKOK9MGW9E3izFqqHokoztLFEgXg31sbZEKnWi2T74A4NxfVQqlkjKtcAWD+zcArFEES01dR0E/nnV0IgugmDd/2L84sOAouRBBHEc7gtc8teDkRlE0iNQPo2w3Xhh/D4TCIQ4LRLoTvgwjj6RRgavdurxYGMaIuGOyAW/PpNlCcU9/93AHenAWYjPoAwa+G3e3to/MgFNTAEKvKDjzuCzHTnY3qqdXtx24VijzQfZ0yewZ5cwRFQaa+mIYr1uI0I76+3W4xhlvoVRwOA0Fdl64HlJnxP6T8YpX/Lga4Wv4A3ErrU5oTfN7Mu/llXMl8RXEPji/lQkN3H7qXqgC2By47EXeU/7PJ/wPxRKMnuZwIeAAAAABJRU5ErkJggg==

------------------------------------------------------------------------
r1465 | eudoxos | 2008-08-12 19:28:08 +0200 (wto, 12 sie 2008) | 2 lines
Changed paths:
   M /trunk/extra/Brefcom.cpp
   M /trunk/pkg/common/RenderingEngine/OpenGLRenderingEngine/OpenGLRenderingEngine.cpp

1. Fix a typo causing crash in the renderer.

------------------------------------------------------------------------
Index: pkg/common/RenderingEngine/OpenGLRenderingEngine/OpenGLRenderingEngine.cpp
===================================================================
--- pkg/common/RenderingEngine/OpenGLRenderingEngine/OpenGLRenderingEngine.cpp	(revision 1464)
+++ pkg/common/RenderingEngine/OpenGLRenderingEngine/OpenGLRenderingEngine.cpp	(revision 1465)
@@ -388,7 +388,7 @@
 	{
 		boost::mutex::scoped_lock lock(rootBody->persistentInteractions->drawloopmutex);
 		FOREACH(const shared_ptr<Interaction>& I, *rootBody->persistentInteractions){
-			if(!I->interactionGeometry) continue;
+			if(!I->interactionPhysics) continue;
 			const shared_ptr<Body>& b1=Body::byId(I->getId1(),rootBody), b2=Body::byId(I->getId2(),rootBody);
 			if(!(b1->physicalParameters->isDisplayed||b2->physicalParameters->isDisplayed)) continue;
 			glPushMatrix(); interactionPhysicsDispatcher(I->interactionPhysics,I,b1,b2,Interaction_wire); glPopMatrix();
@@ -397,8 +397,9 @@
 	{
 		boost::mutex::scoped_lock lock(rootBody->transientInteractions->drawloopmutex);
 		FOREACH(const shared_ptr<Interaction>& I, *rootBody->transientInteractions){
-			if(!I->interactionGeometry) continue;
+			if(!I->interactionPhysics) continue;
 			const shared_ptr<Body>& b1=Body::byId(I->getId1(),rootBody), b2=Body::byId(I->getId2(),rootBody);
+			//if(!b1->physicalParameters||!b2->physicalParameters) continue;
 			if(!(b1->physicalParameters->isDisplayed||b2->physicalParameters->isDisplayed)) continue;
 			glPushMatrix(); interactionPhysicsDispatcher(I->interactionPhysics,I,b1,b2,Interaction_wire); glPopMatrix();
 		}
Index: extra/Brefcom.cpp
===================================================================
--- extra/Brefcom.cpp	(revision 1464)
+++ extra/Brefcom.cpp	(revision 1465)
@@ -302,10 +302,10 @@
 	} */
 	Vector3r lineColor(BC->omega,1-BC->omega,0.0); /* damaged links red, undamaged green */
 
-	Real epsTransNegAbs=-max(0.,BC->epsTrans);
 	if(colorStrain) lineColor=Vector3r(
-		min(1.,max(0.,abs(BC->epsTrans)/BC->epsCrackOnset-1)),
-		min(1.,epsTransNegAbs/BC->epsCrackOnset),1);
+		min(1.,max(0.,-BC->epsTrans/BC->epsCrackOnset)),
+		min(1.,max(0.,BC->epsTrans/BC->epsCrackOnset)),
+		min(1.,max(0.,abs(BC->epsTrans)/BC->epsCrackOnset-1)));
 
 	if(contactLine) Shop::GLDrawLine(b1->physicalParameters->dispSe3.position,b2->physicalParameters->dispSe3.position,lineColor);
 	if(dmgLabel){ Shop::GLDrawNum(BC->omega,0.5*(b1->physicalParameters->dispSe3.position+b2->physicalParameters->dispSe3.position),lineColor); }