remove some warnings, thanks to Zenja http://bulletphysics.com/Bullet/phpBB3/viewtopic.php?f=9&t=4063
This commit is contained in:
@@ -2180,7 +2180,7 @@ void btSoftBody::updateClusters()
|
||||
{
|
||||
btSoftBody::Cluster& c=*m_clusters[i];
|
||||
const int n=c.m_nodes.size();
|
||||
const btScalar invn=1/(btScalar)n;
|
||||
//const btScalar invn=1/(btScalar)n;
|
||||
if(n)
|
||||
{
|
||||
/* Frame */
|
||||
@@ -2326,7 +2326,7 @@ void btSoftBody::applyClusters(bool drift)
|
||||
{
|
||||
BT_PROFILE("ApplyClusters");
|
||||
const btScalar f0=m_sst.sdt;
|
||||
const btScalar f1=f0/2;
|
||||
//const btScalar f1=f0/2;
|
||||
btAlignedObjectArray<btVector3> deltas;
|
||||
btAlignedObjectArray<btScalar> weights;
|
||||
deltas.resize(m_nodes.size(),btVector3(0,0,0));
|
||||
@@ -2780,7 +2780,7 @@ void btSoftBody::PSolve_Links(btSoftBody* psb,btScalar kst,btScalar ti)
|
||||
const btVector3 del=b.m_x-a.m_x;
|
||||
const btScalar len=del.length2();
|
||||
const btScalar k=((l.m_c1-len)/(l.m_c0*(l.m_c1+len)))*kst;
|
||||
const btScalar t=k*a.m_im;
|
||||
//const btScalar t=k*a.m_im;
|
||||
a.m_x-=del*(k*a.m_im);
|
||||
b.m_x+=del*(k*b.m_im);
|
||||
}
|
||||
|
||||
@@ -218,7 +218,7 @@ void btSoftBodyConcaveCollisionAlgorithm::processCollision (btCollisionObject* b
|
||||
{
|
||||
|
||||
|
||||
btCollisionObject* convexBody = m_isSwapped ? body1 : body0;
|
||||
//btCollisionObject* convexBody = m_isSwapped ? body1 : body0;
|
||||
btCollisionObject* triBody = m_isSwapped ? body0 : body1;
|
||||
|
||||
if (triBody->getCollisionShape()->isConcave())
|
||||
|
||||
@@ -371,7 +371,7 @@ void btSoftBodyHelpers::Draw( btSoftBody* psb,
|
||||
break;
|
||||
case btSoftBody::Joint::eType::Angular:
|
||||
{
|
||||
const btSoftBody::AJoint* pja=(const btSoftBody::AJoint*)pj;
|
||||
//const btSoftBody::AJoint* pja=(const btSoftBody::AJoint*)pj;
|
||||
const btVector3 o0=pj->m_bodies[0].xform().getOrigin();
|
||||
const btVector3 o1=pj->m_bodies[1].xform().getOrigin();
|
||||
const btVector3 a0=pj->m_bodies[0].xform().getBasis()*pj->m_refs[0];
|
||||
|
||||
Reference in New Issue
Block a user