add missing files after merging
[blender.git] / source / gameengine / Ketsji / KX_TouchSensor.h
index 6cbf5b15e3b4bb897404dcf41d12db134ce45f7c..39011345267c05d589b52150f478b2a2159cbbdb 100644 (file)
@@ -1,6 +1,4 @@
-/**
- * Senses touch and collision events
- *
+/*
  * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
@@ -17,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
  * All rights reserved.
  * ***** END GPL LICENSE BLOCK *****
  */
 
+/** \file KX_TouchSensor.h
+ *  \ingroup ketsji
+ *  \brief Senses touch and collision events
+ */
+
 #ifndef __KX_TOUCHSENSOR
 #define __KX_TOUCHSENSOR
 
@@ -58,7 +61,6 @@ 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;
 
@@ -111,36 +113,24 @@ public:
                if (m_invert) result = !result;
                return result;
        }
-
        
        virtual void EndFrame();
 
+       class PHY_IPhysicsController* GetPhysicsController() { return m_physCtrl; }
+
+
        // todo: put some info for collision maybe
 
+#ifdef WITH_PYTHON
+
        /* --------------------------------------------------------------------- */
        /* 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);
-       
+
+#endif
        
 };