2.50: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r19323...
[blender.git] / source / gameengine / GameLogic / SCA_ISensor.h
index 23f2c76..6b1c8cc 100644 (file)
@@ -113,7 +113,7 @@ public:
        virtual void RegisterToManager();
        virtual void UnregisterToManager();
 
-       virtual float GetNumber();
+       virtual double GetNumber();
 
        /** Stop sensing for a while. */
        void Suspend();
@@ -136,24 +136,27 @@ public:
 
        /* Python functions: */
        
-       virtual PyObject* _getattr(const char *attr);
-       virtual int _setattr(const char *attr, PyObject *value);
+       virtual PyObject* py_getattro(PyObject *attr);
+       virtual int py_setattro(PyObject *attr, PyObject *value);
 
        //Deprecated functions ----->
        KX_PYMETHOD_DOC_NOARGS(SCA_ISensor,IsPositive);
        KX_PYMETHOD_DOC_NOARGS(SCA_ISensor,IsTriggered);
        KX_PYMETHOD_DOC_NOARGS(SCA_ISensor,GetUsePosPulseMode);
-       KX_PYMETHOD_DOC(SCA_ISensor,SetUsePosPulseMode);
+       KX_PYMETHOD_DOC_VARARGS(SCA_ISensor,SetUsePosPulseMode);
        KX_PYMETHOD_DOC_NOARGS(SCA_ISensor,GetFrequency);
-       KX_PYMETHOD_DOC(SCA_ISensor,SetFrequency);
+       KX_PYMETHOD_DOC_VARARGS(SCA_ISensor,SetFrequency);
        KX_PYMETHOD_DOC_NOARGS(SCA_ISensor,GetUseNegPulseMode);
-       KX_PYMETHOD_DOC(SCA_ISensor,SetUseNegPulseMode);
+       KX_PYMETHOD_DOC_VARARGS(SCA_ISensor,SetUseNegPulseMode);
        KX_PYMETHOD_DOC_NOARGS(SCA_ISensor,GetInvert);
-       KX_PYMETHOD_DOC(SCA_ISensor,SetInvert);
+       KX_PYMETHOD_DOC_VARARGS(SCA_ISensor,SetInvert);
        KX_PYMETHOD_DOC_NOARGS(SCA_ISensor,GetLevel);
-       KX_PYMETHOD_DOC(SCA_ISensor,SetLevel);
+       KX_PYMETHOD_DOC_VARARGS(SCA_ISensor,SetLevel);
        //<------
        KX_PYMETHOD_DOC_NOARGS(SCA_ISensor,reset);
+       
+       static PyObject*        pyattr_get_triggered(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef);
+       static PyObject*        pyattr_get_positive(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef);
 };
 
 #endif //__SCA_ISENSOR