sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix build: don't use Character stuff, it wasn't meant to be included in Blender/extern/bullet2 distro.

Browse Source
This commit is contained in:
Erwin Coumans 2009-03-03 14:31:10 +00:00
parent 982a5cc60d
commit 151317e990
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp vendored
View File

@ -56,8 +56,10 @@ subject to the following restrictions:
#include "BulletDynamics/Vehicle/btRaycastVehicle.h"
#include "BulletDynamics/Vehicle/btVehicleRaycaster.h"
#include "BulletDynamics/Vehicle/btWheelInfo.h"
#ifdef USE_CHARACTER
//character
#include "BulletDynamics/Character/btCharacterControllerInterface.h"
#endif //USE_CHARACTER
#include "LinearMath/btIDebugDraw.h"
#include "LinearMath/btQuickprof.h"
@ -506,6 +508,7 @@ void btDiscreteDynamicsWorld::updateVehicles(btScalar timeStep)
void btDiscreteDynamicsWorld::updateCharacters(btScalar timeStep)
{
#ifdef USE_CHARACTER
BT_PROFILE("updateCharacters");
for ( int i=0;i<m_characters.size();i++)
@ -514,6 +517,7 @@ void btDiscreteDynamicsWorld::updateCharacters(btScalar timeStep)
character->preStep (this);
character->playerStep (this,timeStep);
}
#endif //USE_CHARACTER
}
@ -584,12 +588,16 @@ void btDiscreteDynamicsWorld::removeVehicle(btRaycastVehicle* vehicle)
void btDiscreteDynamicsWorld::addCharacter(btCharacterControllerInterface* character)
{
#ifdef USE_CHARACTER
m_characters.push_back(character);
#endif //USE_CHARACTER
}
void btDiscreteDynamicsWorld::removeCharacter(btCharacterControllerInterface* character)
{
#ifdef USE_CHARACTER
m_characters.remove(character);
#endif //USE_CHARACTER
}