diff options
author | Robert Adams | 2013-07-22 12:07:42 -0700 |
---|---|---|
committer | Robert Adams | 2013-07-22 12:07:42 -0700 |
commit | 84d0699761b8da546f9faef084240d7b15f16321 (patch) | |
tree | 3710604cbb3d3db2d7207ca85abcd9bb8cc87e51 /OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs | |
parent | BulletSim: Add logic to linksets to change physical properties for (diff) | |
download | opensim-SC-84d0699761b8da546f9faef084240d7b15f16321.zip opensim-SC-84d0699761b8da546f9faef084240d7b15f16321.tar.gz opensim-SC-84d0699761b8da546f9faef084240d7b15f16321.tar.bz2 opensim-SC-84d0699761b8da546f9faef084240d7b15f16321.tar.xz |
Revert "BulletSim: Add logic to linksets to change physical properties for"
The changes don't seem to be ready for prime time.
This reverts commit b44f0e1a00eba7f76401692322e48a3b23a81164.
Diffstat (limited to '')
-rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs | 24 |
1 files changed, 2 insertions, 22 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs index 960c0b4..78c0af7 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs | |||
@@ -309,14 +309,14 @@ public abstract class BSLinkset | |||
309 | } | 309 | } |
310 | ); | 310 | ); |
311 | } | 311 | } |
312 | public virtual void ComputeLocalInertia(OMV.Vector3 inertiaFactor) | 312 | public virtual void ComputeLocalInertia() |
313 | { | 313 | { |
314 | ForEachMember((member) => | 314 | ForEachMember((member) => |
315 | { | 315 | { |
316 | if (member.PhysBody.HasPhysicalBody) | 316 | if (member.PhysBody.HasPhysicalBody) |
317 | { | 317 | { |
318 | OMV.Vector3 inertia = m_physicsScene.PE.CalculateLocalInertia(member.PhysShape.physShapeInfo, member.Mass); | 318 | OMV.Vector3 inertia = m_physicsScene.PE.CalculateLocalInertia(member.PhysShape.physShapeInfo, member.Mass); |
319 | member.Inertia = inertia * inertiaFactor; | 319 | member.Inertia = inertia * BSParam.VehicleInertiaFactor; |
320 | m_physicsScene.PE.SetMassProps(member.PhysBody, member.Mass, member.Inertia); | 320 | m_physicsScene.PE.SetMassProps(member.PhysBody, member.Mass, member.Inertia); |
321 | m_physicsScene.PE.UpdateInertiaTensor(member.PhysBody); | 321 | m_physicsScene.PE.UpdateInertiaTensor(member.PhysBody); |
322 | } | 322 | } |
@@ -324,26 +324,6 @@ public abstract class BSLinkset | |||
324 | } | 324 | } |
325 | ); | 325 | ); |
326 | } | 326 | } |
327 | public virtual void SetPhysicalCollisionFlags(CollisionFlags collFlags) | ||
328 | { | ||
329 | ForEachMember((member) => | ||
330 | { | ||
331 | if (member.PhysBody.HasPhysicalBody) | ||
332 | m_physicsScene.PE.SetCollisionFlags(member.PhysBody, collFlags); | ||
333 | return false; // 'false' says to continue looping | ||
334 | } | ||
335 | ); | ||
336 | } | ||
337 | public virtual void RemoveFromPhysicalCollisionFlags(CollisionFlags collFlags) | ||
338 | { | ||
339 | ForEachMember((member) => | ||
340 | { | ||
341 | if (member.PhysBody.HasPhysicalBody) | ||
342 | m_physicsScene.PE.RemoveFromCollisionFlags(member.PhysBody, collFlags); | ||
343 | return false; // 'false' says to continue looping | ||
344 | } | ||
345 | ); | ||
346 | } | ||
347 | // ================================================================ | 327 | // ================================================================ |
348 | protected virtual float ComputeLinksetMass() | 328 | protected virtual float ComputeLinksetMass() |
349 | { | 329 | { |