AnotherFoxGuy/bounce
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rearrange some code

Browse Source
This commit is contained in:
Irlan 2018-04-05 23:36:21 -03:00
parent f26cd09f3a
commit d657d649e3
1 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/bounce/dynamics/body.cpp
View File

@ -202,6 +202,32 @@ void b3Body::SynchronizeShapes()
} }
} }
bool b3Body::ShouldCollide(const b3Body* other) const
{
if (m_type != e_dynamicBody && other->m_type != e_dynamicBody)
{
// At least one body should be kinematic or dynamic.
return false;
}
// Check if there are joints that connects
// this body with the other body and if the joint was configured
// to let not their collision occur.
for (b3JointEdge* je = m_jointEdges.m_head; je; je = je->m_next)
{
b3Joint* j = je->joint;
if (je->other == other)
{
if (j->m_collideLinked == false)
{
return false;
}
}
}
return true;
}
void b3Body::ResetMass() void b3Body::ResetMass()
{ {
m_mass = 0.0f; m_mass = 0.0f;
@ -314,32 +340,6 @@ void b3Body::ResetMass()
m_linearVelocity += b3Cross(m_angularVelocity, m_sweep.worldCenter - oldCenter); m_linearVelocity += b3Cross(m_angularVelocity, m_sweep.worldCenter - oldCenter);
} }
bool b3Body::ShouldCollide(const b3Body* other) const
{
if (m_type != e_dynamicBody && other->m_type != e_dynamicBody)
{
// At least one body should be kinematic or dynamic.
return false;
}
// Check if there are joints that connects
// this body with the other body and if the joint was configured
// to let not their collision occur.
for (b3JointEdge* je = m_jointEdges.m_head; je; je = je->m_next)
{
b3Joint* j = je->joint;
if (je->other == other)
{
if (j->m_collideLinked == false)
{
return false;
}
}
}
return true;
}
void b3Body::GetMassData(b3MassData* data) const void b3Body::GetMassData(b3MassData* data) const
{ {
data->mass = m_mass; data->mass = m_mass;