fix for bug #18898: GE perspective 3D View not working properly (missing LENS)
[blender.git] / source / gameengine / Ketsji / KX_MouseFocusSensor.cpp
index 3d6264674bc330520f6bba4955372c483dbd69e2..fde10a493db073e79a0f73d2dc35fc9091782593 100644 (file)
@@ -1,15 +1,12 @@
 /**
  * $Id$
  *
- * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
+ * ***** BEGIN GPL LICENSE BLOCK *****
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version. The Blender
- * Foundation also sells licenses for use in proprietary software under
- * the Blender License.  See http://www.blender.org/BL/ for information
- * about this.
+ * of the License, or (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  *
  * Contributor(s): none yet.
  *
- * ***** END GPL/BL DUAL LICENSE BLOCK *****
+ * ***** END GPL LICENSE BLOCK *****
  * KX_MouseFocusSensor determines mouse in/out/over events.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #ifdef WIN32
 // This warning tells us about truncation of __long__ stl-generated names.
 // It can occasionally cause DevStudio to have internal compiler warnings.
@@ -42,7 +35,6 @@
 #endif
 
 #include "MT_Point3.h"
-#include "KX_ClientObjectInfo.h"
 #include "RAS_FramingManager.h"
 #include "RAS_ICanvas.h"
 #include "RAS_IRasterizer.h"
 #include "KX_Scene.h"
 #include "KX_Camera.h"
 #include "KX_MouseFocusSensor.h"
+#include "KX_PyMath.h"
+
+#include "KX_RayCast.h"
+#include "KX_IPhysicsController.h"
+#include "PHY_IPhysicsController.h"
+#include "PHY_IPhysicsEnvironment.h"
+
 
 #include "KX_ClientObjectInfo.h"
-#include "SM_Object.h"
-#include "SM_Scene.h"
-#include "SumoPhysicsEnvironment.h"
-#include "KX_SumoPhysicsController.h"
 
 /* ------------------------------------------------------------------------- */
 /* Native functions                                                          */
@@ -65,51 +60,66 @@ KX_MouseFocusSensor::KX_MouseFocusSensor(SCA_MouseManager* eventmgr,
                                                                                 int startx,
                                                                                 int starty,
                                                                                 short int mousemode,
-                                                                                bool focusmode,
-                                                                                RAS_ICanvas* canvas,
+                                                                                int focusmode,
                                                                                 KX_Scene* kxscene,
+                                                                                KX_KetsjiEngine *kxengine,
                                                                                 SCA_IObject* gameobj, 
                                                                                 PyTypeObject* T)
     : SCA_MouseSensor(eventmgr, startx, starty, mousemode, gameobj, T),
          m_focusmode(focusmode),
-         m_gp_canvas(canvas),
-         m_kxscene(kxscene)
+         m_kxscene(kxscene),
+         m_kxengine(kxengine)
+{
+       Init();
+}
+
+void KX_MouseFocusSensor::Init()
 {
-       /* Or postpone? I think a sumo scene and kx scene go pretty much
-        * together, so it should be safe to do it here. */
-       m_mouse_over_in_previous_frame = false;
+       m_mouse_over_in_previous_frame = (m_invert)?true:false;
        m_positive_event = false;
+       m_hitObject = 0;
+       m_reset = true;
+       
+       m_hitPosition.setValue(0,0,0);
+       m_prevTargetPoint.setValue(0,0,0);
+       m_prevSourcePoint.setValue(0,0,0);
+       m_hitNormal.setValue(0,0,1);
 }
 
-bool KX_MouseFocusSensor::Evaluate(CValue* event)
+bool KX_MouseFocusSensor::Evaluate()
 {
        bool result = false;
        bool obHasFocus = false;
+       bool reset = m_reset && m_level;
 
 //     cout << "evaluate focus mouse sensor "<<endl;
-
+       m_reset = false;
        if (m_focusmode) {
                /* Focus behaviour required. Test mouse-on. The rest is
                 * equivalent to handling a key. */
                obHasFocus = ParentObjectHasFocus();
                
                if (!obHasFocus) {
+                       m_positive_event = false;
                        if (m_mouse_over_in_previous_frame) {
-                                       m_positive_event = false;
-                                       result = true;
+                               result = true;
                        } 
                } else {
+                       m_positive_event = true;
                        if (!m_mouse_over_in_previous_frame) {
-                               m_positive_event = true;
                                result = true;
                        } 
                } 
+               if (reset) {
+                       // force an event 
+                       result = true;
+               }
        } else {
                /* No focus behaviour required: revert to the basic mode. This
          * mode is never used, because the converter never makes this
          * sensor for a mouse-key event. It is here for
          * completeness. */
-               result = SCA_MouseSensor::Evaluate(event);
+               result = SCA_MouseSensor::Evaluate();
                m_positive_event = (m_val!=0);
        }
 
@@ -118,15 +128,33 @@ bool KX_MouseFocusSensor::Evaluate(CValue* event)
        return result;
 }
 
-bool KX_MouseFocusSensor::ParentObjectHasFocus(void)
+bool KX_MouseFocusSensor::RayHit(KX_ClientObjectInfo* client_info, KX_RayCast* result, void * const data)
 {
+       KX_GameObject* hitKXObj = client_info->m_gameobject;
+       
+       /* Is this me? In the ray test, there are a lot of extra checks
+       * for aliasing artefacts from self-hits. That doesn't happen
+       * here, so a simple test suffices. Or does the camera also get
+       * self-hits? (No, and the raysensor shouldn't do it either, since
+       * self-hits are excluded by setting the correct ignore-object.)
+       * Hitspots now become valid. */
+       KX_GameObject* thisObj = (KX_GameObject*) GetParent();
+       if ((m_focusmode == 2) || hitKXObj == thisObj)
+       {
+               m_hitObject = hitKXObj;
+               m_hitPosition = result->m_hitPoint;
+               m_hitNormal = result->m_hitNormal;
+               return true;
+       }
        
-       bool res = false;
-       m_hitPosition = MT_Vector3(0,0,0);
-       m_hitNormal =   MT_Vector3(1,0,0);
-       MT_Point3 resultpoint;
-       MT_Vector3 resultnormal;
+       return true;     // object must be visible to trigger
+       //return false;  // occluded objects can trigger
+}
+
 
+
+bool KX_MouseFocusSensor::ParentObjectHasFocusCamera(KX_Camera *cam)
+{
        /* All screen handling in the gameengine is done by GL,
         * specifically the model/view and projection parts. The viewport
         * part is in the creator. 
@@ -136,7 +164,7 @@ bool KX_MouseFocusSensor::ParentObjectHasFocus(void)
         * -> wcs_camcs_trafo ->
         * camCS - camera coordinates
         * -> camcs_clip_trafo ->
-        * clipCS - normalised device coordinates?
+        * clipCS - normalized device coordinates?
         * -> normview_win_trafo
         * winCS - window coordinates
         *
@@ -144,7 +172,7 @@ bool KX_MouseFocusSensor::ParentObjectHasFocus(void)
         * the projection matrix. These are passed to the rasterizer, and
         * we store them in the camera for easy access.
         *
-        * For normalised device coords (xn = x/w, yn = y/w/zw) the
+        * For normalized device coords (xn = x/w, yn = y/w/zw) the
         * windows coords become (lb = left bottom)
         *
         * xwin = [(xn + 1.0) * width]/2 + x_lb
@@ -158,6 +186,7 @@ bool KX_MouseFocusSensor::ParentObjectHasFocus(void)
         *    = 1.0 - 2(y_blender - y_lb)/height
         *
         * */
+        
        
        /* Because we don't want to worry about resize events, camera
         * changes and all that crap, we just determine this over and
@@ -166,12 +195,20 @@ bool KX_MouseFocusSensor::ParentObjectHasFocus(void)
         * canvas, the test is irrelevant. The 1.0 makes sure the
         * calculations don't bomb. Maybe we should explicitly guard for
         * division by 0.0...*/
-
-       /**
-        * Get the scenes current viewport.
-        */
-
-       const RAS_Rect & viewport = m_kxscene->GetSceneViewport();
+       
+       RAS_Rect area, viewport;
+       short m_y_inv = m_kxengine->GetCanvas()->GetHeight()-m_y;
+       
+       m_kxengine->GetSceneViewport(m_kxscene, cam, area, viewport);
+       
+       /* Check if the mouse is in the viewport */
+       if ((   m_x < viewport.m_x2 &&  // less then right
+                       m_x > viewport.m_x1 &&  // more then then left
+                       m_y_inv < viewport.m_y2 &&      // below top
+                       m_y_inv > viewport.m_y1) == 0)  // above bottom
+       {
+               return false;
+       }
 
        float height = float(viewport.m_y2 - viewport.m_y1 + 1);
        float width  = float(viewport.m_x2 - viewport.m_x1 + 1);
@@ -179,36 +216,41 @@ bool KX_MouseFocusSensor::ParentObjectHasFocus(void)
        float x_lb = float(viewport.m_x1);
        float y_lb = float(viewport.m_y1);
 
-       KX_Camera* cam = m_kxscene->GetActiveCamera();
+       MT_Vector4 frompoint;
+       MT_Vector4 topoint;
+       
+       /* m_y_inv - inverting for a bounds check is only part of it, now make relative to view bounds */
+       m_y_inv = (viewport.m_y2 - m_y_inv) + viewport.m_y1;
+       
+       
        /* There's some strangeness I don't fully get here... These values
-        * _should_ be wrong! */
-
-       /* old: */
-       float nearclip = 0.0;
-       float farclip = 1.0;
-
-       /*      build the from and to point in normalised device coordinates 
+        * _should_ be wrong! - see from point Z values */
+       
+       
+       /*      build the from and to point in normalized device coordinates 
         *      Looks like normailized device coordinates are [-1,1] in x [-1,1] in y
         *      [0,-1] in z 
         *      
         *      The actual z coordinates used don't have to be exact just infront and 
         *      behind of the near and far clip planes.
         */ 
-       MT_Vector4 frompoint = MT_Vector4( 
-               (2 * (m_x-x_lb) / width) - 1.0,
-               1.0 - (2 * (m_y - y_lb) / height),
-               nearclip,
-               1.0
-       );
-       MT_Vector4 topoint = MT_Vector4( 
-               (2 * (m_x-x_lb) / width) - 1.0,
-               1.0 - (2 * (m_y-y_lb) / height),
-               farclip,
-               1.0
-       );
+       frompoint.setValue(     (2 * (m_x-x_lb) / width) - 1.0,
+                                               1.0 - (2 * (m_y_inv - y_lb) / height),
+                                               /*cam->GetCameraData()->m_perspective ? 0.0:cdata->m_clipstart,*/ /* real clipstart is scaled in ortho for some reason, zero is ok */
+                                               0.0, /* nearclip, see above comments */
+                                               1.0 );
+       
+       topoint.setValue(       (2 * (m_x-x_lb) / width) - 1.0,
+                                               1.0 - (2 * (m_y_inv-y_lb) / height),
+                                               cam->GetCameraData()->m_perspective ? 1.0:cam->GetCameraData()->m_clipend, /* farclip, see above comments */
+                                               1.0 );
 
        /* camera to world  */
-       MT_Matrix4x4 camcs_wcs_matrix = MT_Matrix4x4(cam->GetCameraToWorld());
+       MT_Transform wcs_camcs_tranform = cam->GetWorldToCamera();
+       MT_Transform cams_wcs_transform;
+       cams_wcs_transform.invert(wcs_camcs_tranform);
+       
+       MT_Matrix4x4 camcs_wcs_matrix = MT_Matrix4x4(cams_wcs_transform);
 
        /* badly defined, the first time round.... I wonder why... I might
         * want to guard against floating point errors here.*/
@@ -222,122 +264,103 @@ bool KX_MouseFocusSensor::ParentObjectHasFocus(void)
        topoint   = camcs_wcs_matrix * topoint;
        
        /* from hom wcs to 3d wcs: */
-       MT_Point3 frompoint3 = MT_Point3(frompoint[0]/frompoint[3], 
-                                                                        frompoint[1]/frompoint[3], 
-                                                                        frompoint[2]/frompoint[3]); 
-       MT_Point3 topoint3 = MT_Point3(topoint[0]/topoint[3], 
-                                                                  topoint[1]/topoint[3], 
-                                                                  topoint[2]/topoint[3]); 
-       m_prevTargetPoint = topoint3;
-       
-       /* 2. Get the object from SuMO*/
+       m_prevSourcePoint.setValue(     frompoint[0]/frompoint[3],
+                                                               frompoint[1]/frompoint[3],
+                                                               frompoint[2]/frompoint[3]); 
+       
+       m_prevTargetPoint.setValue(     topoint[0]/topoint[3],
+                                                               topoint[1]/topoint[3],
+                                                               topoint[2]/topoint[3]); 
+       
+       /* 2. Get the object from PhysicsEnvironment */
        /* Shoot! Beware that the first argument here is an
         * ignore-object. We don't ignore anything... */
-       KX_GameObject* thisObj = (KX_GameObject*) GetParent();
+       KX_IPhysicsController* physics_controller = cam->GetPhysicsController();
+       PHY_IPhysicsEnvironment* physics_environment = m_kxscene->GetPhysicsEnvironment();
+
+       KX_RayCast::Callback<KX_MouseFocusSensor> callback(this,physics_controller);
+        
+       KX_RayCast::RayTest(physics_environment, m_prevSourcePoint, m_prevTargetPoint, callback);
        
-       SumoPhysicsEnvironment *spe = dynamic_cast<SumoPhysicsEnvironment* > (m_kxscene->GetPhysicsEnvironment());
-       SM_Scene *sumoScene = spe->GetSumoScene();
-       KX_SumoPhysicsController *spc = dynamic_cast<KX_SumoPhysicsController*> (cam->GetPhysicsController());
-       SM_Object *sumoCam = spc?spc->GetSumoObject():NULL;
-       MT_Vector3 todir = topoint3 - frompoint3;
-       if (todir.dot(todir) < MT_EPSILON)
-               return false;
-       todir.normalize();
-
-       while (true)
-       {       
-               SM_Object* hitSMObj = sumoScene->rayTest(sumoCam, 
-                                                       frompoint3,
-                                                       topoint3,
-                                                       resultpoint, 
-                                                       resultnormal);
-               
-               if (!hitSMObj)
-                       return false;
-                       
-               /* all this casting makes me nervous... */
-               KX_ClientObjectInfo* client_info 
-                       = ( hitSMObj ?
-                               (KX_ClientObjectInfo*) hitSMObj->getClientObject() :
-                               NULL);
-               
-               if (!client_info)
-               {
-                       std::cout<< "WARNING:  MouseOver sensor " << GetName() << " cannot sense SM_Object " << hitSMObj << " - no client info.\n" << std::endl;
-                       return false;
-               } 
+       if (m_hitObject)
+               return true;
        
-               KX_GameObject* hitKXObj = (KX_GameObject*)client_info->m_clientobject;
-               
-               if (client_info->m_type > KX_ClientObjectInfo::ACTOR)
-               {
-                       // false hit
-                       KX_SumoPhysicsController *hitspc = dynamic_cast<KX_SumoPhysicsController *> (static_cast<KX_GameObject*> (hitKXObj) ->GetPhysicsController());
-                       if (hitspc)
-                       {
-                               /* We add 0.01 of fudge, so that if the margin && radius == 0., we don't endless loop. */
-                               MT_Scalar marg = 0.01 + hitspc->GetSumoObject()->getMargin();
-                               if (hitspc->GetSumoObject()->getShapeProps())
-                               {
-                                       marg += 2*hitspc->GetSumoObject()->getShapeProps()->m_radius;
-                               }
-                               
-                               /* Calculate the other side of this object */
-                               MT_Point3 hitObjPos;
-                               hitspc->GetWorldPosition(hitObjPos);
-                               MT_Vector3 hitvector = hitObjPos - resultpoint;
-                               if (hitvector.dot(hitvector) > MT_EPSILON)
-                               {
-                                       hitvector.normalize();
-                                       marg *= 2.*todir.dot(hitvector);
-                               }
-                               frompoint3 = resultpoint + marg * todir;
-                       } else {
-                               return false;
-                       }
-                       continue;
-               }
-               /* Is this me? In the ray test, there are a lot of extra checks
-               * for aliasing artefacts from self-hits. That doesn't happen
-               * here, so a simple test suffices. Or does the camera also get
-               * self-hits? (No, and the raysensor shouldn't do it either, since
-               * self-hits are excluded by setting the correct ignore-object.)
-               * Hitspots now become valid. */
-               if (hitKXObj == thisObj)
-               {
-                       m_hitPosition = resultpoint;
-                       m_hitNormal = resultnormal;
-                       return true;
-               }
+       return false;
+}
+
+bool KX_MouseFocusSensor::ParentObjectHasFocus()
+{
+       m_hitObject = 0;
+       m_hitPosition.setValue(0,0,0);
+       m_hitNormal.setValue(1,0,0);
+       
+       KX_Camera *cam= m_kxscene->GetActiveCamera();
+       
+       if(ParentObjectHasFocusCamera(cam))
+               return true;
+
+       list<class KX_Camera*>* cameras = m_kxscene->GetCameras();
+       list<KX_Camera*>::iterator it = cameras->begin();
+       
+       while(it != cameras->end())
+       {
+               if(((*it) != cam) && (*it)->GetViewport())
+                       if (ParentObjectHasFocusCamera(*it))
+                               return true;
                
-               return false;
+               it++;
        }
-
+       
        return false;
 }
 
+const MT_Point3& KX_MouseFocusSensor::RaySource() const
+{
+       return m_prevSourcePoint;
+}
+
+const MT_Point3& KX_MouseFocusSensor::RayTarget() const
+{
+       return m_prevTargetPoint;
+}
+
+const MT_Point3& KX_MouseFocusSensor::HitPosition() const
+{
+       return m_hitPosition;
+}
+
+const MT_Vector3& KX_MouseFocusSensor::HitNormal() const
+{
+       return m_hitNormal;
+}
+
 /* ------------------------------------------------------------------------- */
 /* Python functions                                                          */
 /* ------------------------------------------------------------------------- */
 
 /* Integration hooks ------------------------------------------------------- */
 PyTypeObject KX_MouseFocusSensor::Type = {
-       PyObject_HEAD_INIT(&PyType_Type)
-       0,
+#if (PY_VERSION_HEX >= 0x02060000)
+       PyVarObject_HEAD_INIT(NULL, 0)
+#else
+       /* python 2.5 and below */
+       PyObject_HEAD_INIT( NULL )  /* required py macro */
+       0,                          /* ob_size */
+#endif
        "KX_MouseFocusSensor",
-       sizeof(KX_MouseFocusSensor),
+       sizeof(PyObjectPlus_Proxy),
        0,
-       PyDestructor,
+       py_base_dealloc,
        0,
-       __getattr,
-       __setattr,
-       0, //&MyPyCompare,
-       __repr,
-       0, //&cvalue_as_number,
        0,
        0,
        0,
-       0
+       py_base_repr,
+       0,0,0,0,0,0,
+       py_base_getattro,
+       py_base_setattro,
+       0,0,0,0,0,0,0,0,0,
+       Methods
 };
 
 PyParentObject KX_MouseFocusSensor::Parents[] = {
@@ -350,50 +373,152 @@ PyParentObject KX_MouseFocusSensor::Parents[] = {
 };
 
 PyMethodDef KX_MouseFocusSensor::Methods[] = {
-       {"getRayTarget", (PyCFunction) KX_MouseFocusSensor::sPyGetRayTarget, 
-        METH_VARARGS, GetRayTarget_doc},
-       {"getRaySource", (PyCFunction) KX_MouseFocusSensor::sPyGetRaySource, 
-        METH_VARARGS, GetRaySource_doc},
+       {"getRayTarget", (PyCFunction) KX_MouseFocusSensor::sPyGetRayTarget, METH_NOARGS, (PY_METHODCHAR)GetRayTarget_doc},
+       {"getRaySource", (PyCFunction) KX_MouseFocusSensor::sPyGetRaySource, METH_NOARGS, (PY_METHODCHAR)GetRaySource_doc},
+       {"getHitObject",(PyCFunction) KX_MouseFocusSensor::sPyGetHitObject,METH_NOARGS, (PY_METHODCHAR)GetHitObject_doc},
+       {"getHitPosition",(PyCFunction) KX_MouseFocusSensor::sPyGetHitPosition,METH_NOARGS, (PY_METHODCHAR)GetHitPosition_doc},
+       {"getHitNormal",(PyCFunction) KX_MouseFocusSensor::sPyGetHitNormal,METH_NOARGS, (PY_METHODCHAR)GetHitNormal_doc},
+       {"getRayDirection",(PyCFunction) KX_MouseFocusSensor::sPyGetRayDirection,METH_NOARGS, (PY_METHODCHAR)GetRayDirection_doc},
+
        {NULL,NULL} //Sentinel
 };
 
-PyObject* KX_MouseFocusSensor::_getattr(char* attr) {
-       _getattr_up(SCA_MouseSensor);
+PyAttributeDef KX_MouseFocusSensor::Attributes[] = {
+       KX_PYATTRIBUTE_RO_FUNCTION("raySource",         KX_MouseFocusSensor, pyattr_get_ray_source),
+       KX_PYATTRIBUTE_RO_FUNCTION("rayTarget",         KX_MouseFocusSensor, pyattr_get_ray_target),
+       KX_PYATTRIBUTE_RO_FUNCTION("rayDirection",      KX_MouseFocusSensor, pyattr_get_ray_direction),
+       KX_PYATTRIBUTE_RO_FUNCTION("hitObject",         KX_MouseFocusSensor, pyattr_get_hit_object),
+       KX_PYATTRIBUTE_RO_FUNCTION("hitPosition",       KX_MouseFocusSensor, pyattr_get_hit_position),
+       KX_PYATTRIBUTE_RO_FUNCTION("hitNormal",         KX_MouseFocusSensor, pyattr_get_hit_normal),
+       { NULL }        //Sentinel
+};
+
+PyObject* KX_MouseFocusSensor::py_getattro(PyObject *attr) {
+       py_getattro_up(SCA_MouseSensor);
+}
+
+PyObject* KX_MouseFocusSensor::py_getattro_dict() {
+       py_getattro_dict_up(SCA_MouseSensor);
+}
+
+
+const char KX_MouseFocusSensor::GetHitObject_doc[] = 
+"getHitObject()\n"
+"\tReturns the object that was hit by this ray.\n";
+PyObject* KX_MouseFocusSensor::PyGetHitObject()
+{
+       ShowDeprecationWarning("GetHitObject()", "the hitObject property");
+       
+       if (m_hitObject)
+               return m_hitObject->GetProxy();
+       
+       Py_RETURN_NONE;
+}
+
+
+const char KX_MouseFocusSensor::GetHitPosition_doc[] = 
+"getHitPosition()\n"
+"\tReturns the position (in worldcoordinates) where the object was hit by this ray.\n";
+PyObject* KX_MouseFocusSensor::PyGetHitPosition()
+{
+       ShowDeprecationWarning("getHitPosition()", "the hitPosition property");
+       
+       return PyObjectFrom(m_hitPosition);
+}
+
+const char KX_MouseFocusSensor::GetRayDirection_doc[] = 
+"getRayDirection()\n"
+"\tReturns the direction from the ray (in worldcoordinates) .\n";
+PyObject* KX_MouseFocusSensor::PyGetRayDirection()
+{
+       ShowDeprecationWarning("getRayDirection()", "the rayDirection property");
+       
+       MT_Vector3 dir = m_prevTargetPoint - m_prevSourcePoint;
+       if(MT_fuzzyZero(dir))   dir.setValue(0,0,0);
+       else                                    dir.normalize();
+       return PyObjectFrom(dir);
+}
+
+const char KX_MouseFocusSensor::GetHitNormal_doc[] = 
+"getHitNormal()\n"
+"\tReturns the normal (in worldcoordinates) at the point of collision where the object was hit by this ray.\n";
+PyObject* KX_MouseFocusSensor::PyGetHitNormal()
+{
+       ShowDeprecationWarning("getHitNormal()", "the hitNormal property");
+       
+       return PyObjectFrom(m_hitNormal);
 }
 
+
 /*  getRayTarget                                                */
-char KX_MouseFocusSensor::GetRayTarget_doc[] = 
+const char KX_MouseFocusSensor::GetRayTarget_doc[] = 
 "getRayTarget()\n"
 "\tReturns the target of the ray that seeks the focus object,\n"
 "\tin worldcoordinates.";
-PyObject* KX_MouseFocusSensor::PyGetRayTarget(PyObject* self, 
-                                                                                         PyObject* args, 
-                                                                                         PyObject* kwds) {
-       PyObject *retVal = PyList_New(3);
-
-       PyList_SetItem(retVal, 0, PyFloat_FromDouble(m_prevTargetPoint[0]));
-       PyList_SetItem(retVal, 1, PyFloat_FromDouble(m_prevTargetPoint[1]));
-       PyList_SetItem(retVal, 2, PyFloat_FromDouble(m_prevTargetPoint[2]));
+PyObject* KX_MouseFocusSensor::PyGetRayTarget()
+{
+       ShowDeprecationWarning("getRayTarget()", "the rayTarget property");
        
-       return retVal;
+       return PyObjectFrom(m_prevTargetPoint);
 }
 
 /*  getRayTarget                                                */
-char KX_MouseFocusSensor::GetRaySource_doc[] = 
+const char KX_MouseFocusSensor::GetRaySource_doc[] = 
 "getRaySource()\n"
 "\tReturns the source of the ray that seeks the focus object,\n"
 "\tin worldcoordinates.";
-PyObject* KX_MouseFocusSensor::PyGetRaySource(PyObject* self, 
-                                                                                         PyObject* args, 
-                                                                                         PyObject* kwds) {
-       PyObject *retVal = PyList_New(3);
+PyObject* KX_MouseFocusSensor::PyGetRaySource()
+{
+       ShowDeprecationWarning("getRaySource()", "the raySource property");
+       
+       return PyObjectFrom(m_prevSourcePoint);
+}
+
+/* Attributes */
+PyObject* KX_MouseFocusSensor::pyattr_get_ray_source(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
+{
+       KX_MouseFocusSensor* self= static_cast<KX_MouseFocusSensor*>(self_v);
+       return PyObjectFrom(self->RaySource());
+}
+
+PyObject* KX_MouseFocusSensor::pyattr_get_ray_target(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
+{
+       KX_MouseFocusSensor* self= static_cast<KX_MouseFocusSensor*>(self_v);
+       return PyObjectFrom(self->RayTarget());
+}
+
+PyObject* KX_MouseFocusSensor::pyattr_get_ray_direction(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
+{
+       KX_MouseFocusSensor* self= static_cast<KX_MouseFocusSensor*>(self_v);
+       MT_Vector3 dir = self->RayTarget() - self->RaySource();
+       if(MT_fuzzyZero(dir))   dir.setValue(0,0,0);
+       else                                    dir.normalize();
+       return PyObjectFrom(dir);
+}
 
-       PyList_SetItem(retVal, 0, PyFloat_FromDouble(m_prevSourcePoint[0]));
-       PyList_SetItem(retVal, 1, PyFloat_FromDouble(m_prevSourcePoint[1]));
-       PyList_SetItem(retVal, 2, PyFloat_FromDouble(m_prevSourcePoint[2]));
+PyObject* KX_MouseFocusSensor::pyattr_get_hit_object(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
+{
+       KX_MouseFocusSensor* self= static_cast<KX_MouseFocusSensor*>(self_v);
        
-       return retVal;
+       if(self->m_hitObject)
+               return self->m_hitObject->GetProxy();
+       
+       Py_RETURN_NONE;
 }
 
+PyObject* KX_MouseFocusSensor::pyattr_get_hit_position(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
+{
+       KX_MouseFocusSensor* self= static_cast<KX_MouseFocusSensor*>(self_v);
+       return PyObjectFrom(self->HitPosition());
+}
+
+PyObject* KX_MouseFocusSensor::pyattr_get_hit_normal(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
+{
+       KX_MouseFocusSensor* self= static_cast<KX_MouseFocusSensor*>(self_v);
+       return PyObjectFrom(self->HitNormal());
+}
+
+
+
 /* eof */