aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Physics')
-rw-r--r--OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsActor.cs2
-rwxr-xr-xOpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs1
-rw-r--r--OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs4
-rwxr-xr-xOpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs2
-rwxr-xr-xOpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs2
-rw-r--r--OpenSim/Region/Physics/BulletSPlugin/BSScene.cs2
-rwxr-xr-xOpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs2
-rwxr-xr-xOpenSim/Region/Physics/BulletSPlugin/BSShapes.cs15
8 files changed, 25 insertions, 5 deletions
diff --git a/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsActor.cs b/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsActor.cs
index 0d17e0e..c1a37cc 100644
--- a/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsActor.cs
+++ b/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsActor.cs
@@ -36,8 +36,6 @@ namespace OpenSim.Region.Physics.BasicPhysicsPlugin
36{ 36{
37 public class BasicActor : PhysicsActor 37 public class BasicActor : PhysicsActor
38 { 38 {
39 private Vector3 _size;
40
41 public BasicActor(Vector3 size) 39 public BasicActor(Vector3 size)
42 { 40 {
43 Size = size; 41 Size = size;
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs b/OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs
index aca1ed4..f833d54 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs
@@ -2255,7 +2255,6 @@ private sealed class BulletConstraintXNA : BulletConstraint
2255 world.LastCollisionDesc = 0; 2255 world.LastCollisionDesc = 0;
2256 world.LastEntityProperty = 0; 2256 world.LastEntityProperty = 0;
2257 numSimSteps = world.StepSimulation(timeStep, m_maxSubSteps, m_fixedTimeStep); 2257 numSimSteps = world.StepSimulation(timeStep, m_maxSubSteps, m_fixedTimeStep);
2258 int updates = 0;
2259 2258
2260 PersistentManifold contactManifold; 2259 PersistentManifold contactManifold;
2261 CollisionObject objA; 2260 CollisionObject objA;
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
index 769896b..05374e8 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
@@ -42,7 +42,9 @@ namespace OpenSim.Region.Physics.BulletSPlugin
42{ 42{
43 public sealed class BSDynamics : BSActor 43 public sealed class BSDynamics : BSActor
44 { 44 {
45#pragma warning disable 414
45 private static string LogHeader = "[BULLETSIM VEHICLE]"; 46 private static string LogHeader = "[BULLETSIM VEHICLE]";
47#pragma warning restore 414
46 48
47 // the prim this dynamic controller belongs to 49 // the prim this dynamic controller belongs to
48 private BSPrimLinkable ControllingPrim { get; set; } 50 private BSPrimLinkable ControllingPrim { get; set; }
@@ -123,7 +125,9 @@ namespace OpenSim.Region.Physics.BulletSPlugin
123 125
124 // Just some recomputed constants: 126 // Just some recomputed constants:
125 static readonly float PIOverFour = ((float)Math.PI) / 4f; 127 static readonly float PIOverFour = ((float)Math.PI) / 4f;
128#pragma warning disable 414
126 static readonly float PIOverTwo = ((float)Math.PI) / 2f; 129 static readonly float PIOverTwo = ((float)Math.PI) / 2f;
130#pragma warning restore 414
127 131
128 public BSDynamics(BSScene myScene, BSPrim myPrim, string actorName) 132 public BSDynamics(BSScene myScene, BSPrim myPrim, string actorName)
129 : base(myScene, myPrim, actorName) 133 : base(myScene, myPrim, actorName)
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
index 8f12189..6f4f686 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
@@ -37,7 +37,9 @@ namespace OpenSim.Region.Physics.BulletSPlugin
37 37
38public sealed class BSLinksetCompound : BSLinkset 38public sealed class BSLinksetCompound : BSLinkset
39{ 39{
40#pragma warning disable 414
40 private static string LogHeader = "[BULLETSIM LINKSET COMPOUND]"; 41 private static string LogHeader = "[BULLETSIM LINKSET COMPOUND]";
42#pragma warning restore 414
41 43
42 public BSLinksetCompound(BSScene scene, BSPrimLinkable parent) 44 public BSLinksetCompound(BSScene scene, BSPrimLinkable parent)
43 : base(scene, parent) 45 : base(scene, parent)
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs
index 126b146..430d645 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs
@@ -42,7 +42,9 @@ public class BSPrimLinkable : BSPrimDisplaced
42 // operations necessary for keeping the linkset created and, additionally, this 42 // operations necessary for keeping the linkset created and, additionally, this
43 // calls the linkset implementation for its creation and management. 43 // calls the linkset implementation for its creation and management.
44 44
45#pragma warning disable 414
45 private static readonly string LogHeader = "[BULLETS PRIMLINKABLE]"; 46 private static readonly string LogHeader = "[BULLETS PRIMLINKABLE]";
47#pragma warning restore 414
46 48
47 // This adds the overrides for link() and delink() so the prim is linkable. 49 // This adds the overrides for link() and delink() so the prim is linkable.
48 50
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
index 2d2e55f..9fa55ce 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
@@ -88,7 +88,7 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters
88 public BSConstraintCollection Constraints { get; private set; } 88 public BSConstraintCollection Constraints { get; private set; }
89 89
90 // Simulation parameters 90 // Simulation parameters
91 internal float m_physicsStepTime; // if running independently, the interval simulated by default 91 //internal float m_physicsStepTime; // if running independently, the interval simulated by default
92 92
93 internal int m_maxSubSteps; 93 internal int m_maxSubSteps;
94 internal float m_fixedTimeStep; 94 internal float m_fixedTimeStep;
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs b/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
index 721a8eb..d1de844 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
@@ -36,7 +36,9 @@ namespace OpenSim.Region.Physics.BulletSPlugin
36{ 36{
37public sealed class BSShapeCollection : IDisposable 37public sealed class BSShapeCollection : IDisposable
38{ 38{
39#pragma warning disable 414
39 private static string LogHeader = "[BULLETSIM SHAPE COLLECTION]"; 40 private static string LogHeader = "[BULLETSIM SHAPE COLLECTION]";
41#pragma warning restore 414
40 42
41 private BSScene m_physicsScene { get; set; } 43 private BSScene m_physicsScene { get; set; }
42 44
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs b/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
index fbe320b..b344ba1 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
@@ -554,7 +554,10 @@ public class BSShapeMesh : BSShape
554// ============================================================================================================ 554// ============================================================================================================
555public class BSShapeHull : BSShape 555public class BSShapeHull : BSShape
556{ 556{
557#pragma warning disable 414
557 private static string LogHeader = "[BULLETSIM SHAPE HULL]"; 558 private static string LogHeader = "[BULLETSIM SHAPE HULL]";
559#pragma warning restore 414
560
558 public static Dictionary<System.UInt64, BSShapeHull> Hulls = new Dictionary<System.UInt64, BSShapeHull>(); 561 public static Dictionary<System.UInt64, BSShapeHull> Hulls = new Dictionary<System.UInt64, BSShapeHull>();
559 562
560 public BSShapeHull(BulletShape pShape) : base(pShape) 563 public BSShapeHull(BulletShape pShape) : base(pShape)
@@ -1002,7 +1005,10 @@ public class BSShapeCompound : BSShape
1002// ============================================================================================================ 1005// ============================================================================================================
1003public class BSShapeConvexHull : BSShape 1006public class BSShapeConvexHull : BSShape
1004{ 1007{
1008#pragma warning disable 414
1005 private static string LogHeader = "[BULLETSIM SHAPE CONVEX HULL]"; 1009 private static string LogHeader = "[BULLETSIM SHAPE CONVEX HULL]";
1010#pragma warning restore 414
1011
1006 public static Dictionary<System.UInt64, BSShapeConvexHull> ConvexHulls = new Dictionary<System.UInt64, BSShapeConvexHull>(); 1012 public static Dictionary<System.UInt64, BSShapeConvexHull> ConvexHulls = new Dictionary<System.UInt64, BSShapeConvexHull>();
1007 1013
1008 public BSShapeConvexHull(BulletShape pShape) : base(pShape) 1014 public BSShapeConvexHull(BulletShape pShape) : base(pShape)
@@ -1098,7 +1104,10 @@ public class BSShapeConvexHull : BSShape
1098// ============================================================================================================ 1104// ============================================================================================================
1099public class BSShapeGImpact : BSShape 1105public class BSShapeGImpact : BSShape
1100{ 1106{
1107#pragma warning disable 414
1101 private static string LogHeader = "[BULLETSIM SHAPE GIMPACT]"; 1108 private static string LogHeader = "[BULLETSIM SHAPE GIMPACT]";
1109#pragma warning restore 414
1110
1102 public static Dictionary<System.UInt64, BSShapeGImpact> GImpacts = new Dictionary<System.UInt64, BSShapeGImpact>(); 1111 public static Dictionary<System.UInt64, BSShapeGImpact> GImpacts = new Dictionary<System.UInt64, BSShapeGImpact>();
1103 1112
1104 public BSShapeGImpact(BulletShape pShape) : base(pShape) 1113 public BSShapeGImpact(BulletShape pShape) : base(pShape)
@@ -1205,8 +1214,12 @@ public class BSShapeGImpact : BSShape
1205// ============================================================================================================ 1214// ============================================================================================================
1206public class BSShapeAvatar : BSShape 1215public class BSShapeAvatar : BSShape
1207{ 1216{
1217#pragma warning disable 414
1208 private static string LogHeader = "[BULLETSIM SHAPE AVATAR]"; 1218 private static string LogHeader = "[BULLETSIM SHAPE AVATAR]";
1209 public BSShapeAvatar() : base() 1219#pragma warning restore 414
1220
1221 public BSShapeAvatar()
1222 : base()
1210 { 1223 {
1211 } 1224 }
1212 public static BSShape GetReference(BSPhysObject prim) 1225 public static BSShape GetReference(BSPhysObject prim)