From f499b328c44ef29d92aa2ef8102aad6ff5cbe336 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Tue, 23 Jul 2013 08:14:20 -0700
Subject: Revert "Revert "BulletSim: Add logic to linksets to change physical
 properties for"" Found that the vehicle movement problem was not caused by
 these physics changes.

This reverts commit 84d0699761b8da546f9faef084240d7b15f16321.
---
 OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs | 24 +++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs')

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs
index 78c0af7..960c0b4 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs
@@ -309,14 +309,14 @@ public abstract class BSLinkset
             }
         );
     }
-    public virtual void ComputeLocalInertia()
+    public virtual void ComputeLocalInertia(OMV.Vector3 inertiaFactor)
     {
         ForEachMember((member) =>
             {
                 if (member.PhysBody.HasPhysicalBody)
                 {
                     OMV.Vector3 inertia = m_physicsScene.PE.CalculateLocalInertia(member.PhysShape.physShapeInfo, member.Mass);
-                    member.Inertia = inertia * BSParam.VehicleInertiaFactor;
+                    member.Inertia = inertia * inertiaFactor;
                     m_physicsScene.PE.SetMassProps(member.PhysBody, member.Mass, member.Inertia);
                     m_physicsScene.PE.UpdateInertiaTensor(member.PhysBody);
                 }
@@ -324,6 +324,26 @@ public abstract class BSLinkset
             }
         );
     }
+    public virtual void SetPhysicalCollisionFlags(CollisionFlags collFlags)
+    {
+        ForEachMember((member) =>
+            {
+                if (member.PhysBody.HasPhysicalBody)
+                    m_physicsScene.PE.SetCollisionFlags(member.PhysBody, collFlags);
+                return false;   // 'false' says to continue looping
+            }
+        );
+    }
+    public virtual void RemoveFromPhysicalCollisionFlags(CollisionFlags collFlags)
+    {
+        ForEachMember((member) =>
+            {
+                if (member.PhysBody.HasPhysicalBody)
+                    m_physicsScene.PE.RemoveFromCollisionFlags(member.PhysBody, collFlags);
+                return false;   // 'false' says to continue looping
+            }
+        );
+    }
     // ================================================================
     protected virtual float ComputeLinksetMass()
     {
-- 
cgit v1.1