diff options
| author | Nick Samarin <nicks1987@bigmir.net> | 2011-02-16 20:07:18 +0300 |
|---|---|---|
| committer | Nick Samarin <nicks1987@bigmir.net> | 2011-02-16 20:07:18 +0300 |
| commit | c5f6a01dd5998976addd2085470bb73a150579e5 (patch) | |
| tree | 42b3345fb3ea2e7607a6d1eec379b8ce23b5ffbc /source/gameengine/Ketsji/KX_GameObject.h | |
| parent | 4cf62f1e7e2bb28b47f79e4bd7c1482ab742ebbd (diff) | |
| parent | 9e9e028f059f29d493dc020dda965a9bea8ffd6b (diff) | |
synched with trunk at revision 34793
Diffstat (limited to 'source/gameengine/Ketsji/KX_GameObject.h')
| -rw-r--r-- | source/gameengine/Ketsji/KX_GameObject.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/source/gameengine/Ketsji/KX_GameObject.h b/source/gameengine/Ketsji/KX_GameObject.h index 5d7f3948a61..4ca979786ae 100644 --- a/source/gameengine/Ketsji/KX_GameObject.h +++ b/source/gameengine/Ketsji/KX_GameObject.h @@ -36,6 +36,7 @@ #pragma warning (disable : 4355) #endif +#include <stddef.h> #include "ListValue.h" #include "SCA_IObject.h" @@ -61,7 +62,7 @@ class PHY_IPhysicsEnvironment; struct Object; class KX_ObstacleSimulation; -#ifndef DISABLE_PYTHON +#ifdef WITH_PYTHON /* utility conversion function */ bool ConvertPythonToGameObject(PyObject * value, KX_GameObject **object, bool py_none_ok, const char *error_prefix); #endif @@ -110,7 +111,7 @@ protected: MT_CmMatrix4x4 m_OpenGL_4x4Matrix; KX_ObstacleSimulation* m_pObstacleSimulation; - + public: bool m_isDeformable; @@ -119,7 +120,7 @@ public: */ static KX_GameObject* GetClientObject(KX_ClientObjectInfo* info); -#ifndef DISABLE_PYTHON +#ifdef WITH_PYTHON // Python attributes that wont convert into CValue // // there are 2 places attributes can be stored, in the CValue, @@ -798,20 +799,18 @@ public: { m_pObstacleSimulation = obstacleSimulation; } - + void UnregisterObstacle() { m_pObstacleSimulation = NULL; } - - + KX_ClientObjectInfo* getClientInfo() { return m_pClient_info; } CListValue* GetChildren(); CListValue* GetChildrenRecursive(); - -#ifndef DISABLE_PYTHON +#ifdef WITH_PYTHON /** * @section Python interface functions. */ @@ -871,6 +870,7 @@ public: static PyObject* pyattr_get_name(void* self_v, const KX_PYATTRIBUTE_DEF *attrdef); static PyObject* pyattr_get_parent(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef); + static PyObject* pyattr_get_life(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef); static PyObject* pyattr_get_mass(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef); static int pyattr_set_mass(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef, PyObject *value); static PyObject* pyattr_get_lin_vel_min(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef); |