replaced btSimdMinMax.h by btMinMax.h in a few remaining places
This commit is contained in:
@@ -16,7 +16,7 @@ subject to the following restrictions:
|
||||
|
||||
#include "BU_AlgebraicPolynomialSolver.h"
|
||||
#include <math.h>
|
||||
#include <btSimdMinMax.h>
|
||||
#include <btMinMax.h>
|
||||
|
||||
int BU_AlgebraicPolynomialSolver::Solve2Quadratic(btScalar p, btScalar q)
|
||||
{
|
||||
|
||||
@@ -23,7 +23,7 @@ subject to the following restrictions:
|
||||
|
||||
#include "BU_MotionStateInterface.h"
|
||||
#include "BulletCollision/CollisionShapes/btPolyhedralConvexShape.h"
|
||||
#include <btSimdMinMax.h>
|
||||
#include <btMinMax.h>
|
||||
#include "LinearMath/btTransformUtil.h"
|
||||
|
||||
|
||||
|
||||
@@ -477,8 +477,8 @@ static void solveFriction (SpuSolverInternalConstraint& constraint, SpuSolverBod
|
||||
j1 = -rel_vel * constraint.m_jacDiagABInv;
|
||||
btScalar oldTangentImpulse = constraint.m_appliedImpulse;
|
||||
constraint.m_appliedImpulse = oldTangentImpulse + j1;
|
||||
GEN_set_min(constraint.m_appliedImpulse, limit);
|
||||
GEN_set_max(constraint.m_appliedImpulse, -limit);
|
||||
btSetMin(constraint.m_appliedImpulse, limit);
|
||||
btSetMax(constraint.m_appliedImpulse, -limit);
|
||||
j1 = constraint.m_appliedImpulse - oldTangentImpulse;
|
||||
|
||||
}
|
||||
|
||||
@@ -19,7 +19,7 @@ subject to the following restrictions:
|
||||
#include "LinearMath/btVector3.h"
|
||||
#include "LinearMath/btPoint3.h"
|
||||
#include "LinearMath/btTransform.h"
|
||||
#include "LinearMath/btSimdMinMax.h"
|
||||
#include "LinearMath/btMinMax.h"
|
||||
|
||||
#include "BulletCollision/CollisionShapes/btConvexShape.h"
|
||||
|
||||
|
||||
@@ -18,7 +18,7 @@ subject to the following restrictions:
|
||||
#include "LinearMath/btVector3.h"
|
||||
#include "LinearMath/btPoint3.h"
|
||||
#include "LinearMath/btTransform.h"
|
||||
#include "LinearMath/btSimdMinMax.h"
|
||||
#include "LinearMath/btMinMax.h"
|
||||
|
||||
#include <list>
|
||||
|
||||
|
||||
@@ -19,7 +19,7 @@ Written by: Marcus Hennix
|
||||
#include "btConeTwistConstraint.h"
|
||||
#include "BulletDynamics/Dynamics/btRigidBody.h"
|
||||
#include "LinearMath/btTransformUtil.h"
|
||||
#include "LinearMath/btSimdMinMax.h"
|
||||
#include "LinearMath/btMinMax.h"
|
||||
#include <new>
|
||||
|
||||
btConeTwistConstraint::btConeTwistConstraint()
|
||||
|
||||
@@ -17,7 +17,7 @@ subject to the following restrictions:
|
||||
#include "btHingeConstraint.h"
|
||||
#include "BulletDynamics/Dynamics/btRigidBody.h"
|
||||
#include "LinearMath/btTransformUtil.h"
|
||||
#include "LinearMath/btSimdMinMax.h"
|
||||
#include "LinearMath/btMinMax.h"
|
||||
#include <new>
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user