diff options
author | Justin Clark-Casey (justincc) | 2009-11-03 18:52:20 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2009-11-03 18:52:20 +0000 |
commit | 1d737b010cb39d8fcc0794eae9be90634382e51c (patch) | |
tree | f5880d54ec504c288a4106bd2c606fd2d8a670fd | |
parent | Bump required Mono version in README up to 2.4.2 (diff) | |
download | opensim-SC_OLD-1d737b010cb39d8fcc0794eae9be90634382e51c.zip opensim-SC_OLD-1d737b010cb39d8fcc0794eae9be90634382e51c.tar.gz opensim-SC_OLD-1d737b010cb39d8fcc0794eae9be90634382e51c.tar.bz2 opensim-SC_OLD-1d737b010cb39d8fcc0794eae9be90634382e51c.tar.xz |
minor: remove some mono compiler warnings
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/ODEDynamics.cs | 26 | ||||
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | 6 |
3 files changed, 17 insertions, 17 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEDynamics.cs b/OpenSim/Region/Physics/OdePlugin/ODEDynamics.cs index 4a802cd..39cdc0f 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODEDynamics.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODEDynamics.cs | |||
@@ -67,8 +67,8 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
67 | 67 | ||
68 | // private OdeScene m_parentScene = null; | 68 | // private OdeScene m_parentScene = null; |
69 | private IntPtr m_body = IntPtr.Zero; | 69 | private IntPtr m_body = IntPtr.Zero; |
70 | private IntPtr m_jointGroup = IntPtr.Zero; | 70 | // private IntPtr m_jointGroup = IntPtr.Zero; |
71 | private IntPtr m_aMotor = IntPtr.Zero; | 71 | // private IntPtr m_aMotor = IntPtr.Zero; |
72 | 72 | ||
73 | 73 | ||
74 | // Vehicle properties | 74 | // Vehicle properties |
@@ -117,7 +117,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
117 | 117 | ||
118 | //Hover and Buoyancy properties | 118 | //Hover and Buoyancy properties |
119 | private float m_VhoverHeight = 0f; | 119 | private float m_VhoverHeight = 0f; |
120 | private float m_VhoverEfficiency = 0f; | 120 | // private float m_VhoverEfficiency = 0f; |
121 | private float m_VhoverTimescale = 0f; | 121 | private float m_VhoverTimescale = 0f; |
122 | private float m_VhoverTargetHeight = -1.0f; // if <0 then no hover, else its the current target height | 122 | private float m_VhoverTargetHeight = -1.0f; // if <0 then no hover, else its the current target height |
123 | private float m_VehicleBuoyancy = 0f; //KF: m_VehicleBuoyancy is set by VEHICLE_BUOYANCY for a vehicle. | 123 | private float m_VehicleBuoyancy = 0f; //KF: m_VehicleBuoyancy is set by VEHICLE_BUOYANCY for a vehicle. |
@@ -170,11 +170,11 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
170 | if (pValue > 1f) pValue = 1f; | 170 | if (pValue > 1f) pValue = 1f; |
171 | m_VehicleBuoyancy = pValue; | 171 | m_VehicleBuoyancy = pValue; |
172 | break; | 172 | break; |
173 | case Vehicle.HOVER_EFFICIENCY: | 173 | // case Vehicle.HOVER_EFFICIENCY: |
174 | if (pValue < 0f) pValue = 0f; | 174 | // if (pValue < 0f) pValue = 0f; |
175 | if (pValue > 1f) pValue = 1f; | 175 | // if (pValue > 1f) pValue = 1f; |
176 | m_VhoverEfficiency = pValue; | 176 | // m_VhoverEfficiency = pValue; |
177 | break; | 177 | // break; |
178 | case Vehicle.HOVER_HEIGHT: | 178 | case Vehicle.HOVER_HEIGHT: |
179 | m_VhoverHeight = pValue; | 179 | m_VhoverHeight = pValue; |
180 | break; | 180 | break; |
@@ -291,7 +291,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
291 | m_angularMotorTimescale = 1000; | 291 | m_angularMotorTimescale = 1000; |
292 | m_angularMotorDecayTimescale = 120; | 292 | m_angularMotorDecayTimescale = 120; |
293 | m_VhoverHeight = 0; | 293 | m_VhoverHeight = 0; |
294 | m_VhoverEfficiency = 1; | 294 | // m_VhoverEfficiency = 1; |
295 | m_VhoverTimescale = 10; | 295 | m_VhoverTimescale = 10; |
296 | m_VehicleBuoyancy = 0; | 296 | m_VehicleBuoyancy = 0; |
297 | // m_linearDeflectionEfficiency = 1; | 297 | // m_linearDeflectionEfficiency = 1; |
@@ -317,7 +317,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
317 | m_angularMotorTimescale = 1; | 317 | m_angularMotorTimescale = 1; |
318 | m_angularMotorDecayTimescale = 0.8f; | 318 | m_angularMotorDecayTimescale = 0.8f; |
319 | m_VhoverHeight = 0; | 319 | m_VhoverHeight = 0; |
320 | m_VhoverEfficiency = 0; | 320 | // m_VhoverEfficiency = 0; |
321 | m_VhoverTimescale = 1000; | 321 | m_VhoverTimescale = 1000; |
322 | m_VehicleBuoyancy = 0; | 322 | m_VehicleBuoyancy = 0; |
323 | // // m_linearDeflectionEfficiency = 1; | 323 | // // m_linearDeflectionEfficiency = 1; |
@@ -344,7 +344,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
344 | m_angularMotorTimescale = 4; | 344 | m_angularMotorTimescale = 4; |
345 | m_angularMotorDecayTimescale = 4; | 345 | m_angularMotorDecayTimescale = 4; |
346 | m_VhoverHeight = 0; | 346 | m_VhoverHeight = 0; |
347 | m_VhoverEfficiency = 0.5f; | 347 | // m_VhoverEfficiency = 0.5f; |
348 | m_VhoverTimescale = 2; | 348 | m_VhoverTimescale = 2; |
349 | m_VehicleBuoyancy = 1; | 349 | m_VehicleBuoyancy = 1; |
350 | // m_linearDeflectionEfficiency = 0.5f; | 350 | // m_linearDeflectionEfficiency = 0.5f; |
@@ -372,7 +372,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
372 | m_angularMotorTimescale = 4; | 372 | m_angularMotorTimescale = 4; |
373 | m_angularMotorDecayTimescale = 4; | 373 | m_angularMotorDecayTimescale = 4; |
374 | m_VhoverHeight = 0; | 374 | m_VhoverHeight = 0; |
375 | m_VhoverEfficiency = 0.5f; | 375 | // m_VhoverEfficiency = 0.5f; |
376 | m_VhoverTimescale = 1000; | 376 | m_VhoverTimescale = 1000; |
377 | m_VehicleBuoyancy = 0; | 377 | m_VehicleBuoyancy = 0; |
378 | // m_linearDeflectionEfficiency = 0.5f; | 378 | // m_linearDeflectionEfficiency = 0.5f; |
@@ -399,7 +399,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
399 | m_angularMotorTimescale = 6; | 399 | m_angularMotorTimescale = 6; |
400 | m_angularMotorDecayTimescale = 10; | 400 | m_angularMotorDecayTimescale = 10; |
401 | m_VhoverHeight = 5; | 401 | m_VhoverHeight = 5; |
402 | m_VhoverEfficiency = 0.8f; | 402 | // m_VhoverEfficiency = 0.8f; |
403 | m_VhoverTimescale = 10; | 403 | m_VhoverTimescale = 10; |
404 | m_VehicleBuoyancy = 1; | 404 | m_VehicleBuoyancy = 1; |
405 | // m_linearDeflectionEfficiency = 0; | 405 | // m_linearDeflectionEfficiency = 0; |
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs index 5ff9d32..49bbab9 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | |||
@@ -2643,7 +2643,7 @@ Console.WriteLine(" JointCreateFixed"); | |||
2643 | //outofBounds = true; | 2643 | //outofBounds = true; |
2644 | } | 2644 | } |
2645 | 2645 | ||
2646 | float Adiff = 1.0f - Math.Abs(Quaternion.Dot(m_lastorientation, l_orientation)); | 2646 | // float Adiff = 1.0f - Math.Abs(Quaternion.Dot(m_lastorientation, l_orientation)); |
2647 | //Console.WriteLine("Adiff " + m_primName + " = " + Adiff); | 2647 | //Console.WriteLine("Adiff " + m_primName + " = " + Adiff); |
2648 | if ((Math.Abs(m_lastposition.X - l_position.X) < 0.02) | 2648 | if ((Math.Abs(m_lastposition.X - l_position.X) < 0.02) |
2649 | && (Math.Abs(m_lastposition.Y - l_position.Y) < 0.02) | 2649 | && (Math.Abs(m_lastposition.Y - l_position.Y) < 0.02) |
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs index 2f42646..73ad15e 100644 --- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs +++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | |||
@@ -3519,7 +3519,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
3519 | public override void UnCombine(PhysicsScene pScene) | 3519 | public override void UnCombine(PhysicsScene pScene) |
3520 | { | 3520 | { |
3521 | IntPtr localGround = IntPtr.Zero; | 3521 | IntPtr localGround = IntPtr.Zero; |
3522 | float[] localHeightfield; | 3522 | // float[] localHeightfield; |
3523 | bool proceed = false; | 3523 | bool proceed = false; |
3524 | List<IntPtr> geomDestroyList = new List<IntPtr>(); | 3524 | List<IntPtr> geomDestroyList = new List<IntPtr>(); |
3525 | 3525 | ||
@@ -3531,7 +3531,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
3531 | { | 3531 | { |
3532 | if (geom == localGround) | 3532 | if (geom == localGround) |
3533 | { | 3533 | { |
3534 | localHeightfield = TerrainHeightFieldHeights[geom]; | 3534 | // localHeightfield = TerrainHeightFieldHeights[geom]; |
3535 | proceed = true; | 3535 | proceed = true; |
3536 | } | 3536 | } |
3537 | else | 3537 | else |
@@ -3553,7 +3553,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
3553 | // memory corruption | 3553 | // memory corruption |
3554 | if (TerrainHeightFieldHeights.ContainsKey(g)) | 3554 | if (TerrainHeightFieldHeights.ContainsKey(g)) |
3555 | { | 3555 | { |
3556 | float[] removingHeightField = TerrainHeightFieldHeights[g]; | 3556 | // float[] removingHeightField = TerrainHeightFieldHeights[g]; |
3557 | TerrainHeightFieldHeights.Remove(g); | 3557 | TerrainHeightFieldHeights.Remove(g); |
3558 | 3558 | ||
3559 | if (RegionTerrain.ContainsKey(g)) | 3559 | if (RegionTerrain.ContainsKey(g)) |