diff options
author | Robert Adams | 2014-08-21 06:33:04 -0700 |
---|---|---|
committer | Robert Adams | 2014-08-21 06:33:04 -0700 |
commit | 674be7222568ff719f082564d02cb68811adcd7f (patch) | |
tree | 8c1b27daf3d13c3bd8972278dd0f0ce1a2a17ca4 /OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs | |
parent | BulletSim: Windows and Linux 32 and 64 bit versions of Bullet 2.82 (diff) | |
download | opensim-SC-674be7222568ff719f082564d02cb68811adcd7f.zip opensim-SC-674be7222568ff719f082564d02cb68811adcd7f.tar.gz opensim-SC-674be7222568ff719f082564d02cb68811adcd7f.tar.bz2 opensim-SC-674be7222568ff719f082564d02cb68811adcd7f.tar.xz |
BulletSim: add new Bullet 2.82 constraint type codes and rename the
BulletSim fixed constraint to not be confused with the native version.
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs')
-rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs b/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs index be6f152..0458cd9 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs | |||
@@ -43,9 +43,11 @@ public enum ConstraintType : int | |||
43 | SLIDER_CONSTRAINT_TYPE, | 43 | SLIDER_CONSTRAINT_TYPE, |
44 | CONTACT_CONSTRAINT_TYPE, | 44 | CONTACT_CONSTRAINT_TYPE, |
45 | D6_SPRING_CONSTRAINT_TYPE, | 45 | D6_SPRING_CONSTRAINT_TYPE, |
46 | GEAR_CONSTRAINT_TYPE, // added in Bullet 2.82 | ||
47 | FIXED_CONSTRAINT_TYPE, // added in Bullet 2.82 | ||
46 | MAX_CONSTRAINT_TYPE, // last type defined by Bullet | 48 | MAX_CONSTRAINT_TYPE, // last type defined by Bullet |
47 | // | 49 | // |
48 | FIXED_CONSTRAINT_TYPE = 1234 // BulletSim constraint that is fixed and unmoving | 50 | BS_FIXED_CONSTRAINT_TYPE = 1234 // BulletSim constraint that is fixed and unmoving |
49 | } | 51 | } |
50 | 52 | ||
51 | // =============================================================================== | 53 | // =============================================================================== |