Revision: 19718
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19718
Author: ben2610
Date: 2009-04-14 19:22:14 +0200 (Tue, 14 Apr 2009)
Log Message:
-----------
BGE: Keep Sumo and ODE in sync with Bullet at API level, fix a compilation
problem in MSVC.
Modified Paths:
--------------
trunk/blender/source/gameengine/Ketsji/KX_OdePhysicsController.h
trunk/blender/source/gameengine/Ketsji/KX_SumoPhysicsController.h
trunk/blender/source/gameengine/Physics/BlOde/OdePhysicsController.h
trunk/blender/source/gameengine/Physics/Sumo/SumoPhysicsController.h
Modified: trunk/blender/source/gameengine/Ketsji/KX_OdePhysicsController.h
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_OdePhysicsController.h
2009-04-14 17:19:09 UTC (rev 19717)
+++ trunk/blender/source/gameengine/Ketsji/KX_OdePhysicsController.h
2009-04-14 17:22:14 UTC (rev 19718)
@@ -82,6 +82,10 @@
virtual SG_Controller* GetReplica(class SG_Node* destnode);
+ virtual float GetLinVelocityMin() { return
ODEPhysicsController::GetLinVelocityMin(); }
+ virtual void SetLinVelocityMin(float val) {
ODEPhysicsController::SetLinVelocityMin(val); }
+ virtual float GetLinVelocityMax() { return
ODEPhysicsController::GetLinVelocityMax(); }
+ virtual void SetLinVelocityMax(float val) {
ODEPhysicsController::SetLinVelocityMax(val); }
virtual void SetSumoTransform(bool nondynaonly);
// todo: remove next line !
Modified: trunk/blender/source/gameengine/Ketsji/KX_SumoPhysicsController.h
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_SumoPhysicsController.h
2009-04-14 17:19:09 UTC (rev 19717)
+++ trunk/blender/source/gameengine/Ketsji/KX_SumoPhysicsController.h
2009-04-14 17:22:14 UTC (rev 19718)
@@ -93,6 +93,10 @@
virtual MT_Vector3 getReactionForce();
virtual void setRigidBody(bool rigid);
+ virtual float GetLinVelocityMin() { return
SumoPhysicsController::GetLinVelocityMin(); }
+ virtual void SetLinVelocityMin(float val) {
SumoPhysicsController::SetLinVelocityMin(val); }
+ virtual float GetLinVelocityMax() { return
SumoPhysicsController::GetLinVelocityMax(); }
+ virtual void SetLinVelocityMax(float val) {
SumoPhysicsController::SetLinVelocityMax(val); }
virtual SG_Controller* GetReplica(class SG_Node* destnode);
Modified: trunk/blender/source/gameengine/Physics/BlOde/OdePhysicsController.h
===================================================================
--- trunk/blender/source/gameengine/Physics/BlOde/OdePhysicsController.h
2009-04-14 17:19:09 UTC (rev 19717)
+++ trunk/blender/source/gameengine/Physics/BlOde/OdePhysicsController.h
2009-04-14 17:22:14 UTC (rev 19718)
@@ -124,6 +124,10 @@
float getFriction() { return m_friction;}
float getRestitution() { return m_restitution;}
+ float GetLinVelocityMin() const { return 0.f; }
+ void SetLinVelocityMin(float val) { }
+ float GetLinVelocityMax() const { return 0.f; }
+ void SetLinVelocityMax(float val) { }
private:
Modified: trunk/blender/source/gameengine/Physics/Sumo/SumoPhysicsController.h
===================================================================
--- trunk/blender/source/gameengine/Physics/Sumo/SumoPhysicsController.h
2009-04-14 17:19:09 UTC (rev 19717)
+++ trunk/blender/source/gameengine/Physics/Sumo/SumoPhysicsController.h
2009-04-14 17:22:14 UTC (rev 19718)
@@ -144,7 +144,12 @@
void GetWorldPosition(MT_Point3& pos);
void GetWorldScaling(MT_Vector3& scale);
+ float GetLinVelocityMin() const { return 0.f; }
+ void SetLinVelocityMin(float val) { }
+ float GetLinVelocityMax() const { return 0.f; }
+ void SetLinVelocityMax(float val) { }
+
// void SetSumoObject(class SM_Object* sumoObj) {
// m_sumoObj = sumoObj;
// }
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
