diff options
author | Erwin Coumans <blender@erwincoumans.com> | 2005-08-06 02:10:27 +0400 |
---|---|---|
committer | Erwin Coumans <blender@erwincoumans.com> | 2005-08-06 02:10:27 +0400 |
commit | 66dc186fb6f6fd4d95b429fba6d31c764000bde0 (patch) | |
tree | e7d2514ff8ee466ca2b270cfb336567ab164c7e7 /source/gameengine | |
parent | 1b0cd9340da7ad1496c0a2bc4fe174f3cda7a1d5 (diff) |
fixed sphere shape, added non-uniform scaling (making it an ellipsoid)
removed bug-fixing comments
Diffstat (limited to 'source/gameengine')
-rw-r--r-- | source/gameengine/Ketsji/KX_GameObject.cpp | 11 | ||||
-rw-r--r-- | source/gameengine/Ketsji/KX_MouseFocusSensor.cpp | 1 | ||||
-rw-r--r-- | source/gameengine/Ketsji/KX_RaySensor.cpp | 3 | ||||
-rw-r--r-- | source/gameengine/Physics/Bullet/CcdPhysicsController.cpp | 3 |
4 files changed, 2 insertions, 16 deletions
diff --git a/source/gameengine/Ketsji/KX_GameObject.cpp b/source/gameengine/Ketsji/KX_GameObject.cpp index ee12efec684..da81439fccb 100644 --- a/source/gameengine/Ketsji/KX_GameObject.cpp +++ b/source/gameengine/Ketsji/KX_GameObject.cpp @@ -949,27 +949,16 @@ PyObject* KX_GameObject::PyApplyImpulse(PyObject* self, PyObject* args, PyObject* kwds) { - - PyObject* pyattach; PyObject* pyimpulse; - - printf("impulse1\n"); - - if (PyArg_ParseTuple(args, "OO", &pyattach, &pyimpulse)) { MT_Point3 attach; MT_Vector3 impulse; - printf("impulse2\n"); - if (m_pPhysicsController1) { - printf("impulse3\n"); - if (PyVecTo(pyattach, attach) && PyVecTo(pyimpulse, impulse)) { - printf("impulse4\n"); m_pPhysicsController1->applyImpulse(attach, impulse); Py_Return; } diff --git a/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp b/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp index af24627f8fe..b42c66fc4f9 100644 --- a/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp +++ b/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp @@ -345,7 +345,6 @@ PyObject* KX_MouseFocusSensor::PyGetHitObject(PyObject* self, { if (m_hitObject) { - printf("hitObject!\n"); return m_hitObject->AddRef(); } Py_Return; diff --git a/source/gameengine/Ketsji/KX_RaySensor.cpp b/source/gameengine/Ketsji/KX_RaySensor.cpp index 73eb95d606e..b35d9b00540 100644 --- a/source/gameengine/Ketsji/KX_RaySensor.cpp +++ b/source/gameengine/Ketsji/KX_RaySensor.cpp @@ -106,13 +106,12 @@ bool KX_RaySensor::IsPositiveTrigger() bool KX_RaySensor::RayHit(KX_ClientObjectInfo* info, MT_Point3& hit_point, MT_Vector3& hit_normal, void* const data) { - printf("KX_RaySensor::RayHit\n"); KX_GameObject* obj = (KX_GameObject*)GetParent(); SCA_IObject *hitgameobj = info->m_gameobject; if (hitgameobj == obj || info->m_type > KX_ClientObjectInfo::ACTOR) { - printf("false hit\n"); +// printf("false hit\n"); // false hit return false; } diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp b/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp index f1f7ba2c1d2..c16a31ee18d 100644 --- a/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp +++ b/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp @@ -163,8 +163,7 @@ void CcdPhysicsController::SetLinearVelocity(float lin_velX,float lin_velY,floa } void CcdPhysicsController::applyImpulse(float attachX,float attachY,float attachZ, float impulseX,float impulseY,float impulseZ) { - printf("CcdPhysicsController::applyImpulse\n"); - + SimdVector3 impulse(impulseX,impulseY,impulseZ); SimdVector3 pos(attachX,attachY,attachZ); |