aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs13
1 files changed, 8 insertions, 5 deletions
diff --git a/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs b/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs
index 1fa759c..144ad53 100644
--- a/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs
+++ b/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs
@@ -319,7 +319,10 @@ namespace OpenSim.Region.Physics.BulletXPlugin
319 { 319 {
320 int[] indexBase; 320 int[] indexBase;
321 Vector3[] vertexBase; 321 Vector3[] vertexBase;
322 Vector3 vNormal, vP1, vP2, vP3; 322 Vector3 vNormal;
323 // Vector3 vP1;
324 // Vector3 vP2;
325 // Vector3 vP3;
323 IMesh mesh = primB.GetMesh(); 326 IMesh mesh = primB.GetMesh();
324 327
325 float fdistance; 328 float fdistance;
@@ -484,7 +487,7 @@ namespace OpenSim.Region.Physics.BulletXPlugin
484 internal Dictionary<RigidBody, BulletXPrim> _prims = new Dictionary<RigidBody, BulletXPrim>(); 487 internal Dictionary<RigidBody, BulletXPrim> _prims = new Dictionary<RigidBody, BulletXPrim>();
485 488
486 public IMesher mesher; 489 public IMesher mesher;
487 private IConfigSource m_config; 490 // private IConfigSource m_config;
488 491
489 492
490 public static float Gravity 493 public static float Gravity
@@ -541,7 +544,7 @@ namespace OpenSim.Region.Physics.BulletXPlugin
541 public override void Initialise(IMesher meshmerizer, IConfigSource config) 544 public override void Initialise(IMesher meshmerizer, IConfigSource config)
542 { 545 {
543 mesher = meshmerizer; 546 mesher = meshmerizer;
544 m_config = config; 547 // m_config = config;
545 } 548 }
546 549
547 public override void Dispose() 550 public override void Dispose()
@@ -1685,7 +1688,7 @@ namespace OpenSim.Region.Physics.BulletXPlugin
1685// private PhysicsVector _staticVelocity; 1688// private PhysicsVector _staticVelocity;
1686// private AxiomQuaternion _staticOrientation; 1689// private AxiomQuaternion _staticOrientation;
1687 private float _mass; 1690 private float _mass;
1688 private BulletXScene _parentscene; 1691 // private BulletXScene _parentscene;
1689 internal float[] _heightField; 1692 internal float[] _heightField;
1690 private RigidBody _flatPlanet; 1693 private RigidBody _flatPlanet;
1691 1694
@@ -1700,7 +1703,7 @@ namespace OpenSim.Region.Physics.BulletXPlugin
1700// _staticVelocity = new PhysicsVector(); 1703// _staticVelocity = new PhysicsVector();
1701// _staticOrientation = AxiomQuaternion.Identity; 1704// _staticOrientation = AxiomQuaternion.Identity;
1702 _mass = 0; //No active 1705 _mass = 0; //No active
1703 _parentscene = parent_scene; 1706 // _parentscene = parent_scene;
1704 _heightField = heightField; 1707 _heightField = heightField;
1705 1708
1706 float _linearDamping = 0.0f; 1709 float _linearDamping = 0.0f;