From 998d7009a65def0a4debc9369d35b63611db5b55 Mon Sep 17 00:00:00 2001 From: Oren Hurvitz Date: Tue, 22 Apr 2014 20:04:12 +0300 Subject: Eliminated many warnings --- .../Physics/BasicPhysicsPlugin/BasicPhysicsActor.cs | 2 -- OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs | 1 - OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs | 4 ++++ OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs | 2 ++ OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs | 2 ++ OpenSim/Region/Physics/BulletSPlugin/BSScene.cs | 2 +- OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs | 2 ++ OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs | 15 ++++++++++++++- 8 files changed, 25 insertions(+), 5 deletions(-) (limited to 'OpenSim/Region/Physics') 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 { public class BasicActor : PhysicsActor { - private Vector3 _size; - public BasicActor(Vector3 size) { 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 world.LastCollisionDesc = 0; world.LastEntityProperty = 0; numSimSteps = world.StepSimulation(timeStep, m_maxSubSteps, m_fixedTimeStep); - int updates = 0; PersistentManifold contactManifold; 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 { public sealed class BSDynamics : BSActor { +#pragma warning disable 414 private static string LogHeader = "[BULLETSIM VEHICLE]"; +#pragma warning restore 414 // the prim this dynamic controller belongs to private BSPrimLinkable ControllingPrim { get; set; } @@ -123,7 +125,9 @@ namespace OpenSim.Region.Physics.BulletSPlugin // Just some recomputed constants: static readonly float PIOverFour = ((float)Math.PI) / 4f; +#pragma warning disable 414 static readonly float PIOverTwo = ((float)Math.PI) / 2f; +#pragma warning restore 414 public BSDynamics(BSScene myScene, BSPrim myPrim, string actorName) : 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 public sealed class BSLinksetCompound : BSLinkset { +#pragma warning disable 414 private static string LogHeader = "[BULLETSIM LINKSET COMPOUND]"; +#pragma warning restore 414 public BSLinksetCompound(BSScene scene, BSPrimLinkable parent) : 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 // operations necessary for keeping the linkset created and, additionally, this // calls the linkset implementation for its creation and management. +#pragma warning disable 414 private static readonly string LogHeader = "[BULLETS PRIMLINKABLE]"; +#pragma warning restore 414 // This adds the overrides for link() and delink() so the prim is linkable. 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 public BSConstraintCollection Constraints { get; private set; } // Simulation parameters - internal float m_physicsStepTime; // if running independently, the interval simulated by default + //internal float m_physicsStepTime; // if running independently, the interval simulated by default internal int m_maxSubSteps; 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 { public sealed class BSShapeCollection : IDisposable { +#pragma warning disable 414 private static string LogHeader = "[BULLETSIM SHAPE COLLECTION]"; +#pragma warning restore 414 private BSScene m_physicsScene { get; set; } 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 // ============================================================================================================ public class BSShapeHull : BSShape { +#pragma warning disable 414 private static string LogHeader = "[BULLETSIM SHAPE HULL]"; +#pragma warning restore 414 + public static Dictionary Hulls = new Dictionary(); public BSShapeHull(BulletShape pShape) : base(pShape) @@ -1002,7 +1005,10 @@ public class BSShapeCompound : BSShape // ============================================================================================================ public class BSShapeConvexHull : BSShape { +#pragma warning disable 414 private static string LogHeader = "[BULLETSIM SHAPE CONVEX HULL]"; +#pragma warning restore 414 + public static Dictionary ConvexHulls = new Dictionary(); public BSShapeConvexHull(BulletShape pShape) : base(pShape) @@ -1098,7 +1104,10 @@ public class BSShapeConvexHull : BSShape // ============================================================================================================ public class BSShapeGImpact : BSShape { +#pragma warning disable 414 private static string LogHeader = "[BULLETSIM SHAPE GIMPACT]"; +#pragma warning restore 414 + public static Dictionary GImpacts = new Dictionary(); public BSShapeGImpact(BulletShape pShape) : base(pShape) @@ -1205,8 +1214,12 @@ public class BSShapeGImpact : BSShape // ============================================================================================================ public class BSShapeAvatar : BSShape { +#pragma warning disable 414 private static string LogHeader = "[BULLETSIM SHAPE AVATAR]"; - public BSShapeAvatar() : base() +#pragma warning restore 414 + + public BSShapeAvatar() + : base() { } public static BSShape GetReference(BSPhysObject prim) -- cgit v1.1