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

move a function

Browse Source
This commit is contained in:
Irlan
2018-10-06 13:58:56 -03:00
parent 658ac8298a
commit 17cf837712
1 changed files with 46 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
examples/testbed/tests/character_test.h
View File

@@ -54,52 +54,6 @@ public:
m_translation += translation; m_translation += translation;
} }
void Solve()
{
b3StackArray<b3Shape*, 32> shapes;
CollectStaticShapes(shapes);
b3StackArray<Plane, 32> planes;
CollectOverlapPlanes(planes, shapes);
b3Vec3 startPosition = m_characterBody->GetWorldCenter();
b3Vec3 targetPosition = startPosition + m_translation;
m_translation.SetZero();
b3Vec3 solvePosition = SolvePositionConstraints(planes, targetPosition);
b3Vec3 oldSolvePosition = solvePosition;
for (;;)
{
b3Vec3 translation = solvePosition - startPosition;
CollectSweepPlanes(planes, shapes, translation);
solvePosition = SolvePositionConstraints(planes, targetPosition);
const float32 tolerance = 0.05f;
if (b3DistanceSquared(oldSolvePosition, solvePosition) < tolerance * tolerance)
{
break;
}
oldSolvePosition = solvePosition;
}
// Update body
b3Quat orientation = m_characterBody->GetOrientation();
b3Vec3 axis;
float32 angle;
orientation.GetAxisAngle(&axis, &angle);
m_characterBody->SetTransform(solvePosition, axis, angle);
}
void Step() void Step()
{ {
Solve(); Solve();
@@ -274,6 +228,52 @@ private:
return c; return c;
} }
void Solve()
{
b3StackArray<b3Shape*, 32> shapes;
CollectStaticShapes(shapes);
b3StackArray<Plane, 32> planes;
CollectOverlapPlanes(planes, shapes);
b3Vec3 startPosition = m_characterBody->GetWorldCenter();
b3Vec3 targetPosition = startPosition + m_translation;
m_translation.SetZero();
b3Vec3 solvePosition = SolvePositionConstraints(planes, targetPosition);
b3Vec3 oldSolvePosition = solvePosition;
for (;;)
{
b3Vec3 translation = solvePosition - startPosition;
CollectSweepPlanes(planes, shapes, translation);
solvePosition = SolvePositionConstraints(planes, targetPosition);
const float32 tolerance = 0.05f;
if (b3DistanceSquared(oldSolvePosition, solvePosition) < tolerance * tolerance)
{
break;
}
oldSolvePosition = solvePosition;
}
// Update body
b3Quat orientation = m_characterBody->GetOrientation();
b3Vec3 axis;
float32 angle;
orientation.GetAxisAngle(&axis, &angle);
m_characterBody->SetTransform(solvePosition, axis, angle);
}
b3World* m_world; b3World* m_world;
b3Body* m_characterBody; b3Body* m_characterBody;
b3SphereShape* m_characterShape; b3SphereShape* m_characterShape;