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

merged most of the changes from the branch into trunk, except for COLLADA, libxml and glut glitches.

Browse Source 
Still need to verify to make sure no unwanted renaming is introduced.
This commit is contained in:
ejcoumans
2006-09-27 20:43:51 +00:00
parent d1e9a885f3
commit eb23bb5c0c
263 changed files with 7528 additions and 6714 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/BulletCollision/CollisionDispatch/btCollisionObject.cpp
View File

@@ -15,7 +15,7 @@ subject to the following restrictions:
#include "btCollisionObject.h"
CollisionObject::CollisionObject()
btCollisionObject::btCollisionObject()
: m_collisionFlags(0),
m_activationState1(1),
m_deactivationTime(0.f),
@@ -30,18 +30,18 @@ CollisionObject::CollisionObject()
}
void CollisionObject::SetActivationState(int newState)
void btCollisionObject::SetActivationState(int newState)
{
if ( (m_activationState1 != DISABLE_DEACTIVATION) && (m_activationState1 != DISABLE_SIMULATION))
m_activationState1 = newState;
}
void CollisionObject::ForceActivationState(int newState)
void btCollisionObject::ForceActivationState(int newState)
{
m_activationState1 = newState;
}
void CollisionObject::activate()
void btCollisionObject::activate()
{
if (!(m_collisionFlags & isStatic))
{
@@ -50,8 +50,8 @@ void CollisionObject::activate()
}
}
bool CollisionObject::mergesSimulationIslands() const
bool btCollisionObject::mergesSimulationIslands() const
{
//static objects, and object without contact response don't merge islands
return ( !(m_collisionFlags & (isStatic |noContactResponse )));
return ( !(m_collisionFlags & (isStatic | noContactResponse)));
}