------------------------------------------------------------------------
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);
}
_______________________________________________
Mailing list: https://launchpad.net/~yade-dev
Post to : [email protected]
Unsubscribe : https://launchpad.net/~yade-dev
More help : https://help.launchpad.net/ListHelp
