Merge of itasc branch. Project files, scons and cmake should be working. Makefile...
[blender.git] / source / gameengine / Converter / BL_ShapeActionActuator.h
index d268eef..8015763 100644 (file)
@@ -50,9 +50,8 @@ public:
                                                short   playtype,
                                                short   blendin,
                                                short   priority,
-                                               float   stride,
-                                               PyTypeObject* T=&Type) 
-               : SCA_IActuator(gameobj,T),
+                                               float   stride) 
+               : SCA_IActuator(gameobj, KX_ACT_SHAPEACTION),
                
                m_lastpos(0, 0, 0),
                m_blendframe(0),
@@ -83,33 +82,6 @@ public:
        bAction*        GetAction() { return m_action; }
        void            SetAction(bAction* act) { m_action= act; }
 
-       KX_PYMETHOD_DOC_VARARGS(BL_ShapeActionActuator,SetAction);
-       KX_PYMETHOD_DOC_VARARGS(BL_ShapeActionActuator,SetBlendin);
-       KX_PYMETHOD_DOC_VARARGS(BL_ShapeActionActuator,SetPriority);
-       KX_PYMETHOD_DOC_VARARGS(BL_ShapeActionActuator,SetStart);
-       KX_PYMETHOD_DOC_VARARGS(BL_ShapeActionActuator,SetEnd);
-       KX_PYMETHOD_DOC_VARARGS(BL_ShapeActionActuator,SetFrame);
-       KX_PYMETHOD_DOC_VARARGS(BL_ShapeActionActuator,SetProperty);
-       KX_PYMETHOD_DOC_VARARGS(BL_ShapeActionActuator,SetFrameProperty);
-       KX_PYMETHOD_DOC_VARARGS(BL_ShapeActionActuator,SetBlendtime);
-       KX_PYMETHOD_DOC_VARARGS(BL_ShapeActionActuator,SetChannel);
-
-       KX_PYMETHOD_DOC_NOARGS(BL_ShapeActionActuator,GetAction);
-       KX_PYMETHOD_DOC_NOARGS(BL_ShapeActionActuator,GetBlendin);
-       KX_PYMETHOD_DOC_NOARGS(BL_ShapeActionActuator,GetPriority);
-       KX_PYMETHOD_DOC_NOARGS(BL_ShapeActionActuator,GetStart);
-       KX_PYMETHOD_DOC_NOARGS(BL_ShapeActionActuator,GetEnd);
-       KX_PYMETHOD_DOC_NOARGS(BL_ShapeActionActuator,GetFrame);
-       KX_PYMETHOD_DOC_NOARGS(BL_ShapeActionActuator,GetProperty);
-       KX_PYMETHOD_DOC_NOARGS(BL_ShapeActionActuator,GetFrameProperty);
-//     KX_PYMETHOD(BL_ActionActuator,GetChannel);
-       KX_PYMETHOD_DOC_NOARGS(BL_ShapeActionActuator,GetType);
-       KX_PYMETHOD_DOC_VARARGS(BL_ShapeActionActuator,SetType);
-
-       virtual PyObject* py_getattro(PyObject* attr);
-       virtual PyObject*               py_getattro_dict();
-       virtual int py_setattro(PyObject* attr, PyObject* value);
-
        static PyObject*        pyattr_get_action(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef);
        static int                      pyattr_set_action(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef, PyObject *value);