OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

BulletSim: code for creating the avatar capsule shape.

user_profiles
Robert Adams 2013-04-28 14:55:46 -07:00
parent e5582939fd
commit 2da8e60b6d
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
View File

@ -131,6 +131,17 @@ public sealed class BSShapeCollection : IDisposable
bool nativeShapePossible = true; bool nativeShapePossible = true;
PrimitiveBaseShape pbs = prim.BaseShape; PrimitiveBaseShape pbs = prim.BaseShape;
// Kludge to create the capsule for the avatar.
BSCharacter theChar = prim as BSCharacter;
if (theChar != null)
{
DereferenceExistingShape(prim, shapeCallback);
prim.PhysShape = BSShapeNative.GetReference(m_physicsScene, prim,
BSPhysicsShapeType.SHAPE_CAPSULE, FixedShapeKey.KEY_CAPSULE);
ret = true;
haveShape = true;
}
// If the prim attributes are simple, this could be a simple Bullet native shape // If the prim attributes are simple, this could be a simple Bullet native shape
// Native shapes work whether to object is static or physical. // Native shapes work whether to object is static or physical.
if (!haveShape if (!haveShape
@ -160,6 +171,7 @@ public sealed class BSShapeCollection : IDisposable
DereferenceExistingShape(prim, shapeCallback); DereferenceExistingShape(prim, shapeCallback);
prim.PhysShape = BSShapeNative.GetReference(m_physicsScene, prim, prim.PhysShape = BSShapeNative.GetReference(m_physicsScene, prim,
BSPhysicsShapeType.SHAPE_SPHERE, FixedShapeKey.KEY_SPHERE); BSPhysicsShapeType.SHAPE_SPHERE, FixedShapeKey.KEY_SPHERE);
ret = true;
} }
if (DDetail) DetailLog("{0},BSShapeCollection.CreateGeom,sphere,force={1},rebuilt={2},shape={3}", if (DDetail) DetailLog("{0},BSShapeCollection.CreateGeom,sphere,force={1},rebuilt={2},shape={3}",
prim.LocalID, forceRebuild, ret, prim.PhysShape); prim.LocalID, forceRebuild, ret, prim.PhysShape);
@ -176,6 +188,7 @@ public sealed class BSShapeCollection : IDisposable
DereferenceExistingShape(prim, shapeCallback); DereferenceExistingShape(prim, shapeCallback);
prim.PhysShape = BSShapeNative.GetReference(m_physicsScene, prim, prim.PhysShape = BSShapeNative.GetReference(m_physicsScene, prim,
BSPhysicsShapeType.SHAPE_BOX, FixedShapeKey.KEY_BOX); BSPhysicsShapeType.SHAPE_BOX, FixedShapeKey.KEY_BOX);
ret = true;
} }
if (DDetail) DetailLog("{0},BSShapeCollection.CreateGeom,box,force={1},rebuilt={2},shape={3}", if (DDetail) DetailLog("{0},BSShapeCollection.CreateGeom,box,force={1},rebuilt={2},shape={3}",
prim.LocalID, forceRebuild, ret, prim.PhysShape); prim.LocalID, forceRebuild, ret, prim.PhysShape);