diff options
| author | Erwin Coumans <blender@erwincoumans.com> | 2008-09-29 07:09:03 +0400 |
|---|---|---|
| committer | Erwin Coumans <blender@erwincoumans.com> | 2008-09-29 07:09:03 +0400 |
| commit | 0b622fc07f1a19c4fbc72782f6000814b66b2088 (patch) | |
| tree | a0cc270ca6238e42acb5845e1f735e07d9c55be8 /source/blender/src/buttons_logic.c | |
| parent | 25fc47aaf2a7898b81eb4617a1cd877832d675c2 (diff) | |
added anisotropic friction support for Bullet. Both for static and dynamic objects
Diffstat (limited to 'source/blender/src/buttons_logic.c')
| -rw-r--r-- | source/blender/src/buttons_logic.c | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/source/blender/src/buttons_logic.c b/source/blender/src/buttons_logic.c index 58fb2d456b9..3d6a82aef57 100644 --- a/source/blender/src/buttons_logic.c +++ b/source/blender/src/buttons_logic.c @@ -3072,6 +3072,25 @@ static uiBlock *advanced_bullet_menu(void *arg_ob) xco, yco, 118, 19, &ob->margin, 0.0, 1.0, 1, 0, "Collision margin"); } + uiDefButBitI(block, TOG, OB_ANISOTROPIC_FRICTION, B_REDR, "Anisotropic", + xco+120, yco, 120, 19, + &ob->gameflag, 0.0, 1.0, 10, 0, + "Enable anisotropic friction"); + + yco-=25; + + if (ob->gameflag & OB_ANISOTROPIC_FRICTION) { + uiDefButF(block, NUM, 0, "X:", + xco, yco, 80, 19,&ob->anisotropicFriction[0], 0.0, 1.0, 10, 0, + "Relative friction coefficient in the x-direction."); + uiDefButF(block, NUM, 0, "Y:", + xco+80, yco, 80, 19,&ob->anisotropicFriction[1], 0.0, 1.0, 10, 0, + "Relative friction coefficient in the y-direction."); + uiDefButF(block, NUM, 0, "Z:", + xco+160, yco, 80, 19,&ob->anisotropicFriction[2], 0.0, 1.0, 10, 0, + "Relative friction coefficient in the z-direction."); + } + } uiBlockSetDirection(block, UI_TOP); @@ -3110,6 +3129,9 @@ void buttons_bullet(uiBlock *block, Object *ob) uiBlockSetCol(block, TH_BUT_SETTING2); uiBlockBeginAlign(block); + + + uiDefButBitI(block, TOG, OB_GHOST, 0, "Ghost", 10, 182, 60, 19, &ob->gameflag, 0, 0, 0, 0, "Objects that don't restitute collisions (like a ghost)"); |