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

BulletSim: fix regression that caused cylindar shapes to have a box collision shape

connector_plugin
Robert Adams 2012-09-21 10:40:14 -07:00
parent 22290ef35a
commit 42802669dd
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
View File

@ -1091,7 +1091,14 @@ public sealed class BSPrim : BSPhysObject
bool haveShape = false; bool haveShape = false;
// 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
if ((_pbs.SculptEntry && !PhysicsScene.ShouldMeshSculptedPrim) if (
// if the basic shape is a cube or a sphere...
((_pbs.ProfileShape == ProfileShape.Square && _pbs.PathCurve == (byte)Extrusion.Straight)
|| (_pbs.ProfileShape == ProfileShape.HalfCircle && _pbs.PathCurve == (byte)Extrusion.Curve1
/* && _pbs.Scale.X == _pbs.Scale.Y && _pbs.Scale.Y == _pbs.Scale.Z */ ))
// ... and we are not doing sculpty meshes...
&& (_pbs.SculptEntry && !PhysicsScene.ShouldMeshSculptedPrim)
// ... or this is a 'simple' shape...
|| (_pbs.ProfileBegin == 0 && _pbs.ProfileEnd == 0 || (_pbs.ProfileBegin == 0 && _pbs.ProfileEnd == 0
&& _pbs.ProfileHollow == 0 && _pbs.ProfileHollow == 0
&& _pbs.PathTwist == 0 && _pbs.PathTwistBegin == 0 && _pbs.PathTwist == 0 && _pbs.PathTwistBegin == 0
@ -1099,6 +1106,7 @@ public sealed class BSPrim : BSPhysObject
&& _pbs.PathTaperX == 0 && _pbs.PathTaperY == 0 && _pbs.PathTaperX == 0 && _pbs.PathTaperY == 0
&& _pbs.PathScaleX == 100 && _pbs.PathScaleY == 100 && _pbs.PathScaleX == 100 && _pbs.PathScaleY == 100
&& _pbs.PathShearX == 0 && _pbs.PathShearY == 0) ) && _pbs.PathShearX == 0 && _pbs.PathShearY == 0) )
// ... then this might be representable as a native Bullet collision shape
{ {
if (_pbs.ProfileShape == ProfileShape.HalfCircle && _pbs.PathCurve == (byte)Extrusion.Curve1) if (_pbs.ProfileShape == ProfileShape.HalfCircle && _pbs.PathCurve == (byte)Extrusion.Curve1)
{ {