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

BulletSim: properly set mesh hash key in use tracking structure. 

Shouldn't see any functional difference.
user_profiles
Robert Adams 2013-05-24 16:23:10 -07:00
parent 81a6c39781
commit 4979940def
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
View File

@ -578,7 +578,6 @@ public class BSShapeHull : BSShape
PrimitiveBaseShape pbs, OMV.Vector3 size, float lod) PrimitiveBaseShape pbs, OMV.Vector3 size, float lod)
{ {
BulletShape newShape = new BulletShape(); BulletShape newShape = new BulletShape();
newShape.shapeKey = newHullKey;
IMesh meshData = null; IMesh meshData = null;
List<List<OMV.Vector3>> allHulls = null; List<List<OMV.Vector3>> allHulls = null;
@ -782,6 +781,7 @@ public class BSShapeHull : BSShape
// create the hull data structure in Bullet // create the hull data structure in Bullet
newShape = physicsScene.PE.CreateHullShape(physicsScene.World, hullCount, convHulls); newShape = physicsScene.PE.CreateHullShape(physicsScene.World, hullCount, convHulls);
} }
newShape.shapeKey = newHullKey;
return newShape; return newShape;
} }
// Callback from convex hull creater with a newly created hull. // Callback from convex hull creater with a newly created hull.
@ -906,6 +906,7 @@ public class BSShapeCompound : BSShape
} }
else else
{ {
// Didn't find it in the lists of specific types. It could be compound.
if (physicsScene.PE.IsCompound(pShape)) if (physicsScene.PE.IsCompound(pShape))
{ {
BSShapeCompound recursiveCompound = new BSShapeCompound(pShape); BSShapeCompound recursiveCompound = new BSShapeCompound(pShape);
@ -913,6 +914,7 @@ public class BSShapeCompound : BSShape
} }
else else
{ {
// If none of the above, maybe it is a simple native shape.
if (physicsScene.PE.IsNativeShape(pShape)) if (physicsScene.PE.IsNativeShape(pShape))
{ {
BSShapeNative nativeShape = new BSShapeNative(pShape); BSShapeNative nativeShape = new BSShapeNative(pShape);
@ -1052,6 +1054,7 @@ public class BSShapeGImpact : BSShape
// Check to see if mesh was created (might require an asset). // Check to see if mesh was created (might require an asset).
newShape = VerifyMeshCreated(physicsScene, newShape, prim); newShape = VerifyMeshCreated(physicsScene, newShape, prim);
newShape.shapeKey = newMeshKey;
if (!newShape.isNativeShape || prim.PrimAssetState == BSPhysObject.PrimAssetCondition.Failed) if (!newShape.isNativeShape || prim.PrimAssetState == BSPhysObject.PrimAssetCondition.Failed)
{ {
// If a mesh was what was created, remember the built shape for later sharing. // If a mesh was what was created, remember the built shape for later sharing.