Undo revision 23130 which was a merge with 2.5, a messy one because I did something...
[blender.git] / source / gameengine / Ketsji / KX_TouchSensor.h
index ad1830e..6cbf5b1 100644 (file)
@@ -58,6 +58,7 @@ protected:
        STR_String                              m_touchedpropname;      
        bool                                    m_bFindMaterial;
        bool                                    m_bTouchPulse;          /* changes in the colliding objects trigger pulses */
+       class SCA_EventManager* m_eventmgr;
        
        class PHY_IPhysicsController*   m_physCtrl;
 
@@ -119,6 +120,23 @@ public:
        /* --------------------------------------------------------------------- */
        /* Python interface ---------------------------------------------------- */
        /* --------------------------------------------------------------------- */
+
+       //Deprecated ----->
+       /* 1. setProperty */
+       KX_PYMETHOD_DOC_O(KX_TouchSensor,SetProperty);
+       /* 2. getProperty */
+       KX_PYMETHOD_DOC_NOARGS(KX_TouchSensor,GetProperty);
+       /* 3. getHitObject */
+       KX_PYMETHOD_DOC_NOARGS(KX_TouchSensor,GetHitObject);
+       /* 4. getHitObject */
+       KX_PYMETHOD_DOC_NOARGS(KX_TouchSensor,GetHitObjectList);
+       /* 5. getTouchMaterial */
+       KX_PYMETHOD_DOC_NOARGS(KX_TouchSensor,GetTouchMaterial);
+#if 0
+       /* 6. setTouchMaterial */
+       KX_PYMETHOD_DOC_O(KX_TouchSensor,SetTouchMaterial);
+#endif
+       //<-----
        
        static PyObject*        pyattr_get_object_hit(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef);
        static PyObject*        pyattr_get_object_hit_list(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef);