Blender Git Loki
Git Commits -> Revision 3bf9bb3
Revision 3bf9bb3 by Mitchell Stokes (master) October 30, 2012, 15:44 (GMT) |
BGE: Adding support for Bullet's collision masks. Each object now has a collision mask and a collision group. Object A and object B collide if object A's groups is in object B's mask and object B's group is in object A's mask. In other words, the group defines what the object is (collision wise) and the group defines what the object can collide with. The majority of this patch was provided by Kupoman with some edits from me and heavy testing by z0r. |
Commit Details:
Full Hash: 3bf9bb3b13521c8bba4d559f308c5b2c04973df8
SVN Revision: 51769
Parent Commit: 5753ede
Lines Changed: +150, -3
9 Modified Paths:
/release/scripts/startup/bl_ui/properties_game.py (+8, -0) (Diff)
/source/blender/blenkernel/intern/object.c (+3, -1) (Diff)
/source/blender/blenloader/intern/readfile.c (+10, -0) (Diff)
/source/blender/makesdna/DNA_object_types.h (+6, -0) (Diff)
/source/blender/makesrna/intern/rna_object.c (+70, -0) (Diff)
/source/gameengine/Converter/BL_BlenderDataConversion.cpp (+9, -1) (Diff)
/source/gameengine/Ketsji/KX_GameObject.cpp (+13, -0) (Diff)
/source/gameengine/Ketsji/KX_GameObject.h (+11, -0) (Diff)
/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp (+20, -1) (Diff)
/source/blender/blenkernel/intern/object.c (+3, -1) (Diff)
/source/blender/blenloader/intern/readfile.c (+10, -0) (Diff)
/source/blender/makesdna/DNA_object_types.h (+6, -0) (Diff)
/source/blender/makesrna/intern/rna_object.c (+70, -0) (Diff)
/source/gameengine/Converter/BL_BlenderDataConversion.cpp (+9, -1) (Diff)
/source/gameengine/Ketsji/KX_GameObject.cpp (+13, -0) (Diff)
/source/gameengine/Ketsji/KX_GameObject.h (+11, -0) (Diff)
/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp (+20, -1) (Diff)
Master Commits
MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021