OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

minor: remove some mono compiler warnings

0.6.8-post-fixes
Justin Clark-Casey (justincc) 2009-11-03 18:52:20 +00:00
parent d3cb1c6b33
commit 1d737b010c
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
OpenSim/Region/Physics/OdePlugin/ODEDynamics.cs
View File

@ -67,8 +67,8 @@ namespace OpenSim.Region.Physics.OdePlugin
// private OdeScene m_parentScene = null; // private OdeScene m_parentScene = null;
private IntPtr m_body = IntPtr.Zero; private IntPtr m_body = IntPtr.Zero;
private IntPtr m_jointGroup = IntPtr.Zero; // private IntPtr m_jointGroup = IntPtr.Zero;
private IntPtr m_aMotor = IntPtr.Zero; // private IntPtr m_aMotor = IntPtr.Zero;
// Vehicle properties // Vehicle properties
@ -117,7 +117,7 @@ namespace OpenSim.Region.Physics.OdePlugin
//Hover and Buoyancy properties //Hover and Buoyancy properties
private float m_VhoverHeight = 0f; private float m_VhoverHeight = 0f;
private float m_VhoverEfficiency = 0f; // private float m_VhoverEfficiency = 0f;
private float m_VhoverTimescale = 0f; private float m_VhoverTimescale = 0f;
private float m_VhoverTargetHeight = -1.0f; // if <0 then no hover, else its the current target height private float m_VhoverTargetHeight = -1.0f; // if <0 then no hover, else its the current target height
private float m_VehicleBuoyancy = 0f; //KF: m_VehicleBuoyancy is set by VEHICLE_BUOYANCY for a vehicle. 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
if (pValue > 1f) pValue = 1f; if (pValue > 1f) pValue = 1f;
m_VehicleBuoyancy = pValue; m_VehicleBuoyancy = pValue;
break; break;
case Vehicle.HOVER_EFFICIENCY: // case Vehicle.HOVER_EFFICIENCY:
if (pValue < 0f) pValue = 0f; // if (pValue < 0f) pValue = 0f;
if (pValue > 1f) pValue = 1f; // if (pValue > 1f) pValue = 1f;
m_VhoverEfficiency = pValue; // m_VhoverEfficiency = pValue;
break; // break;
case Vehicle.HOVER_HEIGHT: case Vehicle.HOVER_HEIGHT:
m_VhoverHeight = pValue; m_VhoverHeight = pValue;
break; break;
@ -291,7 +291,7 @@ namespace OpenSim.Region.Physics.OdePlugin
m_angularMotorTimescale = 1000; m_angularMotorTimescale = 1000;
m_angularMotorDecayTimescale = 120; m_angularMotorDecayTimescale = 120;
m_VhoverHeight = 0; m_VhoverHeight = 0;
m_VhoverEfficiency = 1; // m_VhoverEfficiency = 1;
m_VhoverTimescale = 10; m_VhoverTimescale = 10;
m_VehicleBuoyancy = 0; m_VehicleBuoyancy = 0;
// m_linearDeflectionEfficiency = 1; // m_linearDeflectionEfficiency = 1;
@ -317,7 +317,7 @@ namespace OpenSim.Region.Physics.OdePlugin
m_angularMotorTimescale = 1; m_angularMotorTimescale = 1;
m_angularMotorDecayTimescale = 0.8f; m_angularMotorDecayTimescale = 0.8f;
m_VhoverHeight = 0; m_VhoverHeight = 0;
m_VhoverEfficiency = 0; // m_VhoverEfficiency = 0;
m_VhoverTimescale = 1000; m_VhoverTimescale = 1000;
m_VehicleBuoyancy = 0; m_VehicleBuoyancy = 0;
// // m_linearDeflectionEfficiency = 1; // // m_linearDeflectionEfficiency = 1;
@ -344,7 +344,7 @@ namespace OpenSim.Region.Physics.OdePlugin
m_angularMotorTimescale = 4; m_angularMotorTimescale = 4;
m_angularMotorDecayTimescale = 4; m_angularMotorDecayTimescale = 4;
m_VhoverHeight = 0; m_VhoverHeight = 0;
m_VhoverEfficiency = 0.5f; // m_VhoverEfficiency = 0.5f;
m_VhoverTimescale = 2; m_VhoverTimescale = 2;
m_VehicleBuoyancy = 1; m_VehicleBuoyancy = 1;
// m_linearDeflectionEfficiency = 0.5f; // m_linearDeflectionEfficiency = 0.5f;
@ -372,7 +372,7 @@ namespace OpenSim.Region.Physics.OdePlugin
m_angularMotorTimescale = 4; m_angularMotorTimescale = 4;
m_angularMotorDecayTimescale = 4; m_angularMotorDecayTimescale = 4;
m_VhoverHeight = 0; m_VhoverHeight = 0;
m_VhoverEfficiency = 0.5f; // m_VhoverEfficiency = 0.5f;
m_VhoverTimescale = 1000; m_VhoverTimescale = 1000;
m_VehicleBuoyancy = 0; m_VehicleBuoyancy = 0;
// m_linearDeflectionEfficiency = 0.5f; // m_linearDeflectionEfficiency = 0.5f;
@ -399,7 +399,7 @@ namespace OpenSim.Region.Physics.OdePlugin
m_angularMotorTimescale = 6; m_angularMotorTimescale = 6;
m_angularMotorDecayTimescale = 10; m_angularMotorDecayTimescale = 10;
m_VhoverHeight = 5; m_VhoverHeight = 5;
m_VhoverEfficiency = 0.8f; // m_VhoverEfficiency = 0.8f;
m_VhoverTimescale = 10; m_VhoverTimescale = 10;
m_VehicleBuoyancy = 1; m_VehicleBuoyancy = 1;
// m_linearDeflectionEfficiency = 0; // m_linearDeflectionEfficiency = 0;

2
OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
View File

@ -2643,7 +2643,7 @@ Console.WriteLine(" JointCreateFixed");
//outofBounds = true; //outofBounds = true;
} }
float Adiff = 1.0f - Math.Abs(Quaternion.Dot(m_lastorientation, l_orientation)); // float Adiff = 1.0f - Math.Abs(Quaternion.Dot(m_lastorientation, l_orientation));
//Console.WriteLine("Adiff " + m_primName + " = " + Adiff); //Console.WriteLine("Adiff " + m_primName + " = " + Adiff);
if ((Math.Abs(m_lastposition.X - l_position.X) < 0.02) if ((Math.Abs(m_lastposition.X - l_position.X) < 0.02)
&& (Math.Abs(m_lastposition.Y - l_position.Y) < 0.02) && (Math.Abs(m_lastposition.Y - l_position.Y) < 0.02)

6
OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
View File

@ -3519,7 +3519,7 @@ namespace OpenSim.Region.Physics.OdePlugin
public override void UnCombine(PhysicsScene pScene) public override void UnCombine(PhysicsScene pScene)
{ {
IntPtr localGround = IntPtr.Zero; IntPtr localGround = IntPtr.Zero;
float[] localHeightfield; // float[] localHeightfield;
bool proceed = false; bool proceed = false;
List<IntPtr> geomDestroyList = new List<IntPtr>(); List<IntPtr> geomDestroyList = new List<IntPtr>();
@ -3531,7 +3531,7 @@ namespace OpenSim.Region.Physics.OdePlugin
{ {
if (geom == localGround) if (geom == localGround)
{ {
localHeightfield = TerrainHeightFieldHeights[geom]; // localHeightfield = TerrainHeightFieldHeights[geom];
proceed = true; proceed = true;
} }
else else
@ -3553,7 +3553,7 @@ namespace OpenSim.Region.Physics.OdePlugin
// memory corruption // memory corruption
if (TerrainHeightFieldHeights.ContainsKey(g)) if (TerrainHeightFieldHeights.ContainsKey(g))
{ {
float[] removingHeightField = TerrainHeightFieldHeights[g]; // float[] removingHeightField = TerrainHeightFieldHeights[g];
TerrainHeightFieldHeights.Remove(g); TerrainHeightFieldHeights.Remove(g);
if (RegionTerrain.ContainsKey(g)) if (RegionTerrain.ContainsKey(g))