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:
authorErwin Coumans <blender@erwincoumans.com>2006-06-19 02:10:00 +0400
committerErwin Coumans <blender@erwincoumans.com>2006-06-19 02:10:00 +0400
commitec8448b88d9285624d61ce9196c7ad3643dc921e (patch)
treea8b88feac6e25d1c8aa0e45fb1a018e3b2b30e6c /source/gameengine/Ketsji/KX_BulletPhysicsController.cpp
parentdcbcc125824c6debc082b7ba36082602bc63f9d3 (diff)
bugfix/workaround for problem with hard-coded collision margins being too large.
Diffstat (limited to 'source/gameengine/Ketsji/KX_BulletPhysicsController.cpp')
-rw-r--r--source/gameengine/Ketsji/KX_BulletPhysicsController.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp b/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp
index e0ec09ffdd5..c974b9b6828 100644
--- a/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp
+++ b/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp
@@ -15,6 +15,7 @@
#include "PHY_IPhysicsEnvironment.h"
+
KX_BulletPhysicsController::KX_BulletPhysicsController (const CcdConstructionInfo& ci, bool dyna)
: KX_IPhysicsController(dyna,(PHY_IPhysicsController*)this),
CcdPhysicsController(ci)
@@ -58,6 +59,10 @@ void KX_BulletPhysicsController::SetObject (SG_IObject* object)
}
+void KX_BulletPhysicsController::SetMargin (float collisionMargin)
+{
+ CcdPhysicsController::SetMargin(collisionMargin);
+}
void KX_BulletPhysicsController::RelativeTranslate(const MT_Vector3& dloc,bool local)
{
CcdPhysicsController::RelativeTranslate(dloc[0],dloc[1],dloc[2],local);