ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-08 02:05:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Formatting cleanup.

Browse Source
This commit is contained in:
Jeff Ames
2009-06-10 04:28:56 +00:00
parent ca52c3ef26
commit a23d64dec1
61 changed files with 120 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
View File

@@ -1116,7 +1116,7 @@ namespace OpenSim.Region.Physics.OdePlugin
m_log.Warn("[PHYSICS]: re-creating the following avatar ODE data, even though it already exists - "
+ (Shell!=IntPtr.Zero ? "Shell ":"")
+ (Body!=IntPtr.Zero ? "Body ":"")
+ (Amotor!=IntPtr.Zero ? "Amotor ":"") );
+ (Amotor!=IntPtr.Zero ? "Amotor ":""));
}
AvatarGeomAndBodyCreation(_position.X, _position.Y, _position.Z, m_tensor);
@@ -1182,7 +1182,7 @@ namespace OpenSim.Region.Physics.OdePlugin
m_log.Warn("[PHYSICS]: trying to change capsule size, but the following ODE data is missing - "
+ (Shell==IntPtr.Zero ? "Shell ":"")
+ (Body==IntPtr.Zero ? "Body ":"")
+ (Amotor==IntPtr.Zero ? "Amotor ":"") );
+ (Amotor==IntPtr.Zero ? "Amotor ":""));
}
}

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

@@ -2593,7 +2593,7 @@ namespace OpenSim.Region.Physics.OdePlugin
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.Z - l_position.Z) < 0.02)
&& (1.0 - Math.Abs(Quaternion.Dot(m_lastorientation, l_orientation)) < 0.01 ))
&& (1.0 - Math.Abs(Quaternion.Dot(m_lastorientation, l_orientation)) < 0.01))
{
_zeroFlag = true;
m_throttleUpdates = false;
@@ -2981,7 +2981,7 @@ namespace OpenSim.Region.Physics.OdePlugin
Matrix4 transposeMatrix = new Matrix4();
for (int i = 0; i < 4; i++)
for (int j = 0; j < 4; j++)
Matrix4SetValue( ref transposeMatrix, i, j, pMat[j, i]);
Matrix4SetValue(ref transposeMatrix, i, j, pMat[j, i]);
return transposeMatrix;
}

4
OpenSim/Region/Physics/OdePlugin/ODEVehicleSettings.cs
View File

@@ -234,7 +234,7 @@ namespace OpenSim.Region.Physics.OdePlugin
SetDefaultsForType(pType);
Reset();
}
else if (m_type != Vehicle.TYPE_NONE && pType != Vehicle.TYPE_NONE )
else if (m_type != Vehicle.TYPE_NONE && pType != Vehicle.TYPE_NONE)
{
// Set properties
SetDefaultsForType(pType);
@@ -408,7 +408,7 @@ namespace OpenSim.Region.Physics.OdePlugin
// m_bankingMix = 0.8f;
// m_bankingTimescale = 1;
// m_referenceFrame = Quaternion.Identity;
m_flags &= ~( VehicleFlag.HOVER_TERRAIN_ONLY | VehicleFlag.LIMIT_ROLL_ONLY | VehicleFlag.HOVER_GLOBAL_HEIGHT);
m_flags &= ~(VehicleFlag.HOVER_TERRAIN_ONLY | VehicleFlag.LIMIT_ROLL_ONLY | VehicleFlag.HOVER_GLOBAL_HEIGHT);
m_flags |= (VehicleFlag.NO_DEFLECTION_UP | VehicleFlag.HOVER_WATER_ONLY | VehicleFlag.HOVER_UP_ONLY |
VehicleFlag.LIMIT_MOTOR_UP);
break;

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

@@ -3261,7 +3261,7 @@ namespace OpenSim.Region.Physics.OdePlugin
d.GeomHeightfieldDataBuildSingle(HeightmapData, _heightmap, 0, heightmapWidth, heightmapHeight,
(int) heightmapWidthSamples, (int) heightmapHeightSamples, scale,
offset, thickness, wrap);
d.GeomHeightfieldDataSetBounds(HeightmapData, hfmin - 1 , hfmax + 1 );
d.GeomHeightfieldDataSetBounds(HeightmapData, hfmin - 1 , hfmax + 1);
LandGeom = d.CreateHeightfield(space, HeightmapData, 1);
if (LandGeom != IntPtr.Zero)
{