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

Fix compile errors for MSVC

Browse Source
This commit is contained in:
Kester Maddock 2005-02-15 10:02:19 +00:00
parent af03f9b798
commit 09fdbdc744
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/gameengine/Physics/BlOde/OdePhysicsEnvironment.cpp
View File

@ -55,7 +55,7 @@ ODEPhysicsEnvironment::~ODEPhysicsEnvironment()
dWorldDestroy (m_OdeWorld); dWorldDestroy (m_OdeWorld);
} }
void ODEPhysicsEnvironment::proceed(double timeStep) bool ODEPhysicsEnvironment::proceed(double timeStep)
{ {
// ode collision update // ode collision update
dSpaceCollide (m_OdeSpace,this,&ODEPhysicsEnvironment::OdeNearCallback); dSpaceCollide (m_OdeSpace,this,&ODEPhysicsEnvironment::OdeNearCallback);
@ -67,6 +67,8 @@ void ODEPhysicsEnvironment::proceed(double timeStep)
//clear collision points //clear collision points
this->ClearOdeContactGroup(); this->ClearOdeContactGroup();
return true;
} }
void ODEPhysicsEnvironment::setGravity(float x,float y,float z) void ODEPhysicsEnvironment::setGravity(float x,float y,float z)

2
source/gameengine/Physics/BlOde/OdePhysicsEnvironment.h
View File

@ -36,7 +36,7 @@ public:
ODEPhysicsEnvironment(); ODEPhysicsEnvironment();
virtual ~ODEPhysicsEnvironment(); virtual ~ODEPhysicsEnvironment();
// Perform an integration step of duration 'timeStep'. // Perform an integration step of duration 'timeStep'.
virtual void proceed(double timeStep); virtual bool proceed(double timeStep);
virtual void setGravity(float x,float y,float z); virtual void setGravity(float x,float y,float z);
virtual int createConstraint(class PHY_IPhysicsController* ctrl,class PHY_IPhysicsController* ctrl2,PHY_ConstraintType type, virtual int createConstraint(class PHY_IPhysicsController* ctrl,class PHY_IPhysicsController* ctrl2,PHY_ConstraintType type,
float pivotX,float pivotY,float pivotZ, float pivotX,float pivotY,float pivotZ,