Skip to content

Commit e5a0f50

Browse files
committed
Ghost objects may be causing the control issue.
1 parent 89a50f7 commit e5a0f50

File tree

1 file changed

+26
-26
lines changed

1 file changed

+26
-26
lines changed

ambf_framework/afFramework.cpp

+26-26
Original file line numberDiff line numberDiff line change
@@ -8071,41 +8071,41 @@ void afGhostObject::update(double dt)
80718071

80728072
delete manifoldArray;
80738073

8074-
for (int i = 0 ; i < m_sensedBodies.size() ; i++){
8075-
m_sensedBodies[i]->setGravity(m_afWorld->m_bulletWorld->getGravity());
8076-
m_sensedBodies[i]->applyCentralForce(btVector3(0, 0, 0));
8077-
m_sensedBodies[i]->applyTorque(btVector3(0, 0, 0));
8078-
}
8074+
// for (int i = 0 ; i < m_sensedBodies.size() ; i++){
8075+
// m_sensedBodies[i]->setGravity(m_afWorld->m_bulletWorld->getGravity());
8076+
// m_sensedBodies[i]->applyCentralForce(btVector3(0, 0, 0));
8077+
// m_sensedBodies[i]->applyTorque(btVector3(0, 0, 0));
8078+
// }
80798079

80808080
m_sensedBodies.clear();
80818081
m_sensedBodies = localSensedBodies;
80828082

80838083

8084-
for (int i = 0 ; i < m_sensedBodies.size() ; i++){
8085-
if (m_sensedBodies[i]){
8086-
m_sensedBodies[i]->setGravity(btVector3(0, 0, 0));
8087-
double damping_factor = 1.0 - 0.1;
8088-
btVector3 va(0, 0, 0);
8089-
if (getParentObject()){
8090-
afRigidBodyPtr parentBody = dynamic_cast<afRigidBodyPtr>(getParentObject());
8091-
va = parentBody->m_bulletRigidBody->getLinearVelocity();
8092-
}
8084+
// for (int i = 0 ; i < m_sensedBodies.size() ; i++){
8085+
// if (m_sensedBodies[i]){
8086+
// m_sensedBodies[i]->setGravity(btVector3(0, 0, 0));
8087+
// double damping_factor = 1.0 - 0.1;
8088+
// btVector3 va(0, 0, 0);
8089+
// if (getParentObject()){
8090+
// afRigidBodyPtr parentBody = dynamic_cast<afRigidBodyPtr>(getParentObject());
8091+
// va = parentBody->m_bulletRigidBody->getLinearVelocity();
8092+
// }
80938093

8094-
btVector3 vb = m_sensedBodies[i]->getLinearVelocity();
8095-
double mag_va = va.length();
8096-
btVector3 proj_vb_va(0, 0, 0);
8094+
// btVector3 vb = m_sensedBodies[i]->getLinearVelocity();
8095+
// double mag_va = va.length();
8096+
// btVector3 proj_vb_va(0, 0, 0);
80978097

8098-
if (mag_va > 0.00001){
8099-
proj_vb_va = va.normalized() * (vb.dot(va) / mag_va);
8100-
}
8101-
btVector3 orth_vb_va = vb - proj_vb_va;
8098+
// if (mag_va > 0.00001){
8099+
// proj_vb_va = va.normalized() * (vb.dot(va) / mag_va);
8100+
// }
8101+
// btVector3 orth_vb_va = vb - proj_vb_va;
81028102

8103-
btVector3 wb = m_sensedBodies[i]->getAngularVelocity();
8103+
// btVector3 wb = m_sensedBodies[i]->getAngularVelocity();
81048104

8105-
m_sensedBodies[i]->setLinearVelocity(damping_factor * orth_vb_va + va);
8106-
m_sensedBodies[i]->setAngularVelocity(damping_factor * wb);
8107-
}
8108-
}
8105+
// m_sensedBodies[i]->setLinearVelocity(damping_factor * orth_vb_va + va);
8106+
// m_sensedBodies[i]->setAngularVelocity(damping_factor * wb);
8107+
// }
8108+
// }
81098109
}
81108110

81118111
bool afGhostObject::createFromAttribs(afGhostObjectAttributes *a_attribs)

0 commit comments

Comments
 (0)