merge with trunk at r31523
[blender.git] / source / gameengine / Ketsji / KX_KetsjiEngine.cpp
index 71cd8b36045d8be824aff61a9a698d02a48ce3a9..3fdd0864a02e960d59752b51a56812cd7a405ca7 100644 (file)
@@ -235,7 +235,7 @@ void KX_KetsjiEngine::SetRasterizer(RAS_IRasterizer* rasterizer)
 
 #ifndef DISABLE_PYTHON
 /*
- * At the moment the GameLogic module is imported into 'pythondictionary' after this function is called.
+ * At the moment the bge.logic module is imported into 'pythondictionary' after this function is called.
  * if this function ever changes to assign a copy, make sure the game logic module is imported into this dictionary before hand.
  */
 void KX_KetsjiEngine::SetPyNamespace(PyObject* pythondictionary)
@@ -966,44 +966,17 @@ void KX_KetsjiEngine::DoSound(KX_Scene* scene)
        KX_Camera* cam = scene->GetActiveCamera();
        if (!cam)
                return;
-       MT_Point3 listenerposition = cam->NodeGetWorldPosition();
-       MT_Vector3 listenervelocity = cam->GetLinearVelocity();
-       MT_Matrix3x3 listenerorientation = cam->NodeGetWorldOrientation();
 
-       {
-               AUD_3DData data;
-               float f;
-
-               listenerorientation.getValue3x3(data.orientation);
-               listenerposition.getValue(data.position);
-               listenervelocity.getValue(data.velocity);
-
-               f = data.position[1];
-               data.position[1] = data.position[2];
-               data.position[2] = -f;
-
-               f = data.velocity[1];
-               data.velocity[1] = data.velocity[2];
-               data.velocity[2] = -f;
+       float f[4];
 
-               f = data.orientation[1];
-               data.orientation[1] = data.orientation[2];
-               data.orientation[2] = -f;
+       cam->NodeGetWorldPosition().getValue(f);
+//     AUD_setListenerLocation(f);
 
-               f = data.orientation[3];
-               data.orientation[3] = -data.orientation[6];
-               data.orientation[6] = f;
+       cam->GetLinearVelocity().getValue(f);
+       //AUD_setListenerVelocity(f);
 
-               f = data.orientation[4];
-               data.orientation[4] = -data.orientation[8];
-               data.orientation[8] = -f;
-
-               f = data.orientation[5];
-               data.orientation[5] = data.orientation[7];
-               data.orientation[7] = f;
-
-               AUD_updateListener(&data);
-       }
+       cam->NodeGetWorldOrientation().getRotation().getValue(f);
+       //AUD_setListenerOrientation(f);
 }