preparation for block solver btRigidBody.
This commit is contained in:
@@ -91,7 +91,7 @@ enum SolverEnumType
|
||||
NNCGSOLVER = 2,
|
||||
DANZIGSOLVER = 3,
|
||||
LEMKESOLVER = 4,
|
||||
FSSOLVER = 5,
|
||||
|
||||
NUM_SOLVERS = 6
|
||||
};
|
||||
|
||||
@@ -103,7 +103,7 @@ static char GAUSSSEIDELSOLVER[] = "Gauss-Seidel Solver";
|
||||
static char NNCGSOLVER[] = "NNCG Solver";
|
||||
static char DANZIGSOLVER[] = "Danzig Solver";
|
||||
static char LEMKESOLVER[] = "Lemke Solver";
|
||||
static char FSSOLVER[] = "FeatherStone Solver";
|
||||
|
||||
}; // namespace SolverType
|
||||
|
||||
static const char* solverTypes[NUM_SOLVERS];
|
||||
@@ -324,7 +324,7 @@ struct NN3DWalkersTimeWarpBase : public CommonRigidBodyBase
|
||||
solverTypes[2] = SolverType::NNCGSOLVER;
|
||||
solverTypes[3] = SolverType::DANZIGSOLVER;
|
||||
solverTypes[4] = SolverType::LEMKESOLVER;
|
||||
solverTypes[5] = SolverType::FSSOLVER;
|
||||
|
||||
|
||||
{
|
||||
ComboBoxParams comboParams;
|
||||
@@ -499,19 +499,12 @@ struct NN3DWalkersTimeWarpBase : public CommonRigidBodyBase
|
||||
m_solver = new btMLCPSolver(mlcp);
|
||||
break;
|
||||
}
|
||||
case FSSOLVER:
|
||||
{
|
||||
// b3Printf("=%s=",SolverType::FSSOLVER);
|
||||
//Use the btMultiBodyConstraintSolver for Featherstone btMultiBody support
|
||||
m_solver = new btMultiBodyConstraintSolver;
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
if (SOLVER_TYPE != FSSOLVER)
|
||||
if (1)
|
||||
{
|
||||
//TODO: Set parameters for other solvers
|
||||
|
||||
|
||||
Reference in New Issue
Block a user