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:
Diffstat (limited to 'source/gameengine/Physics/BlOde/OdePhysicsController.h')
-rw-r--r--source/gameengine/Physics/BlOde/OdePhysicsController.h14
1 files changed, 12 insertions, 2 deletions
diff --git a/source/gameengine/Physics/BlOde/OdePhysicsController.h b/source/gameengine/Physics/BlOde/OdePhysicsController.h
index d7d3ba160f7..4f4acb5cd18 100644
--- a/source/gameengine/Physics/BlOde/OdePhysicsController.h
+++ b/source/gameengine/Physics/BlOde/OdePhysicsController.h
@@ -62,6 +62,8 @@ public:
virtual void getOrientation(float &quatImag0,float &quatImag1,float &quatImag2,float &quatReal);
virtual void setOrientation(float quatImag0,float quatImag1,float quatImag2,float quatReal);
virtual void setPosition(float posX,float posY,float posZ);
+ virtual void getPosition(PHY__Vector3& pos) const;
+
virtual void setScaling(float scaleX,float scaleY,float scaleZ);
// physics methods
@@ -73,6 +75,10 @@ public:
virtual void SetActive(bool active){};
virtual void SuspendDynamics();
virtual void RestoreDynamics();
+ virtual void resolveCombinedVelocities(float linvelX,float linvelY,float linvelZ,float angVelX,float angVelY,float angVelZ)
+ {
+ //todo ?
+ }
/**
@@ -102,9 +108,13 @@ public:
*/
virtual bool SynchronizeMotionStates(float time);
+ virtual void calcXform(){}
+ virtual void SetMargin(float margin) {}
+ virtual float GetMargin() const {return 0.f;}
+
// clientinfo for raycasts for example
- virtual void* getClientInfo() { return m_clientInfo;}
- virtual void setClientInfo(void* clientinfo) {m_clientInfo = clientinfo;};
+ virtual void* getNewClientInfo() { return m_clientInfo;}
+ virtual void setNewClientInfo(void* clientinfo) {m_clientInfo = clientinfo;};
void* m_clientInfo;
struct dxBody* GetOdeBodyId() { return m_bodyId; }