From ae4d932e7f00e781db9c9cdd5c29efc51e2425fb Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Fri, 21 Dec 2012 13:35:44 -0800
Subject: BulletSim: Move all the parameter variables, tables and get and fetch
 logic to a separate, static class for easier addition and to remove all that
 bulk from the BSScene class.

---
 .../Region/Physics/BulletSPlugin/BulletSimAPI.cs   | 68 +++++++++++-----------
 1 file changed, 35 insertions(+), 33 deletions(-)

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

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs b/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs
index 962b540..7857eaa 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs
@@ -141,6 +141,8 @@ public struct EntityProperties
 }
 
 // Format of this structure must match the definition in the C++ code
+// NOTE: adding the X causes compile breaks if used. These are unused symbols
+//      that can be removed from both here and the unmanaged definition of this structure.
 [StructLayout(LayoutKind.Sequential)]
 public struct ConfigurationParameters
 {
@@ -150,31 +152,31 @@ public struct ConfigurationParameters
     public float collisionMargin;
     public float gravity;
 
-    public float linearDamping;
-    public float angularDamping;
-    public float deactivationTime;
-    public float linearSleepingThreshold;
-    public float angularSleepingThreshold;
-	public float ccdMotionThreshold;
-	public float ccdSweptSphereRadius;
-    public float contactProcessingThreshold;
-
-    public float terrainImplementation;
-    public float terrainFriction;
-    public float terrainHitFraction;
-    public float terrainRestitution;
-    public float terrainCollisionMargin;
-
-    public float avatarFriction;
-    public float avatarStandingFriction;
-    public float avatarDensity;
-    public float avatarRestitution;
-    public float avatarCapsuleWidth;
-    public float avatarCapsuleDepth;
-    public float avatarCapsuleHeight;
-	public float avatarContactProcessingThreshold;
-
-    public float vehicleAngularDamping;
+    public float XlinearDamping;
+    public float XangularDamping;
+    public float XdeactivationTime;
+    public float XlinearSleepingThreshold;
+    public float XangularSleepingThreshold;
+	public float XccdMotionThreshold;
+	public float XccdSweptSphereRadius;
+    public float XcontactProcessingThreshold;
+
+    public float XterrainImplementation;
+    public float XterrainFriction;
+    public float XterrainHitFraction;
+    public float XterrainRestitution;
+    public float XterrainCollisionMargin;
+
+    public float XavatarFriction;
+    public float XavatarStandingFriction;
+    public float XavatarDensity;
+    public float XavatarRestitution;
+    public float XavatarCapsuleWidth;
+    public float XavatarCapsuleDepth;
+    public float XavatarCapsuleHeight;
+	public float XavatarContactProcessingThreshold;
+
+    public float XvehicleAngularDamping;
 
 	public float maxPersistantManifoldPoolSize;
 	public float maxCollisionAlgorithmPoolSize;
@@ -185,14 +187,14 @@ public struct ConfigurationParameters
 	public float shouldEnableFrictionCaching;
 	public float numberOfSolverIterations;
 
-    public float linksetImplementation;
-    public float linkConstraintUseFrameOffset;
-    public float linkConstraintEnableTransMotor;
-    public float linkConstraintTransMotorMaxVel;
-    public float linkConstraintTransMotorMaxForce;
-    public float linkConstraintERP;
-    public float linkConstraintCFM;
-    public float linkConstraintSolverIterations;
+    public float XlinksetImplementation;
+    public float XlinkConstraintUseFrameOffset;
+    public float XlinkConstraintEnableTransMotor;
+    public float XlinkConstraintTransMotorMaxVel;
+    public float XlinkConstraintTransMotorMaxForce;
+    public float XlinkConstraintERP;
+    public float XlinkConstraintCFM;
+    public float XlinkConstraintSolverIterations;
 
     public float physicsLoggingFrames;
 
-- 
cgit v1.1