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

fix #34

Browse Source
This commit is contained in:
Irlan
2018-04-02 13:06:32 -03:00
parent 40093fcf2f
commit c1a5d1b93f
6 changed files with 32 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/bounce/dynamics/cloth/spring_cloth.cpp
View File

@ -193,7 +193,7 @@ void b3SpringCloth::Initialize(const b3SpringClothDef& def)
m_m[i] = 0.0f;
m_inv_m[i] = 0.0f;
m_y[i].SetZero();
m_types[i] = e_staticMass;
m_types[i] = b3MassType::e_staticMass;
}
// Initialize mass
@ -223,7 +223,7 @@ void b3SpringCloth::Initialize(const b3SpringClothDef& def)
{
B3_ASSERT(m_m[i] > 0.0f);
m_inv_m[i] = 1.0f / m_m[i];
m_types[i] = e_dynamicMass;
m_types[i] = b3MassType::e_dynamicMass;
}
// Initialize springs
@ -317,7 +317,7 @@ void b3SpringCloth::UpdateContacts()
for (u32 i = 0; i < m_massCount; ++i)
{
// Static masses can't participate in collisions.
if (m_types[i] == e_staticMass)
if (m_types[i] == b3MassType::e_staticMass)
{
continue;
}
@ -486,7 +486,7 @@ void b3SpringCloth::Step(float32 dt)
// Apply gravity
for (u32 i = 0; i < m_massCount; ++i)
{
if (m_types[i] == e_dynamicMass)
if (m_types[i] == b3MassType::e_dynamicMass)
{
m_f[i] += m_gravity;
}

4
src/bounce/dynamics/cloth/spring_solver.cpp
View File

@ -380,12 +380,12 @@ static void b3Filter(b3DenseVec3& out,
{
switch (types[i])
{
case e_staticMass:
case b3MassType::e_staticMass:
{
out[i].SetZero();
break;
}
case e_dynamicMass:
case b3MassType::e_dynamicMass:
{
if (contacts[i].lockN == true)
{