Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2012-02-27 14:35:39 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-02-27 14:35:39 +0400
commit47c373c7a970fa4bd26453a6e35a4b066f2b77e4 (patch)
tree43d916fb86bcf797afa834649706669694225fe8 /source/gameengine/Physics/Bullet
parent120297734b4a01d93e5223e02f255b5aef01e281 (diff)
style cleanup (mostly whitespace)
Diffstat (limited to 'source/gameengine/Physics/Bullet')
-rw-r--r--source/gameengine/Physics/Bullet/CcdPhysicsController.h2
-rw-r--r--source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp4
-rw-r--r--source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h10
3 files changed, 8 insertions, 8 deletions
diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsController.h b/source/gameengine/Physics/Bullet/CcdPhysicsController.h
index 33b30758ff0..b9e78d9ff1f 100644
--- a/source/gameengine/Physics/Bullet/CcdPhysicsController.h
+++ b/source/gameengine/Physics/Bullet/CcdPhysicsController.h
@@ -525,7 +525,7 @@ protected:
return m_cci.m_collisionFilterMask;
}
- virtual void calcXform() {} ;
+ virtual void calcXform() {}
virtual void SetMargin(float margin)
{
if (m_collisionShape)
diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
index 39b2022a1f4..ba9724f34ab 100644
--- a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
+++ b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
@@ -122,7 +122,7 @@ public:
for (i=0;i<numWheels;i++)
{
btWheelInfo& info = m_vehicle->getWheelInfo(i);
- PHY_IMotionState* motionState = (PHY_IMotionState*)info.m_clientInfo ;
+ PHY_IMotionState* motionState = (PHY_IMotionState*)info.m_clientInfo;
// m_vehicle->updateWheelTransformsWS(info,false);
m_vehicle->updateWheelTransform(i,false);
btTransform trans = m_vehicle->getWheelInfo(i).m_worldTransform;
@@ -873,7 +873,7 @@ void CcdPhysicsEnvironment::setSolverType(int solverType)
};
- m_solverType = solverType ;
+ m_solverType = solverType;
}
diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
index 1315bc732a2..dba76c8d5fa 100644
--- a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
+++ b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
@@ -106,19 +106,19 @@ protected:
m_numTimeSubSteps = numTimeSubSteps;
}
virtual void setDeactivationTime(float dTime);
- virtual void setDeactivationLinearTreshold(float linTresh) ;
- virtual void setDeactivationAngularTreshold(float angTresh) ;
- virtual void setContactBreakingTreshold(float contactBreakingTreshold) ;
+ virtual void setDeactivationLinearTreshold(float linTresh);
+ virtual void setDeactivationAngularTreshold(float angTresh);
+ virtual void setContactBreakingTreshold(float contactBreakingTreshold);
virtual void setCcdMode(int ccdMode);
virtual void setSolverType(int solverType);
virtual void setSolverSorConstant(float sor);
virtual void setSolverTau(float tau);
virtual void setSolverDamping(float damping);
virtual void setLinearAirDamping(float damping);
- virtual void setUseEpa(bool epa) ;
+ virtual void setUseEpa(bool epa);
virtual void beginFrame();
- virtual void endFrame() {};
+ virtual void endFrame() {}
/// Perform an integration step of duration 'timeStep'.
virtual bool proceedDeltaTime(double curTime,float timeStep,float interval);