Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMitchell Stokes <mogurijin@gmail.com>2012-08-08 05:24:48 +0400
committerMitchell Stokes <mogurijin@gmail.com>2012-08-08 05:24:48 +0400
commit843b45cafa618cd6230a16ca13f24860b3301b39 (patch)
treea060fd0e5e36b7c84c7d140b42847234ac2c13c0 /source/gameengine/Ketsji/KX_GameObject.h
parente9d73dbba5a8a3e2c118eb63f9cdd0655aec3ac8 (diff)
Diffstat (limited to 'source/gameengine/Ketsji/KX_GameObject.h')
-rw-r--r--source/gameengine/Ketsji/KX_GameObject.h11
1 files changed, 11 insertions, 0 deletions
diff --git a/source/gameengine/Ketsji/KX_GameObject.h b/source/gameengine/Ketsji/KX_GameObject.h
index 2b0d13ff2f7..569a4a2b2a1 100644
--- a/source/gameengine/Ketsji/KX_GameObject.h
+++ b/source/gameengine/Ketsji/KX_GameObject.h
@@ -98,6 +98,10 @@ protected:
bool m_bIsNegativeScaling;
MT_Vector4 m_objectColor;
+ // Bit fields for user control over physics collisions
+ short m_userCollisionGroup;
+ short m_userCollisionMask;
+
// visible = user setting
// culled = while rendering, depending on camera
bool m_bVisible;
@@ -464,6 +468,13 @@ public:
* @add/remove the graphic controller to the physic system
*/
void ActivateGraphicController(bool recurse);
+
+ void SetUserCollisionGroup(short filter);
+ void SetUserCollisionMask(short mask);
+ /**
+ * Extra broadphase check for user controllable collisions
+ */
+ bool CheckCollision(KX_GameObject *other);
/**
* \section Coordinate system manipulation functions