From b16abc8166c29585cb76cc55c3bdd76e5833cb4f Mon Sep 17 00:00:00 2001 From: Melanie Thielker Date: Thu, 5 Jan 2017 19:07:37 +0000 Subject: Massive tab and trailing space cleanup --- OpenSim/Region/PhysicsModules/ubOde/ODEPrim.cs | 38 +++++++++++++------------- 1 file changed, 19 insertions(+), 19 deletions(-) (limited to 'OpenSim/Region/PhysicsModules/ubOde/ODEPrim.cs') diff --git a/OpenSim/Region/PhysicsModules/ubOde/ODEPrim.cs b/OpenSim/Region/PhysicsModules/ubOde/ODEPrim.cs index a50905b..a2fbf41 100644 --- a/OpenSim/Region/PhysicsModules/ubOde/ODEPrim.cs +++ b/OpenSim/Region/PhysicsModules/ubOde/ODEPrim.cs @@ -33,7 +33,7 @@ * ODEDynamics.cs contains methods dealing with Prim Physical motion * (dynamics) and the associated settings. Old Linear and angular * motors for dynamic motion have been replace with MoveLinear() - * and MoveAngular(); 'Physical' is used only to switch ODE dynamic + * and MoveAngular(); 'Physical' is used only to switch ODE dynamic * simualtion on/off; VEHICAL_TYPE_NONE/VEHICAL_TYPE_ is to * switch between 'VEHICLE' parameter use and general dynamics * settings use. @@ -107,7 +107,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde private float m_targetHoverHeight; private float m_groundHeight; private float m_waterHeight; - private float m_buoyancy; //KF: m_buoyancy should be set by llSetBuoyancy() for non-vehicle. + private float m_buoyancy; //KF: m_buoyancy should be set by llSetBuoyancy() for non-vehicle. private int body_autodisable_frames; public int bodydisablecontrol = 0; @@ -143,7 +143,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde private UUID? m_assetID; private MeshState m_meshState; - + public ODEScene _parent_scene; /// @@ -888,7 +888,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde m_lastVelocity = _velocity; if (m_vehicle != null && m_vehicle.Type != Vehicle.TYPE_NONE) - m_vehicle.Stop(); + m_vehicle.Stop(); if(Body != IntPtr.Zero) d.BodySetLinearVel(Body, 0, 0, 0); // stop it @@ -980,7 +980,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde { // m_log.DebugFormat("[axislock]: <{0},{1},{2}>", axis.X, axis.Y, axis.Z); AddChange(changes.AngLock, axislock); - + } public override void SubscribeEvents(int ms) @@ -1464,7 +1464,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde IntPtr vertices, indices; int vertexCount, indexCount; int vertexStride, triStride; - + IMesh mesh = m_mesh; if (mesh == null) @@ -1529,7 +1529,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde m_OBB = _size * 0.5f; m_physCost = 0.1f; m_streamCost = 1.0f; - + _parent_scene.mesher.ReleaseMesh(mesh); m_meshState = MeshState.MeshFailed; m_mesh = null; @@ -1830,7 +1830,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde if (childrenPrim.Count == 0) { collide_geom = prim_geom; - m_targetSpace = _parent_scene.ActiveSpace; + m_targetSpace = _parent_scene.ActiveSpace; } else { @@ -1911,7 +1911,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde d.BodySetLinearVel(Body, _velocity.X, _velocity.Y, _velocity.Z); _zeroFlag = false; bodydisablecontrol = 0; - } + } _parent_scene.addActiveGroups(this); } @@ -2011,7 +2011,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde d.Matrix3 mat = new d.Matrix3(); d.Quaternion quat = new d.Quaternion(); - d.Mass tmpdmass = new d.Mass { }; + d.Mass tmpdmass = new d.Mass { }; d.Mass objdmass = new d.Mass { }; d.BodyGetMass(Body, out tmpdmass); @@ -2039,7 +2039,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde // subtract current prim inertia from object DMassSubPartFromObj(ref tmpdmass, ref objdmass); - // back prim own inertia + // back prim own inertia tmpdmass = primdMass; // update to new position and orientation @@ -2444,7 +2444,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde MakeBody(); } - + #region changes private void changeadd() @@ -3011,7 +3011,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde primVolume = repData.volume; - CreateGeom(); + CreateGeom(); if (prim_geom != IntPtr.Zero) { @@ -3145,7 +3145,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde d.BodySetLinearVel(Body, newVel.X, newVel.Y, newVel.Z); } - //resetCollisionAccounting(); + //resetCollisionAccounting(); } _velocity = newVel; } @@ -3171,7 +3171,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde d.BodySetAngularVel(Body, newAngVel.X, newAngVel.Y, newAngVel.Z); } - //resetCollisionAccounting(); + //resetCollisionAccounting(); } m_rotationalVelocity = newAngVel; } @@ -3316,7 +3316,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde // let vehicles sleep if (m_vehicle != null && m_vehicle.Type != Vehicle.TYPE_NONE) return; - + if (++bodydisablecontrol < 50) return; @@ -3414,7 +3414,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde break; } // end switch (m_PIDHoverType) - // don't go underground unless volumedetector + // don't go underground unless volumedetector if (m_targetHoverHeight > m_groundHeight || m_isVolumeDetect) { @@ -3526,7 +3526,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde d.BodySetLinearVel(Body, 0, 0, 0); // stop it d.BodySetAngularVel(Body, 0, 0, 0); // stop it - d.BodySetPosition(Body, lpos.X, lpos.Y, lpos.Z); // put it somewhere + d.BodySetPosition(Body, lpos.X, lpos.Y, lpos.Z); // put it somewhere m_lastposition = _position; m_lastorientation = _orientation; @@ -3635,7 +3635,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde _orientation.X = ori.X; _orientation.Y = ori.Y; _orientation.Z = ori.Z; - _orientation.W = ori.W; + _orientation.W = ori.W; } // update velocities and aceleration -- cgit v1.1