Merge branch 'master' into presence-refactor

This brings presence-refactor up to master again
author: Melanie 2010-02-22 03:00:59 +0000
committer: Melanie 2010-02-22 03:00:59 +0000
commit: 1f45e6c6497e05638f014e92098165befbbea100 (patch)
tree: 0e4fdd96ef3d3727fc051a9f81375bfbaf0b04f4 /OpenSim/Region/Physics/OdePlugin/ODEDynamics.cs
parent: One more test running. (diff)
parent: Formatting cleanup. (diff)
download: opensim-SC_OLD-1f45e6c6497e05638f014e92098165befbbea100.zip
opensim-SC_OLD-1f45e6c6497e05638f014e92098165befbbea100.tar.gz
opensim-SC_OLD-1f45e6c6497e05638f014e92098165befbbea100.tar.bz2
opensim-SC_OLD-1f45e6c6497e05638f014e92098165befbbea100.tar.xz
1 files changed, 25 insertions, 25 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEDynamics.cs b/OpenSim/Region/Physics/OdePlugin/ODEDynamics.cs
index 6ae0c8a..9beeabb 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODEDynamics.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODEDynamics.cs
@@ -72,23 +72,23 @@ namespace OpenSim.Region.Physics.OdePlugin
        // Vehicle properties
-        private Vehicle m_type = Vehicle.TYPE_NONE;                                             // If a 'VEHICLE', and what kind
+        private Vehicle m_type = Vehicle.TYPE_NONE;                     // If a 'VEHICLE', and what kind
-        // private Quaternion m_referenceFrame = Quaternion.Identity;   // Axis modifier
+        // private Quaternion m_referenceFrame = Quaternion.Identity;   // Axis modifier
-        private VehicleFlag m_flags = (VehicleFlag) 0;                                  // Boolean settings:
+        private VehicleFlag m_flags = (VehicleFlag) 0;                  // Boolean settings:
-                                                                                                                                                // HOVER_TERRAIN_ONLY
+                                                                        // HOVER_TERRAIN_ONLY
-                                                                                                                                                // HOVER_GLOBAL_HEIGHT
+                                                                        // HOVER_GLOBAL_HEIGHT
-                                                                                                                                                // NO_DEFLECTION_UP
+                                                                        // NO_DEFLECTION_UP
-                                                                                                                                                // HOVER_WATER_ONLY
+                                                                        // HOVER_WATER_ONLY
-                                                                                                                                                // HOVER_UP_ONLY
+                                                                        // HOVER_UP_ONLY
-                                                                                                                                                // LIMIT_MOTOR_UP
+                                                                        // LIMIT_MOTOR_UP
-                                                                                                                                                // LIMIT_ROLL_ONLY
+                                                                        // LIMIT_ROLL_ONLY
        private VehicleFlag m_Hoverflags = (VehicleFlag)0;
        private Vector3 m_BlockingEndPoint = Vector3.Zero;
        private Quaternion m_RollreferenceFrame = Quaternion.Identity;
        // Linear properties
-        private Vector3 m_linearMotorDirection = Vector3.Zero;                  // velocity requested by LSL, decayed by time
+        private Vector3 m_linearMotorDirection = Vector3.Zero;          // velocity requested by LSL, decayed by time
-        private Vector3 m_linearMotorDirectionLASTSET = Vector3.Zero;   // velocity requested by LSL
+        private Vector3 m_linearMotorDirectionLASTSET = Vector3.Zero;   // velocity requested by LSL
-        private Vector3 m_dir = Vector3.Zero;                                                   // velocity applied to body
+        private Vector3 m_dir = Vector3.Zero;                           // velocity applied to body
        private Vector3 m_linearFrictionTimescale = Vector3.Zero;
        private float m_linearMotorDecayTimescale = 0;
        private float m_linearMotorTimescale = 0;
@@ -98,14 +98,14 @@ namespace OpenSim.Region.Physics.OdePlugin
        // private Vector3 m_linearMotorOffset = Vector3.Zero;
        //Angular properties
-        private Vector3 m_angularMotorDirection = Vector3.Zero;                 // angular velocity requested by LSL motor
+        private Vector3 m_angularMotorDirection = Vector3.Zero;         // angular velocity requested by LSL motor
-        private int m_angularMotorApply = 0;                                                    // application frame counter
+        private int m_angularMotorApply = 0;                            // application frame counter
-        private Vector3 m_angularMotorVelocity = Vector3.Zero;                  // current angular motor velocity
+        private Vector3 m_angularMotorVelocity = Vector3.Zero;          // current angular motor velocity
-        private float m_angularMotorTimescale = 0;                                              // motor angular velocity ramp up rate
+        private float m_angularMotorTimescale = 0;                      // motor angular velocity ramp up rate
-        private float m_angularMotorDecayTimescale = 0;                                 // motor angular velocity decay rate
+        private float m_angularMotorDecayTimescale = 0;                 // motor angular velocity decay rate
-        private Vector3 m_angularFrictionTimescale = Vector3.Zero;              // body angular velocity  decay rate
+        private Vector3 m_angularFrictionTimescale = Vector3.Zero;      // body angular velocity  decay rate
-        private Vector3 m_lastAngularVelocity = Vector3.Zero;                   // what was last applied to body
+        private Vector3 m_lastAngularVelocity = Vector3.Zero;           // what was last applied to body
- //       private Vector3 m_lastVertAttractor = Vector3.Zero;                           // what VA was last applied to body
+ //       private Vector3 m_lastVertAttractor = Vector3.Zero;             // what VA was last applied to body
        //Deflection properties
        // private float m_angularDeflectionEfficiency = 0;
@@ -123,14 +123,14 @@ namespace OpenSim.Region.Physics.OdePlugin
 //        private float m_VhoverEfficiency = 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_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.
                    // Modifies gravity. Slider between -1 (double-gravity) and 1 (full anti-gravity)
                    // KF: So far I have found no good method to combine a script-requested .Z velocity and gravity.
                    // Therefore only m_VehicleBuoyancy=1 (0g) will use the script-requested .Z velocity.
-        //Attractor properties
+        //Attractor properties
-        private float m_verticalAttractionEfficiency = 1.0f;            // damped
+        private float m_verticalAttractionEfficiency = 1.0f;        // damped
-        private float m_verticalAttractionTimescale = 500f;                     // Timescale > 300  means no vert attractor.
+        private float m_verticalAttractionTimescale = 500f;         // Timescale > 300  means no vert attractor.
        internal void ProcessFloatVehicleParam(Vehicle pParam, float pValue)
        {
author	Melanie	2010-02-22 03:00:59 +0000
committer	Melanie	2010-02-22 03:00:59 +0000
commit	1f45e6c6497e05638f014e92098165befbbea100 (patch)
tree	0e4fdd96ef3d3727fc051a9f81375bfbaf0b04f4 /OpenSim/Region/Physics/OdePlugin/ODEDynamics.cs
parent	One more test running. (diff)
parent	Formatting cleanup. (diff)
download	opensim-SC_OLD-1f45e6c6497e05638f014e92098165befbbea100.zip opensim-SC_OLD-1f45e6c6497e05638f014e92098165befbbea100.tar.gz opensim-SC_OLD-1f45e6c6497e05638f014e92098165befbbea100.tar.bz2 opensim-SC_OLD-1f45e6c6497e05638f014e92098165befbbea100.tar.xz

diff --git a/OpenSim/Region/Physics/OdePlugin/ODEDynamics.cs b/OpenSim/Region/Physics/OdePlugin/ODEDynamics.cs index 6ae0c8a..9beeabb 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODEDynamics.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODEDynamics.cs
@@ -72,23 +72,23 @@ namespace OpenSim.Region.Physics.OdePlugin
72		72
73		73
74	// Vehicle properties	74	// Vehicle properties
75	private Vehicle m_type = Vehicle.TYPE_NONE; // If a 'VEHICLE', and what kind	75	private Vehicle m_type = Vehicle.TYPE_NONE; // If a 'VEHICLE', and what kind
76	// private Quaternion m_referenceFrame = Quaternion.Identity; // Axis modifier	76	// private Quaternion m_referenceFrame = Quaternion.Identity; // Axis modifier
77	private VehicleFlag m_flags = (VehicleFlag) 0; // Boolean settings:	77	private VehicleFlag m_flags = (VehicleFlag) 0; // Boolean settings:
78	// HOVER_TERRAIN_ONLY	78	// HOVER_TERRAIN_ONLY
79	// HOVER_GLOBAL_HEIGHT	79	// HOVER_GLOBAL_HEIGHT
80	// NO_DEFLECTION_UP	80	// NO_DEFLECTION_UP
81	// HOVER_WATER_ONLY	81	// HOVER_WATER_ONLY
82	// HOVER_UP_ONLY	82	// HOVER_UP_ONLY
83	// LIMIT_MOTOR_UP	83	// LIMIT_MOTOR_UP
84	// LIMIT_ROLL_ONLY	84	// LIMIT_ROLL_ONLY
85	private VehicleFlag m_Hoverflags = (VehicleFlag)0;	85	private VehicleFlag m_Hoverflags = (VehicleFlag)0;
86	private Vector3 m_BlockingEndPoint = Vector3.Zero;	86	private Vector3 m_BlockingEndPoint = Vector3.Zero;
87	private Quaternion m_RollreferenceFrame = Quaternion.Identity;	87	private Quaternion m_RollreferenceFrame = Quaternion.Identity;
88	// Linear properties	88	// Linear properties
89	private Vector3 m_linearMotorDirection = Vector3.Zero; // velocity requested by LSL, decayed by time	89	private Vector3 m_linearMotorDirection = Vector3.Zero; // velocity requested by LSL, decayed by time
90	private Vector3 m_linearMotorDirectionLASTSET = Vector3.Zero; // velocity requested by LSL	90	private Vector3 m_linearMotorDirectionLASTSET = Vector3.Zero; // velocity requested by LSL
91	private Vector3 m_dir = Vector3.Zero; // velocity applied to body	91	private Vector3 m_dir = Vector3.Zero; // velocity applied to body
92	private Vector3 m_linearFrictionTimescale = Vector3.Zero;	92	private Vector3 m_linearFrictionTimescale = Vector3.Zero;
93	private float m_linearMotorDecayTimescale = 0;	93	private float m_linearMotorDecayTimescale = 0;
94	private float m_linearMotorTimescale = 0;	94	private float m_linearMotorTimescale = 0;
@@ -98,14 +98,14 @@ namespace OpenSim.Region.Physics.OdePlugin
98	// private Vector3 m_linearMotorOffset = Vector3.Zero;	98	// private Vector3 m_linearMotorOffset = Vector3.Zero;
99		99
100	//Angular properties	100	//Angular properties
101	private Vector3 m_angularMotorDirection = Vector3.Zero; // angular velocity requested by LSL motor	101	private Vector3 m_angularMotorDirection = Vector3.Zero; // angular velocity requested by LSL motor
102	private int m_angularMotorApply = 0; // application frame counter	102	private int m_angularMotorApply = 0; // application frame counter
103	private Vector3 m_angularMotorVelocity = Vector3.Zero; // current angular motor velocity	103	private Vector3 m_angularMotorVelocity = Vector3.Zero; // current angular motor velocity
104	private float m_angularMotorTimescale = 0; // motor angular velocity ramp up rate	104	private float m_angularMotorTimescale = 0; // motor angular velocity ramp up rate
105	private float m_angularMotorDecayTimescale = 0; // motor angular velocity decay rate	105	private float m_angularMotorDecayTimescale = 0; // motor angular velocity decay rate
106	private Vector3 m_angularFrictionTimescale = Vector3.Zero; // body angular velocity decay rate	106	private Vector3 m_angularFrictionTimescale = Vector3.Zero; // body angular velocity decay rate
107	private Vector3 m_lastAngularVelocity = Vector3.Zero; // what was last applied to body	107	private Vector3 m_lastAngularVelocity = Vector3.Zero; // what was last applied to body
108	// private Vector3 m_lastVertAttractor = Vector3.Zero; // what VA was last applied to body	108	// private Vector3 m_lastVertAttractor = Vector3.Zero; // what VA was last applied to body
109		109
110	//Deflection properties	110	//Deflection properties
111	// private float m_angularDeflectionEfficiency = 0;	111	// private float m_angularDeflectionEfficiency = 0;
@@ -123,14 +123,14 @@ namespace OpenSim.Region.Physics.OdePlugin
123	// private float m_VhoverEfficiency = 0f;	123	// private float m_VhoverEfficiency = 0f;
124	private float m_VhoverTimescale = 0f;	124	private float m_VhoverTimescale = 0f;
125	private float m_VhoverTargetHeight = -1.0f; // if <0 then no hover, else its the current target height	125	private float m_VhoverTargetHeight = -1.0f; // if <0 then no hover, else its the current target height
126	private float m_VehicleBuoyancy = 0f; //KF: m_VehicleBuoyancy is set by VEHICLE_BUOYANCY for a vehicle.	126	private float m_VehicleBuoyancy = 0f; //KF: m_VehicleBuoyancy is set by VEHICLE_BUOYANCY for a vehicle.
127	// Modifies gravity. Slider between -1 (double-gravity) and 1 (full anti-gravity)	127	// Modifies gravity. Slider between -1 (double-gravity) and 1 (full anti-gravity)
128	// KF: So far I have found no good method to combine a script-requested .Z velocity and gravity.	128	// KF: So far I have found no good method to combine a script-requested .Z velocity and gravity.
129	// Therefore only m_VehicleBuoyancy=1 (0g) will use the script-requested .Z velocity.	129	// Therefore only m_VehicleBuoyancy=1 (0g) will use the script-requested .Z velocity.
130		130
131	//Attractor properties	131	//Attractor properties
132	private float m_verticalAttractionEfficiency = 1.0f; // damped	132	private float m_verticalAttractionEfficiency = 1.0f; // damped
133	private float m_verticalAttractionTimescale = 500f; // Timescale > 300 means no vert attractor.	133	private float m_verticalAttractionTimescale = 500f; // Timescale > 300 means no vert attractor.
134		134
135	internal void ProcessFloatVehicleParam(Vehicle pParam, float pValue)	135	internal void ProcessFloatVehicleParam(Vehicle pParam, float pValue)
136	{	136	{