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

refactoring

Browse Source
This commit is contained in:
ejcoumans
2006-09-28 01:28:16 +00:00
parent 5b2d6af1ef
commit c473bd69ce
6 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Demos/OpenGL/DemoApplication.cpp
View File

@@ -13,6 +13,7 @@ subject to the following restrictions:
3. This notice may not be removed or altered from any source distribution. 3. This notice may not be removed or altered from any source distribution.
*/ */
#include "DemoApplication.h" #include "DemoApplication.h"
#include "LinearMath/btIDebugDraw.h" #include "LinearMath/btIDebugDraw.h"
#include "BulletDynamics/Dynamics/btDynamicsWorld.h" #include "BulletDynamics/Dynamics/btDynamicsWorld.h"

2
Extras/Jamfile
View File

@@ -4,4 +4,4 @@ SubInclude TOP Extras PhysicsInterface ;
SubInclude TOP Extras ConvexDecomposition ; SubInclude TOP Extras ConvexDecomposition ;
SubInclude TOP Extras COLLADA_DOM ; SubInclude TOP Extras COLLADA_DOM ;
SubInclude TOP Extras LibXML ; SubInclude TOP Extras LibXML ;
SubInclude TOP Extras GPUphysics ;

8
Extras/PhysicsInterface/CcdPhysics/CcdPhysicsController.cpp
View File

@@ -31,11 +31,11 @@ class BP_Proxy;
///todo: fill all the empty CcdPhysicsController methods, hook them up to the btRigidBody class ///todo: fill all the empty CcdPhysicsController methods, hook them up to the btRigidBody class
//'temporarily' global variables //'temporarily' global variables
float gDeactivationTime = 2.f; extern float gDeactivationTime;
bool gDisableDeactivation = false; extern bool gDisableDeactivation;
float gLinearSleepingTreshold = 0.8f; extern float gLinearSleepingTreshold;
float gAngularSleepingTreshold = 1.0f; extern float gAngularSleepingTreshold;
#include "BulletDynamics/Dynamics/btMassProps.h" #include "BulletDynamics/Dynamics/btMassProps.h"

1
Extras/PhysicsInterface/CcdPhysics/CcdPhysicsEnvironment.cpp
View File

@@ -38,6 +38,7 @@ subject to the following restrictions:
#include "BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h" #include "BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h"
//profiling/timings //profiling/timings
#include "LinearMath/btQuickprof.h" #include "LinearMath/btQuickprof.h"

5
src/BulletDynamics/Dynamics/btRigidBody.cpp
View File

@@ -20,7 +20,12 @@ subject to the following restrictions:
#include <LinearMath/btTransformUtil.h> #include <LinearMath/btTransformUtil.h>
float gLinearAirDamping = 1.f; float gLinearAirDamping = 1.f;
//'temporarily' global variables
float gDeactivationTime = 2.f;
bool gDisableDeactivation = false;
float gLinearSleepingTreshold = 0.8f;
float gAngularSleepingTreshold = 1.0f;
static int uniqueId = 0; static int uniqueId = 0;
btRigidBody::btRigidBody( const btMassProps& massProps,btScalar linearDamping,btScalar angularDamping,btScalar friction,btScalar restitution) btRigidBody::btRigidBody( const btMassProps& massProps,btScalar linearDamping,btScalar angularDamping,btScalar friction,btScalar restitution)

2
src/LinearMath/CMakeLists.txt
View File

@@ -4,6 +4,6 @@ ${BULLET_PHYSICS_SOURCE_DIR}/src }
) )
ADD_LIBRARY(LibLinearMath ADD_LIBRARY(LibLinearMath
GenQuickprof.cpp btQuickprof.cpp
) )