diff options
| author | Kester Maddock <Christopher.Maddock.1@uni.massey.ac.nz> | 2004-04-11 06:50:02 +0400 |
|---|---|---|
| committer | Kester Maddock <Christopher.Maddock.1@uni.massey.ac.nz> | 2004-04-11 06:50:02 +0400 |
| commit | ae9233a5b05ebfc925fd542afbdb3bb9220ed65c (patch) | |
| tree | 46ed278ee54325ca98540163edf9ea5dd4a88c7f /source/gameengine/Ketsji/KX_ClientObjectInfo.h | |
| parent | d3e88eae711e2fd5d678ed555268647e28a9fc18 (diff) | |
1. Check material names passed to the physics engine (for collision sensors.)
Consider:
gameobj->getClientInfo()->m_auxilary_info = (matname ? (void*)(matname+2) : NULL);
It works if matname is "MAblah", but not if matname is "".
2. Added constructor for struct RAS_CameraData.
3. Added initializers to the struct KX_ClientObjectInfo constructor
4. Collision sensors won't detect near sensors.
5. A stack of minor tweaks, adjusting whitespace, using ++it for stl stuff.
Diffstat (limited to 'source/gameengine/Ketsji/KX_ClientObjectInfo.h')
| -rw-r--r-- | source/gameengine/Ketsji/KX_ClientObjectInfo.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/source/gameengine/Ketsji/KX_ClientObjectInfo.h b/source/gameengine/Ketsji/KX_ClientObjectInfo.h index 51cb19e8935..0ef1a1b86fe 100644 --- a/source/gameengine/Ketsji/KX_ClientObjectInfo.h +++ b/source/gameengine/Ketsji/KX_ClientObjectInfo.h @@ -37,7 +37,7 @@ */ struct KX_ClientObjectInfo { - enum { + enum clienttype { STATIC, ACTOR, RESERVED1, @@ -47,9 +47,13 @@ struct KX_ClientObjectInfo void* m_clientobject; void* m_auxilary_info; public: - KX_ClientObjectInfo(void *clientobject) : - m_clientobject(clientobject) + KX_ClientObjectInfo(void *clientobject, clienttype type = STATIC, void *auxilary_info = NULL) : + m_type(type), + m_clientobject(clientobject), + m_auxilary_info(auxilary_info) {} + + bool isActor() { return m_type <= ACTOR; } }; #endif //__KX_CLIENTOBJECT_INFO_H |