diff options
author | Robert Adams | 2012-12-29 08:03:57 -0800 |
---|---|---|
committer | Robert Adams | 2012-12-29 08:03:57 -0800 |
commit | db6c0363f05db8b2a180eff04db9138a378d227f (patch) | |
tree | f5bb7eb9bb396c3d8c05066aa9da5b7bbf026b1b /OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs | |
parent | BulletSim: update values in OpenSimDefaults.ini to reflect the values really ... (diff) | |
download | opensim-SC_OLD-db6c0363f05db8b2a180eff04db9138a378d227f.zip opensim-SC_OLD-db6c0363f05db8b2a180eff04db9138a378d227f.tar.gz opensim-SC_OLD-db6c0363f05db8b2a180eff04db9138a378d227f.tar.bz2 opensim-SC_OLD-db6c0363f05db8b2a180eff04db9138a378d227f.tar.xz |
BulletSim: tweeking avatar capsule code in an attempt to have
asymmetrical avatar capsule work now that rotation is being passed
from the simulator. Turns out the Bullet capsule is just not very
functional: it doesn't scale properly, the implementation only half
does asymmetry and, in general, is hard to work with.
Avatar shape is about what it was before these changes.
Added initial data structures for avatar shape mesh.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs b/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs index eb4d039..b909b38 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs | |||
@@ -69,6 +69,7 @@ public enum BSPhysicsShapeType | |||
69 | SHAPE_TERRAIN = 21, | 69 | SHAPE_TERRAIN = 21, |
70 | SHAPE_COMPOUND = 22, | 70 | SHAPE_COMPOUND = 22, |
71 | SHAPE_HEIGHTMAP = 23, | 71 | SHAPE_HEIGHTMAP = 23, |
72 | SHAPE_AVATAR = 24, | ||
72 | }; | 73 | }; |
73 | 74 | ||
74 | // The native shapes have predefined shape hash keys | 75 | // The native shapes have predefined shape hash keys |
@@ -79,7 +80,8 @@ public enum FixedShapeKey : ulong | |||
79 | KEY_SPHERE = 2, | 80 | KEY_SPHERE = 2, |
80 | KEY_CONE = 3, | 81 | KEY_CONE = 3, |
81 | KEY_CYLINDER = 4, | 82 | KEY_CYLINDER = 4, |
82 | KEY_CAPSULE = 5, | 83 | KEY_CAPSULE = 5, |
84 | KEY_AVATAR = 6, | ||
83 | } | 85 | } |
84 | 86 | ||
85 | [StructLayout(LayoutKind.Sequential)] | 87 | [StructLayout(LayoutKind.Sequential)] |