Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

replaced btSimdMinMax.h by btMinMax.h in a few remaining places

Browse Source
This commit is contained in:
ejcoumans
2007-10-19 20:48:06 +00:00
parent dbe502c5a8
commit c625e756fe
7 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Extras/AlgebraicCCD/BU_AlgebraicPolynomialSolver.cpp
View File

@@ -16,7 +16,7 @@ subject to the following restrictions:
#include "BU_AlgebraicPolynomialSolver.h" #include "BU_AlgebraicPolynomialSolver.h"
#include <math.h> #include <math.h>
#include <btSimdMinMax.h> #include <btMinMax.h>
int BU_AlgebraicPolynomialSolver::Solve2Quadratic(btScalar p, btScalar q) int BU_AlgebraicPolynomialSolver::Solve2Quadratic(btScalar p, btScalar q)
{ {

2
Extras/AlgebraicCCD/BU_CollisionPair.cpp
View File

@@ -23,7 +23,7 @@ subject to the following restrictions:
#include "BU_MotionStateInterface.h" #include "BU_MotionStateInterface.h"
#include "BulletCollision/CollisionShapes/btPolyhedralConvexShape.h" #include "BulletCollision/CollisionShapes/btPolyhedralConvexShape.h"
#include <btSimdMinMax.h> #include <btMinMax.h>
#include "LinearMath/btTransformUtil.h" #include "LinearMath/btTransformUtil.h"

4
Extras/BulletMultiThreaded/SpuSolverTask/SpuParallellSolverTask.cpp
View File

@@ -477,8 +477,8 @@ static void solveFriction (SpuSolverInternalConstraint& constraint, SpuSolverBod
j1 = -rel_vel * constraint.m_jacDiagABInv; j1 = -rel_vel * constraint.m_jacDiagABInv;
btScalar oldTangentImpulse = constraint.m_appliedImpulse; btScalar oldTangentImpulse = constraint.m_appliedImpulse;
constraint.m_appliedImpulse = oldTangentImpulse + j1; constraint.m_appliedImpulse = oldTangentImpulse + j1;
GEN_set_min(constraint.m_appliedImpulse, limit); btSetMin(constraint.m_appliedImpulse, limit);
GEN_set_max(constraint.m_appliedImpulse, -limit); btSetMax(constraint.m_appliedImpulse, -limit);
j1 = constraint.m_appliedImpulse - oldTangentImpulse; j1 = constraint.m_appliedImpulse - oldTangentImpulse;
} }

2
Extras/EPA/Epa.cpp
View File

@@ -19,7 +19,7 @@ subject to the following restrictions:
#include "LinearMath/btVector3.h" #include "LinearMath/btVector3.h"
#include "LinearMath/btPoint3.h" #include "LinearMath/btPoint3.h"
#include "LinearMath/btTransform.h" #include "LinearMath/btTransform.h"
#include "LinearMath/btSimdMinMax.h" #include "LinearMath/btMinMax.h"
#include "BulletCollision/CollisionShapes/btConvexShape.h" #include "BulletCollision/CollisionShapes/btConvexShape.h"

2
Extras/EPA/EpaPenetrationDepthSolver.cpp
View File

@@ -18,7 +18,7 @@ subject to the following restrictions:
#include "LinearMath/btVector3.h" #include "LinearMath/btVector3.h"
#include "LinearMath/btPoint3.h" #include "LinearMath/btPoint3.h"
#include "LinearMath/btTransform.h" #include "LinearMath/btTransform.h"
#include "LinearMath/btSimdMinMax.h" #include "LinearMath/btMinMax.h"
#include <list> #include <list>

2
src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp
View File

@@ -19,7 +19,7 @@ Written by: Marcus Hennix
#include "btConeTwistConstraint.h" #include "btConeTwistConstraint.h"
#include "BulletDynamics/Dynamics/btRigidBody.h" #include "BulletDynamics/Dynamics/btRigidBody.h"
#include "LinearMath/btTransformUtil.h" #include "LinearMath/btTransformUtil.h"
#include "LinearMath/btSimdMinMax.h" #include "LinearMath/btMinMax.h"
#include <new> #include <new>
btConeTwistConstraint::btConeTwistConstraint() btConeTwistConstraint::btConeTwistConstraint()

2
src/BulletDynamics/ConstraintSolver/btHingeConstraint.cpp
View File

@@ -17,7 +17,7 @@ subject to the following restrictions:
#include "btHingeConstraint.h" #include "btHingeConstraint.h"
#include "BulletDynamics/Dynamics/btRigidBody.h" #include "BulletDynamics/Dynamics/btRigidBody.h"
#include "LinearMath/btTransformUtil.h" #include "LinearMath/btTransformUtil.h"
#include "LinearMath/btSimdMinMax.h" #include "LinearMath/btMinMax.h"
#include <new> #include <new>