diff options
author | Robert Adams | 2017-09-03 17:15:27 -0700 |
---|---|---|
committer | Robert Adams | 2017-09-03 17:15:27 -0700 |
commit | f348f7fa90cf4784e0e173c122594ecc145d3bb8 (patch) | |
tree | c9eaa6f51f9af16935e48a2130dc340d8a8fbcfb /OpenSim/Region/PhysicsModules/BulletS/BSShapeCollection.cs | |
parent | BulletSim; Update BulletSim.dll's and so's for raycast. (diff) | |
download | opensim-SC-f348f7fa90cf4784e0e173c122594ecc145d3bb8.zip opensim-SC-f348f7fa90cf4784e0e173c122594ecc145d3bb8.tar.gz opensim-SC-f348f7fa90cf4784e0e173c122594ecc145d3bb8.tar.bz2 opensim-SC-f348f7fa90cf4784e0e173c122594ecc145d3bb8.tar.xz |
BulletSim: first version of raycast. Only single contact point and no
filtering.
Diffstat (limited to '')
-rwxr-xr-x | OpenSim/Region/PhysicsModules/BulletS/BSShapeCollection.cs | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/OpenSim/Region/PhysicsModules/BulletS/BSShapeCollection.cs b/OpenSim/Region/PhysicsModules/BulletS/BSShapeCollection.cs index cda33e4..86bf23f 100755 --- a/OpenSim/Region/PhysicsModules/BulletS/BSShapeCollection.cs +++ b/OpenSim/Region/PhysicsModules/BulletS/BSShapeCollection.cs | |||
@@ -75,8 +75,6 @@ public sealed class BSShapeCollection : IDisposable | |||
75 | // Called at taint-time. | 75 | // Called at taint-time. |
76 | public bool GetBodyAndShape(bool forceRebuild, BulletWorld sim, BSPhysObject prim, PhysicalDestructionCallback bodyCallback) | 76 | public bool GetBodyAndShape(bool forceRebuild, BulletWorld sim, BSPhysObject prim, PhysicalDestructionCallback bodyCallback) |
77 | { | 77 | { |
78 | m_physicsScene.AssertNotInSimulationTime("BSShapeCollection.GetBodyAndShape"); | ||
79 | |||
80 | bool ret = false; | 78 | bool ret = false; |
81 | 79 | ||
82 | // This lock could probably be pushed down lower but building shouldn't take long | 80 | // This lock could probably be pushed down lower but building shouldn't take long |
@@ -346,8 +344,6 @@ public sealed class BSShapeCollection : IDisposable | |||
346 | if (!body.HasPhysicalBody) | 344 | if (!body.HasPhysicalBody) |
347 | return; | 345 | return; |
348 | 346 | ||
349 | m_physicsScene.AssertNotInSimulationTime("BSShapeCollection.DereferenceBody"); | ||
350 | |||
351 | lock (m_collectionActivityLock) | 347 | lock (m_collectionActivityLock) |
352 | { | 348 | { |
353 | if (DDetail) DetailLog("{0},BSShapeCollection.DereferenceBody,DestroyingBody,body={1}", body.ID, body); | 349 | if (DDetail) DetailLog("{0},BSShapeCollection.DereferenceBody,DestroyingBody,body={1}", body.ID, body); |