diff options
| author | Porteries Tristan <republicthunderbolt9@gmail.com> | 2015-04-19 02:01:17 +0300 |
|---|---|---|
| committer | Jorge Bernal <jbernalmartinez@gmail.com> | 2015-04-19 02:04:22 +0300 |
| commit | 3d55859924713aada6f35ca7d9a0ed270bdad08b (patch) | |
| tree | b9abe00295c2e3002e92e25455170dc13c8e9afe /source/blender | |
| parent | a2f9a0cfd940049f22cb89a8812629948a3580ae (diff) | |
BGE: Support for collision group/mask from the api + activated on EndObject.
A Python API for the collision group / mask has been added:
```
KX_GameObject.collisionGroup
KX_GameObject.collisionMask
```
The maximum number of collision groups and masked has been increased from eight to sixteen.
This means that the max value of collisionGroup/Mask is (2 ** 16) - 1
EndObject will now activate objects that were sleeping and colliding with the removed object.
This means that, unlike now, if a rigid body starts sleeping on top of another object, when the latter is removed the rigid body will activate and fall, rather than float midair as before.
Collision groups that do not intersect used to collide on the first frame. Now this has been fixed so that they collide appropriately.
Thanks to agoose77 for his help.
Reviewers: scorpion81, hg1, agoose77, sergof
Reviewed By: agoose77, sergof
Subscribers: sergof, moguri
Projects: #game_physics, #game_engine
Differential Revision: https://developer.blender.org/D1243
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/blenkernel/intern/object.c | 2 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_object_types.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index c485e00ed69..f14f72614f4 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -1048,7 +1048,7 @@ Object *BKE_object_add_only_object(Main *bmain, int type, const char *name) ob->jump_speed = 10.0f; ob->fall_speed = 55.0f; ob->col_group = 0x01; - ob->col_mask = 0xff; + ob->col_mask = 0xffff; /* NT fluid sim defaults */ ob->fluidsimSettings = NULL; diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h index 286461f1b69..8bd676caa5e 100644 --- a/source/blender/makesdna/DNA_object_types.h +++ b/source/blender/makesdna/DNA_object_types.h @@ -530,7 +530,7 @@ enum { #define OB_MAX_STATES 30 /* collision masks */ -#define OB_MAX_COL_MASKS 8 +#define OB_MAX_COL_MASKS 16 /* ob->gameflag */ enum { |