diff options
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs')
-rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs | 1178 |
1 files changed, 806 insertions, 372 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs index dbc9039..f2c7cec 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs | |||
@@ -24,28 +24,16 @@ | |||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | 24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS |
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | * | 26 | * |
27 | 27 | * The quotations from http://wiki.secondlife.com/wiki/Linden_Vehicle_Tutorial | |
28 | /* RA: June 14, 2011. Copied from ODEDynamics.cs and converted to | 28 | * are Copyright (c) 2009 Linden Research, Inc and are used under their license |
29 | * call the BulletSim system. | 29 | * of Creative Commons Attribution-Share Alike 3.0 |
30 | */ | 30 | * (http://creativecommons.org/licenses/by-sa/3.0/). |
31 | /* Revised Aug, Sept 2009 by Kitto Flora. ODEDynamics.cs replaces | ||
32 | * ODEVehicleSettings.cs. It and ODEPrim.cs are re-organised: | ||
33 | * ODEPrim.cs contains methods dealing with Prim editing, Prim | ||
34 | * characteristics and Kinetic motion. | ||
35 | * ODEDynamics.cs contains methods dealing with Prim Physical motion | ||
36 | * (dynamics) and the associated settings. Old Linear and angular | ||
37 | * motors for dynamic motion have been replace with MoveLinear() | ||
38 | * and MoveAngular(); 'Physical' is used only to switch ODE dynamic | ||
39 | * simualtion on/off; VEHICAL_TYPE_NONE/VEHICAL_TYPE_<other> is to | ||
40 | * switch between 'VEHICLE' parameter use and general dynamics | ||
41 | * settings use. | ||
42 | */ | 31 | */ |
43 | 32 | ||
44 | using System; | 33 | using System; |
45 | using System.Collections.Generic; | 34 | using System.Collections.Generic; |
46 | using System.Reflection; | 35 | using System.Reflection; |
47 | using System.Runtime.InteropServices; | 36 | using System.Runtime.InteropServices; |
48 | using log4net; | ||
49 | using OpenMetaverse; | 37 | using OpenMetaverse; |
50 | using OpenSim.Framework; | 38 | using OpenSim.Framework; |
51 | using OpenSim.Region.Physics.Manager; | 39 | using OpenSim.Region.Physics.Manager; |
@@ -80,10 +68,10 @@ namespace OpenSim.Region.Physics.BulletSPlugin | |||
80 | private Quaternion m_referenceFrame = Quaternion.Identity; | 68 | private Quaternion m_referenceFrame = Quaternion.Identity; |
81 | 69 | ||
82 | // Linear properties | 70 | // Linear properties |
71 | private BSVMotor m_linearMotor = new BSVMotor("LinearMotor"); | ||
83 | private Vector3 m_linearMotorDirection = Vector3.Zero; // velocity requested by LSL, decayed by time | 72 | private Vector3 m_linearMotorDirection = Vector3.Zero; // velocity requested by LSL, decayed by time |
84 | private Vector3 m_linearMotorOffset = Vector3.Zero; // the point of force can be offset from the center | 73 | private Vector3 m_linearMotorOffset = Vector3.Zero; // the point of force can be offset from the center |
85 | private Vector3 m_linearMotorDirectionLASTSET = Vector3.Zero; // velocity requested by LSL | 74 | private Vector3 m_linearMotorDirectionLASTSET = Vector3.Zero; // velocity requested by LSL |
86 | private Vector3 m_newVelocity = Vector3.Zero; // velocity computed to be applied to body | ||
87 | private Vector3 m_linearFrictionTimescale = Vector3.Zero; | 75 | private Vector3 m_linearFrictionTimescale = Vector3.Zero; |
88 | private float m_linearMotorDecayTimescale = 0; | 76 | private float m_linearMotorDecayTimescale = 0; |
89 | private float m_linearMotorTimescale = 0; | 77 | private float m_linearMotorTimescale = 0; |
@@ -93,16 +81,18 @@ namespace OpenSim.Region.Physics.BulletSPlugin | |||
93 | // private Vector3 m_linearMotorOffset = Vector3.Zero; | 81 | // private Vector3 m_linearMotorOffset = Vector3.Zero; |
94 | 82 | ||
95 | //Angular properties | 83 | //Angular properties |
84 | private BSVMotor m_angularMotor = new BSVMotor("AngularMotor"); | ||
96 | private Vector3 m_angularMotorDirection = Vector3.Zero; // angular velocity requested by LSL motor | 85 | private Vector3 m_angularMotorDirection = Vector3.Zero; // angular velocity requested by LSL motor |
97 | // private int m_angularMotorApply = 0; // application frame counter | 86 | // private int m_angularMotorApply = 0; // application frame counter |
98 | private Vector3 m_angularMotorVelocity = Vector3.Zero; // current angular motor velocity | 87 | private Vector3 m_angularMotorVelocity = Vector3.Zero; // current angular motor velocity |
99 | private float m_angularMotorTimescale = 0; // motor angular velocity ramp up rate | 88 | private float m_angularMotorTimescale = 0; // motor angular velocity ramp up rate |
100 | private float m_angularMotorDecayTimescale = 0; // motor angular velocity decay rate | 89 | private float m_angularMotorDecayTimescale = 0; // motor angular velocity decay rate |
101 | private Vector3 m_angularFrictionTimescale = Vector3.Zero; // body angular velocity decay rate | 90 | private Vector3 m_angularFrictionTimescale = Vector3.Zero; // body angular velocity decay rate |
102 | private Vector3 m_lastAngularVelocity = Vector3.Zero; // what was last applied to body | 91 | private Vector3 m_lastAngularVelocity = Vector3.Zero; |
103 | private Vector3 m_lastVertAttractor = Vector3.Zero; // what VA was last applied to body | 92 | private Vector3 m_lastVertAttractor = Vector3.Zero; // what VA was last applied to body |
104 | 93 | ||
105 | //Deflection properties | 94 | //Deflection properties |
95 | private BSVMotor m_angularDeflectionMotor = new BSVMotor("AngularDeflection"); | ||
106 | private float m_angularDeflectionEfficiency = 0; | 96 | private float m_angularDeflectionEfficiency = 0; |
107 | private float m_angularDeflectionTimescale = 0; | 97 | private float m_angularDeflectionTimescale = 0; |
108 | private float m_linearDeflectionEfficiency = 0; | 98 | private float m_linearDeflectionEfficiency = 0; |
@@ -114,32 +104,61 @@ namespace OpenSim.Region.Physics.BulletSPlugin | |||
114 | private float m_bankingTimescale = 0; | 104 | private float m_bankingTimescale = 0; |
115 | 105 | ||
116 | //Hover and Buoyancy properties | 106 | //Hover and Buoyancy properties |
107 | private BSVMotor m_hoverMotor = new BSVMotor("Hover"); | ||
117 | private float m_VhoverHeight = 0f; | 108 | private float m_VhoverHeight = 0f; |
118 | private float m_VhoverEfficiency = 0f; | 109 | private float m_VhoverEfficiency = 0f; |
119 | private float m_VhoverTimescale = 0f; | 110 | private float m_VhoverTimescale = 0f; |
120 | private float m_VhoverTargetHeight = -1.0f; // if <0 then no hover, else its the current target height | 111 | private float m_VhoverTargetHeight = -1.0f; // if <0 then no hover, else its the current target height |
121 | private float m_VehicleBuoyancy = 0f; //KF: m_VehicleBuoyancy is set by VEHICLE_BUOYANCY for a vehicle. | 112 | // Modifies gravity. Slider between -1 (double-gravity) and 1 (full anti-gravity) |
122 | // Modifies gravity. Slider between -1 (double-gravity) and 1 (full anti-gravity) | 113 | private float m_VehicleBuoyancy = 0f; |
123 | // KF: So far I have found no good method to combine a script-requested .Z velocity and gravity. | 114 | private Vector3 m_VehicleGravity = Vector3.Zero; // Gravity computed when buoyancy set |
124 | // Therefore only m_VehicleBuoyancy=1 (0g) will use the script-requested .Z velocity. | ||
125 | 115 | ||
126 | //Attractor properties | 116 | //Attractor properties |
127 | private float m_verticalAttractionEfficiency = 1.0f; // damped | 117 | private BSVMotor m_verticalAttractionMotor = new BSVMotor("VerticalAttraction"); |
128 | private float m_verticalAttractionTimescale = 500f; // Timescale > 300 means no vert attractor. | 118 | private float m_verticalAttractionEfficiency = 1.0f; // damped |
119 | private float m_verticalAttractionCutoff = 500f; // per the documentation | ||
120 | // Timescale > cutoff means no vert attractor. | ||
121 | private float m_verticalAttractionTimescale = 510f; | ||
122 | |||
123 | // Just some recomputed constants: | ||
124 | static readonly float PIOverFour = ((float)Math.PI) / 4f; | ||
125 | static readonly float PIOverTwo = ((float)Math.PI) / 2f; | ||
126 | |||
127 | // For debugging, flags to turn on and off individual corrections. | ||
128 | private bool enableAngularVerticalAttraction; | ||
129 | private bool enableAngularDeflection; | ||
130 | private bool enableAngularBanking; | ||
129 | 131 | ||
130 | public BSDynamics(BSScene myScene, BSPrim myPrim) | 132 | public BSDynamics(BSScene myScene, BSPrim myPrim) |
131 | { | 133 | { |
132 | PhysicsScene = myScene; | 134 | PhysicsScene = myScene; |
133 | Prim = myPrim; | 135 | Prim = myPrim; |
134 | Type = Vehicle.TYPE_NONE; | 136 | Type = Vehicle.TYPE_NONE; |
137 | SetupVehicleDebugging(); | ||
138 | } | ||
139 | |||
140 | // Stopgap debugging enablement. Allows source level debugging but still checking | ||
141 | // in changes by making enablement of debugging flags from INI file. | ||
142 | public void SetupVehicleDebugging() | ||
143 | { | ||
144 | enableAngularVerticalAttraction = true; | ||
145 | enableAngularDeflection = false; | ||
146 | enableAngularBanking = false; | ||
147 | if (BSParam.VehicleDebuggingEnabled != ConfigurationParameters.numericFalse) | ||
148 | { | ||
149 | enableAngularVerticalAttraction = false; | ||
150 | enableAngularDeflection = false; | ||
151 | enableAngularBanking = false; | ||
152 | } | ||
135 | } | 153 | } |
136 | 154 | ||
137 | // Return 'true' if this vehicle is doing vehicle things | 155 | // Return 'true' if this vehicle is doing vehicle things |
138 | public bool IsActive | 156 | public bool IsActive |
139 | { | 157 | { |
140 | get { return Type != Vehicle.TYPE_NONE; } | 158 | get { return (Type != Vehicle.TYPE_NONE && Prim.IsPhysicallyActive); } |
141 | } | 159 | } |
142 | 160 | ||
161 | #region Vehicle parameter setting | ||
143 | internal void ProcessFloatVehicleParam(Vehicle pParam, float pValue) | 162 | internal void ProcessFloatVehicleParam(Vehicle pParam, float pValue) |
144 | { | 163 | { |
145 | VDetailLog("{0},ProcessFloatVehicleParam,param={1},val={2}", Prim.LocalID, pParam, pValue); | 164 | VDetailLog("{0},ProcessFloatVehicleParam,param={1},val={2}", Prim.LocalID, pParam, pValue); |
@@ -152,13 +171,15 @@ namespace OpenSim.Region.Physics.BulletSPlugin | |||
152 | m_angularDeflectionTimescale = Math.Max(pValue, 0.01f); | 171 | m_angularDeflectionTimescale = Math.Max(pValue, 0.01f); |
153 | break; | 172 | break; |
154 | case Vehicle.ANGULAR_MOTOR_DECAY_TIMESCALE: | 173 | case Vehicle.ANGULAR_MOTOR_DECAY_TIMESCALE: |
155 | m_angularMotorDecayTimescale = Math.Max(pValue, 0.01f); | 174 | m_angularMotorDecayTimescale = ClampInRange(0.01f, pValue, 120); |
175 | m_angularMotor.TargetValueDecayTimeScale = m_angularMotorDecayTimescale; | ||
156 | break; | 176 | break; |
157 | case Vehicle.ANGULAR_MOTOR_TIMESCALE: | 177 | case Vehicle.ANGULAR_MOTOR_TIMESCALE: |
158 | m_angularMotorTimescale = Math.Max(pValue, 0.01f); | 178 | m_angularMotorTimescale = Math.Max(pValue, 0.01f); |
179 | m_angularMotor.TimeScale = m_angularMotorTimescale; | ||
159 | break; | 180 | break; |
160 | case Vehicle.BANKING_EFFICIENCY: | 181 | case Vehicle.BANKING_EFFICIENCY: |
161 | m_bankingEfficiency = Math.Max(-1f, Math.Min(pValue, 1f)); | 182 | m_bankingEfficiency = ClampInRange(-1f, pValue, 1f); |
162 | break; | 183 | break; |
163 | case Vehicle.BANKING_MIX: | 184 | case Vehicle.BANKING_MIX: |
164 | m_bankingMix = Math.Max(pValue, 0.01f); | 185 | m_bankingMix = Math.Max(pValue, 0.01f); |
@@ -167,10 +188,11 @@ namespace OpenSim.Region.Physics.BulletSPlugin | |||
167 | m_bankingTimescale = Math.Max(pValue, 0.01f); | 188 | m_bankingTimescale = Math.Max(pValue, 0.01f); |
168 | break; | 189 | break; |
169 | case Vehicle.BUOYANCY: | 190 | case Vehicle.BUOYANCY: |
170 | m_VehicleBuoyancy = Math.Max(-1f, Math.Min(pValue, 1f)); | 191 | m_VehicleBuoyancy = ClampInRange(-1f, pValue, 1f); |
192 | m_VehicleGravity = Prim.ComputeGravity(m_VehicleBuoyancy); | ||
171 | break; | 193 | break; |
172 | case Vehicle.HOVER_EFFICIENCY: | 194 | case Vehicle.HOVER_EFFICIENCY: |
173 | m_VhoverEfficiency = Math.Max(0f, Math.Min(pValue, 1f)); | 195 | m_VhoverEfficiency = ClampInRange(0f, pValue, 1f); |
174 | break; | 196 | break; |
175 | case Vehicle.HOVER_HEIGHT: | 197 | case Vehicle.HOVER_HEIGHT: |
176 | m_VhoverHeight = pValue; | 198 | m_VhoverHeight = pValue; |
@@ -185,33 +207,40 @@ namespace OpenSim.Region.Physics.BulletSPlugin | |||
185 | m_linearDeflectionTimescale = Math.Max(pValue, 0.01f); | 207 | m_linearDeflectionTimescale = Math.Max(pValue, 0.01f); |
186 | break; | 208 | break; |
187 | case Vehicle.LINEAR_MOTOR_DECAY_TIMESCALE: | 209 | case Vehicle.LINEAR_MOTOR_DECAY_TIMESCALE: |
188 | m_linearMotorDecayTimescale = Math.Max(pValue, 0.01f); | 210 | m_linearMotorDecayTimescale = ClampInRange(0.01f, pValue, 120); |
211 | m_linearMotor.TargetValueDecayTimeScale = m_linearMotorDecayTimescale; | ||
189 | break; | 212 | break; |
190 | case Vehicle.LINEAR_MOTOR_TIMESCALE: | 213 | case Vehicle.LINEAR_MOTOR_TIMESCALE: |
191 | m_linearMotorTimescale = Math.Max(pValue, 0.01f); | 214 | m_linearMotorTimescale = Math.Max(pValue, 0.01f); |
215 | m_linearMotor.TimeScale = m_linearMotorTimescale; | ||
192 | break; | 216 | break; |
193 | case Vehicle.VERTICAL_ATTRACTION_EFFICIENCY: | 217 | case Vehicle.VERTICAL_ATTRACTION_EFFICIENCY: |
194 | m_verticalAttractionEfficiency = Math.Max(0.1f, Math.Min(pValue, 1f)); | 218 | m_verticalAttractionEfficiency = ClampInRange(0.1f, pValue, 1f); |
219 | m_verticalAttractionMotor.Efficiency = m_verticalAttractionEfficiency; | ||
195 | break; | 220 | break; |
196 | case Vehicle.VERTICAL_ATTRACTION_TIMESCALE: | 221 | case Vehicle.VERTICAL_ATTRACTION_TIMESCALE: |
197 | m_verticalAttractionTimescale = Math.Max(pValue, 0.01f); | 222 | m_verticalAttractionTimescale = Math.Max(pValue, 0.01f); |
223 | m_verticalAttractionMotor.TimeScale = m_verticalAttractionTimescale; | ||
198 | break; | 224 | break; |
199 | 225 | ||
200 | // These are vector properties but the engine lets you use a single float value to | 226 | // These are vector properties but the engine lets you use a single float value to |
201 | // set all of the components to the same value | 227 | // set all of the components to the same value |
202 | case Vehicle.ANGULAR_FRICTION_TIMESCALE: | 228 | case Vehicle.ANGULAR_FRICTION_TIMESCALE: |
203 | m_angularFrictionTimescale = new Vector3(pValue, pValue, pValue); | 229 | m_angularFrictionTimescale = new Vector3(pValue, pValue, pValue); |
230 | m_angularMotor.FrictionTimescale = m_angularFrictionTimescale; | ||
204 | break; | 231 | break; |
205 | case Vehicle.ANGULAR_MOTOR_DIRECTION: | 232 | case Vehicle.ANGULAR_MOTOR_DIRECTION: |
206 | m_angularMotorDirection = new Vector3(pValue, pValue, pValue); | 233 | m_angularMotorDirection = new Vector3(pValue, pValue, pValue); |
207 | // m_angularMotorApply = 100; | 234 | m_angularMotor.SetTarget(m_angularMotorDirection); |
208 | break; | 235 | break; |
209 | case Vehicle.LINEAR_FRICTION_TIMESCALE: | 236 | case Vehicle.LINEAR_FRICTION_TIMESCALE: |
210 | m_linearFrictionTimescale = new Vector3(pValue, pValue, pValue); | 237 | m_linearFrictionTimescale = new Vector3(pValue, pValue, pValue); |
238 | m_linearMotor.FrictionTimescale = m_linearFrictionTimescale; | ||
211 | break; | 239 | break; |
212 | case Vehicle.LINEAR_MOTOR_DIRECTION: | 240 | case Vehicle.LINEAR_MOTOR_DIRECTION: |
213 | m_linearMotorDirection = new Vector3(pValue, pValue, pValue); | 241 | m_linearMotorDirection = new Vector3(pValue, pValue, pValue); |
214 | m_linearMotorDirectionLASTSET = new Vector3(pValue, pValue, pValue); | 242 | m_linearMotorDirectionLASTSET = new Vector3(pValue, pValue, pValue); |
243 | m_linearMotor.SetTarget(m_linearMotorDirection); | ||
215 | break; | 244 | break; |
216 | case Vehicle.LINEAR_MOTOR_OFFSET: | 245 | case Vehicle.LINEAR_MOTOR_OFFSET: |
217 | m_linearMotorOffset = new Vector3(pValue, pValue, pValue); | 246 | m_linearMotorOffset = new Vector3(pValue, pValue, pValue); |
@@ -227,21 +256,24 @@ namespace OpenSim.Region.Physics.BulletSPlugin | |||
227 | { | 256 | { |
228 | case Vehicle.ANGULAR_FRICTION_TIMESCALE: | 257 | case Vehicle.ANGULAR_FRICTION_TIMESCALE: |
229 | m_angularFrictionTimescale = new Vector3(pValue.X, pValue.Y, pValue.Z); | 258 | m_angularFrictionTimescale = new Vector3(pValue.X, pValue.Y, pValue.Z); |
259 | m_angularMotor.FrictionTimescale = m_angularFrictionTimescale; | ||
230 | break; | 260 | break; |
231 | case Vehicle.ANGULAR_MOTOR_DIRECTION: | 261 | case Vehicle.ANGULAR_MOTOR_DIRECTION: |
232 | // Limit requested angular speed to 2 rps= 4 pi rads/sec | 262 | // Limit requested angular speed to 2 rps= 4 pi rads/sec |
233 | pValue.X = Math.Max(-12.56f, Math.Min(pValue.X, 12.56f)); | 263 | pValue.X = ClampInRange(-12.56f, pValue.X, 12.56f); |
234 | pValue.Y = Math.Max(-12.56f, Math.Min(pValue.Y, 12.56f)); | 264 | pValue.Y = ClampInRange(-12.56f, pValue.Y, 12.56f); |
235 | pValue.Z = Math.Max(-12.56f, Math.Min(pValue.Z, 12.56f)); | 265 | pValue.Z = ClampInRange(-12.56f, pValue.Z, 12.56f); |
236 | m_angularMotorDirection = new Vector3(pValue.X, pValue.Y, pValue.Z); | 266 | m_angularMotorDirection = new Vector3(pValue.X, pValue.Y, pValue.Z); |
237 | // m_angularMotorApply = 100; | 267 | m_angularMotor.SetTarget(m_angularMotorDirection); |
238 | break; | 268 | break; |
239 | case Vehicle.LINEAR_FRICTION_TIMESCALE: | 269 | case Vehicle.LINEAR_FRICTION_TIMESCALE: |
240 | m_linearFrictionTimescale = new Vector3(pValue.X, pValue.Y, pValue.Z); | 270 | m_linearFrictionTimescale = new Vector3(pValue.X, pValue.Y, pValue.Z); |
271 | m_linearMotor.FrictionTimescale = m_linearFrictionTimescale; | ||
241 | break; | 272 | break; |
242 | case Vehicle.LINEAR_MOTOR_DIRECTION: | 273 | case Vehicle.LINEAR_MOTOR_DIRECTION: |
243 | m_linearMotorDirection = new Vector3(pValue.X, pValue.Y, pValue.Z); | 274 | m_linearMotorDirection = new Vector3(pValue.X, pValue.Y, pValue.Z); |
244 | m_linearMotorDirectionLASTSET = new Vector3(pValue.X, pValue.Y, pValue.Z); | 275 | m_linearMotorDirectionLASTSET = new Vector3(pValue.X, pValue.Y, pValue.Z); |
276 | m_linearMotor.SetTarget(m_linearMotorDirection); | ||
245 | break; | 277 | break; |
246 | case Vehicle.LINEAR_MOTOR_OFFSET: | 278 | case Vehicle.LINEAR_MOTOR_OFFSET: |
247 | m_linearMotorOffset = new Vector3(pValue.X, pValue.Y, pValue.Z); | 279 | m_linearMotorOffset = new Vector3(pValue.X, pValue.Y, pValue.Z); |
@@ -303,7 +335,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin | |||
303 | m_VhoverEfficiency = 0; | 335 | m_VhoverEfficiency = 0; |
304 | m_VhoverTimescale = 0; | 336 | m_VhoverTimescale = 0; |
305 | m_VehicleBuoyancy = 0; | 337 | m_VehicleBuoyancy = 0; |
306 | 338 | ||
307 | m_linearDeflectionEfficiency = 1; | 339 | m_linearDeflectionEfficiency = 1; |
308 | m_linearDeflectionTimescale = 1; | 340 | m_linearDeflectionTimescale = 1; |
309 | 341 | ||
@@ -319,6 +351,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin | |||
319 | 351 | ||
320 | m_referenceFrame = Quaternion.Identity; | 352 | m_referenceFrame = Quaternion.Identity; |
321 | m_flags = (VehicleFlag)0; | 353 | m_flags = (VehicleFlag)0; |
354 | |||
322 | break; | 355 | break; |
323 | 356 | ||
324 | case Vehicle.TYPE_SLED: | 357 | case Vehicle.TYPE_SLED: |
@@ -351,10 +384,14 @@ namespace OpenSim.Region.Physics.BulletSPlugin | |||
351 | m_bankingMix = 1; | 384 | m_bankingMix = 1; |
352 | 385 | ||
353 | m_referenceFrame = Quaternion.Identity; | 386 | m_referenceFrame = Quaternion.Identity; |
354 | m_flags |= (VehicleFlag.NO_DEFLECTION_UP | VehicleFlag.LIMIT_ROLL_ONLY | VehicleFlag.LIMIT_MOTOR_UP); | 387 | m_flags &= ~(VehicleFlag.HOVER_WATER_ONLY |
355 | m_flags &= | 388 | | VehicleFlag.HOVER_TERRAIN_ONLY |
356 | ~(VehicleFlag.HOVER_WATER_ONLY | VehicleFlag.HOVER_TERRAIN_ONLY | | 389 | | VehicleFlag.HOVER_GLOBAL_HEIGHT |
357 | VehicleFlag.HOVER_GLOBAL_HEIGHT | VehicleFlag.HOVER_UP_ONLY); | 390 | | VehicleFlag.HOVER_UP_ONLY); |
391 | m_flags |= (VehicleFlag.NO_DEFLECTION_UP | ||
392 | | VehicleFlag.LIMIT_ROLL_ONLY | ||
393 | | VehicleFlag.LIMIT_MOTOR_UP); | ||
394 | |||
358 | break; | 395 | break; |
359 | case Vehicle.TYPE_CAR: | 396 | case Vehicle.TYPE_CAR: |
360 | m_linearMotorDirection = Vector3.Zero; | 397 | m_linearMotorDirection = Vector3.Zero; |
@@ -498,6 +535,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin | |||
498 | m_bankingEfficiency = 0; | 535 | m_bankingEfficiency = 0; |
499 | m_bankingMix = 0.7f; | 536 | m_bankingMix = 0.7f; |
500 | m_bankingTimescale = 5; | 537 | m_bankingTimescale = 5; |
538 | |||
501 | m_referenceFrame = Quaternion.Identity; | 539 | m_referenceFrame = Quaternion.Identity; |
502 | 540 | ||
503 | m_referenceFrame = Quaternion.Identity; | 541 | m_referenceFrame = Quaternion.Identity; |
@@ -510,7 +548,30 @@ namespace OpenSim.Region.Physics.BulletSPlugin | |||
510 | | VehicleFlag.HOVER_GLOBAL_HEIGHT); | 548 | | VehicleFlag.HOVER_GLOBAL_HEIGHT); |
511 | break; | 549 | break; |
512 | } | 550 | } |
551 | |||
552 | // Update any physical parameters based on this type. | ||
553 | Refresh(); | ||
554 | |||
555 | m_linearMotor = new BSVMotor("LinearMotor", m_linearMotorTimescale, | ||
556 | m_linearMotorDecayTimescale, m_linearFrictionTimescale, | ||
557 | 1f); | ||
558 | m_linearMotor.PhysicsScene = PhysicsScene; // DEBUG DEBUG DEBUG (enables detail logging) | ||
559 | |||
560 | m_angularMotor = new BSVMotor("AngularMotor", m_angularMotorTimescale, | ||
561 | m_angularMotorDecayTimescale, m_angularFrictionTimescale, | ||
562 | 1f); | ||
563 | m_angularMotor.PhysicsScene = PhysicsScene; // DEBUG DEBUG DEBUG (enables detail logging) | ||
564 | |||
565 | /* Not implemented | ||
566 | m_verticalAttractionMotor = new BSVMotor("VerticalAttraction", m_verticalAttractionTimescale, | ||
567 | BSMotor.Infinite, BSMotor.InfiniteVector, | ||
568 | m_verticalAttractionEfficiency); | ||
569 | // Z goes away and we keep X and Y | ||
570 | m_verticalAttractionMotor.FrictionTimescale = new Vector3(BSMotor.Infinite, BSMotor.Infinite, 0.1f); | ||
571 | m_verticalAttractionMotor.PhysicsScene = PhysicsScene; // DEBUG DEBUG DEBUG (enables detail logging) | ||
572 | */ | ||
513 | } | 573 | } |
574 | #endregion // Vehicle parameter setting | ||
514 | 575 | ||
515 | // Some of the properties of this prim may have changed. | 576 | // Some of the properties of this prim may have changed. |
516 | // Do any updating needed for a vehicle | 577 | // Do any updating needed for a vehicle |
@@ -518,13 +579,38 @@ namespace OpenSim.Region.Physics.BulletSPlugin | |||
518 | { | 579 | { |
519 | if (IsActive) | 580 | if (IsActive) |
520 | { | 581 | { |
521 | // Friction effects are handled by this vehicle code | 582 | // Remember the mass so we don't have to fetch it every step |
522 | BulletSimAPI.SetFriction2(Prim.PhysBody.ptr, 0f); | 583 | m_vehicleMass = Prim.Linkset.LinksetMass; |
523 | BulletSimAPI.SetHitFraction2(Prim.PhysBody.ptr, 0f); | 584 | |
524 | 585 | // Friction affects are handled by this vehicle code | |
525 | // BulletSimAPI.SetAngularDamping2(Prim.PhysBody.ptr, 0.8f); | 586 | float friction = 0f; |
526 | 587 | PhysicsScene.PE.SetFriction(Prim.PhysBody, friction); | |
527 | VDetailLog("{0},BSDynamics.Refresh,zeroingFriction and adding damping", Prim.LocalID); | 588 | |
589 | // Moderate angular movement introduced by Bullet. | ||
590 | // TODO: possibly set AngularFactor and LinearFactor for the type of vehicle. | ||
591 | // Maybe compute linear and angular factor and damping from params. | ||
592 | float angularDamping = BSParam.VehicleAngularDamping; | ||
593 | PhysicsScene.PE.SetAngularDamping(Prim.PhysBody, angularDamping); | ||
594 | |||
595 | // Vehicles report collision events so we know when it's on the ground | ||
596 | PhysicsScene.PE.AddToCollisionFlags(Prim.PhysBody, CollisionFlags.BS_VEHICLE_COLLISIONS); | ||
597 | |||
598 | Prim.Inertia = PhysicsScene.PE.CalculateLocalInertia(Prim.PhysShape, m_vehicleMass); | ||
599 | PhysicsScene.PE.SetMassProps(Prim.PhysBody, m_vehicleMass, Prim.Inertia); | ||
600 | PhysicsScene.PE.UpdateInertiaTensor(Prim.PhysBody); | ||
601 | |||
602 | // Set the gravity for the vehicle depending on the buoyancy | ||
603 | // TODO: what should be done if prim and vehicle buoyancy differ? | ||
604 | m_VehicleGravity = Prim.ComputeGravity(m_VehicleBuoyancy); | ||
605 | // The actual vehicle gravity is set to zero in Bullet so we can do all the application of same. | ||
606 | PhysicsScene.PE.SetGravity(Prim.PhysBody, Vector3.Zero); | ||
607 | |||
608 | VDetailLog("{0},BSDynamics.Refresh,mass={1},frict={2},inert={3},aDamp={4},grav={5}", | ||
609 | Prim.LocalID, m_vehicleMass, friction, Prim.Inertia, angularDamping, m_VehicleGravity); | ||
610 | } | ||
611 | else | ||
612 | { | ||
613 | PhysicsScene.PE.RemoveFromCollisionFlags(Prim.PhysBody, CollisionFlags.BS_VEHICLE_COLLISIONS); | ||
528 | } | 614 | } |
529 | } | 615 | } |
530 | 616 | ||
@@ -546,116 +632,383 @@ namespace OpenSim.Region.Physics.BulletSPlugin | |||
546 | Refresh(); | 632 | Refresh(); |
547 | } | 633 | } |
548 | 634 | ||
635 | #region Known vehicle value functions | ||
636 | // Vehicle physical parameters that we buffer from constant getting and setting. | ||
637 | // The "m_known*" values are unknown until they are fetched and the m_knownHas flag is set. | ||
638 | // Changing is remembered and the parameter is stored back into the physics engine only if updated. | ||
639 | // This does two things: 1) saves continuious calls into unmanaged code, and | ||
640 | // 2) signals when a physics property update must happen back to the simulator | ||
641 | // to update values modified for the vehicle. | ||
642 | private int m_knownChanged; | ||
643 | private int m_knownHas; | ||
644 | private float m_knownTerrainHeight; | ||
645 | private float m_knownWaterLevel; | ||
646 | private Vector3 m_knownPosition; | ||
647 | private Vector3 m_knownVelocity; | ||
648 | private Vector3 m_knownForce; | ||
649 | private Vector3 m_knownForceImpulse; | ||
650 | private Quaternion m_knownOrientation; | ||
651 | private Vector3 m_knownRotationalVelocity; | ||
652 | private Vector3 m_knownRotationalForce; | ||
653 | private Vector3 m_knownRotationalImpulse; | ||
654 | private Vector3 m_knownForwardVelocity; // vehicle relative forward speed | ||
655 | |||
656 | private const int m_knownChangedPosition = 1 << 0; | ||
657 | private const int m_knownChangedVelocity = 1 << 1; | ||
658 | private const int m_knownChangedForce = 1 << 2; | ||
659 | private const int m_knownChangedForceImpulse = 1 << 3; | ||
660 | private const int m_knownChangedOrientation = 1 << 4; | ||
661 | private const int m_knownChangedRotationalVelocity = 1 << 5; | ||
662 | private const int m_knownChangedRotationalForce = 1 << 6; | ||
663 | private const int m_knownChangedRotationalImpulse = 1 << 7; | ||
664 | private const int m_knownChangedTerrainHeight = 1 << 8; | ||
665 | private const int m_knownChangedWaterLevel = 1 << 9; | ||
666 | private const int m_knownChangedForwardVelocity = 1 <<10; | ||
667 | |||
668 | private void ForgetKnownVehicleProperties() | ||
669 | { | ||
670 | m_knownHas = 0; | ||
671 | m_knownChanged = 0; | ||
672 | } | ||
673 | // Push all the changed values back into the physics engine | ||
674 | private void PushKnownChanged() | ||
675 | { | ||
676 | if (m_knownChanged != 0) | ||
677 | { | ||
678 | if ((m_knownChanged & m_knownChangedPosition) != 0) | ||
679 | Prim.ForcePosition = m_knownPosition; | ||
680 | |||
681 | if ((m_knownChanged & m_knownChangedOrientation) != 0) | ||
682 | Prim.ForceOrientation = m_knownOrientation; | ||
683 | |||
684 | if ((m_knownChanged & m_knownChangedVelocity) != 0) | ||
685 | { | ||
686 | Prim.ForceVelocity = m_knownVelocity; | ||
687 | // Fake out Bullet by making it think the velocity is the same as last time. | ||
688 | // Bullet does a bunch of smoothing for changing parameters. | ||
689 | // Since the vehicle is demanding this setting, we override Bullet's smoothing | ||
690 | // by telling Bullet the value was the same last time. | ||
691 | PhysicsScene.PE.SetInterpolationLinearVelocity(Prim.PhysBody, m_knownVelocity); | ||
692 | } | ||
693 | |||
694 | if ((m_knownChanged & m_knownChangedForce) != 0) | ||
695 | Prim.AddForce((Vector3)m_knownForce, false /*pushForce*/, true /*inTaintTime*/); | ||
696 | |||
697 | if ((m_knownChanged & m_knownChangedForceImpulse) != 0) | ||
698 | Prim.AddForceImpulse((Vector3)m_knownForceImpulse, false /*pushforce*/, true /*inTaintTime*/); | ||
699 | |||
700 | if ((m_knownChanged & m_knownChangedRotationalVelocity) != 0) | ||
701 | { | ||
702 | Prim.ForceRotationalVelocity = m_knownRotationalVelocity; | ||
703 | PhysicsScene.PE.SetInterpolationAngularVelocity(Prim.PhysBody, m_knownRotationalVelocity); | ||
704 | } | ||
705 | |||
706 | if ((m_knownChanged & m_knownChangedRotationalImpulse) != 0) | ||
707 | Prim.ApplyTorqueImpulse((Vector3)m_knownRotationalImpulse, true /*inTaintTime*/); | ||
708 | |||
709 | if ((m_knownChanged & m_knownChangedRotationalForce) != 0) | ||
710 | { | ||
711 | Prim.AddAngularForce((Vector3)m_knownRotationalForce, false /*pushForce*/, true /*inTaintTime*/); | ||
712 | } | ||
713 | |||
714 | // If we set one of the values (ie, the physics engine didn't do it) we must force | ||
715 | // an UpdateProperties event to send the changes up to the simulator. | ||
716 | PhysicsScene.PE.PushUpdate(Prim.PhysBody); | ||
717 | } | ||
718 | m_knownChanged = 0; | ||
719 | } | ||
720 | |||
721 | // Since the computation of terrain height can be a little involved, this routine | ||
722 | // is used to fetch the height only once for each vehicle simulation step. | ||
723 | private float GetTerrainHeight(Vector3 pos) | ||
724 | { | ||
725 | if ((m_knownHas & m_knownChangedTerrainHeight) == 0) | ||
726 | { | ||
727 | m_knownTerrainHeight = Prim.PhysicsScene.TerrainManager.GetTerrainHeightAtXYZ(pos); | ||
728 | m_knownHas |= m_knownChangedTerrainHeight; | ||
729 | } | ||
730 | return m_knownTerrainHeight; | ||
731 | } | ||
732 | |||
733 | // Since the computation of water level can be a little involved, this routine | ||
734 | // is used ot fetch the level only once for each vehicle simulation step. | ||
735 | private float GetWaterLevel(Vector3 pos) | ||
736 | { | ||
737 | if ((m_knownHas & m_knownChangedWaterLevel) == 0) | ||
738 | { | ||
739 | m_knownWaterLevel = Prim.PhysicsScene.TerrainManager.GetWaterLevelAtXYZ(pos); | ||
740 | m_knownHas |= m_knownChangedWaterLevel; | ||
741 | } | ||
742 | return (float)m_knownWaterLevel; | ||
743 | } | ||
744 | |||
745 | private Vector3 VehiclePosition | ||
746 | { | ||
747 | get | ||
748 | { | ||
749 | if ((m_knownHas & m_knownChangedPosition) == 0) | ||
750 | { | ||
751 | m_knownPosition = Prim.ForcePosition; | ||
752 | m_knownHas |= m_knownChangedPosition; | ||
753 | } | ||
754 | return m_knownPosition; | ||
755 | } | ||
756 | set | ||
757 | { | ||
758 | m_knownPosition = value; | ||
759 | m_knownChanged |= m_knownChangedPosition; | ||
760 | m_knownHas |= m_knownChangedPosition; | ||
761 | } | ||
762 | } | ||
763 | |||
764 | private Quaternion VehicleOrientation | ||
765 | { | ||
766 | get | ||
767 | { | ||
768 | if ((m_knownHas & m_knownChangedOrientation) == 0) | ||
769 | { | ||
770 | m_knownOrientation = Prim.ForceOrientation; | ||
771 | m_knownHas |= m_knownChangedOrientation; | ||
772 | } | ||
773 | return m_knownOrientation; | ||
774 | } | ||
775 | set | ||
776 | { | ||
777 | m_knownOrientation = value; | ||
778 | m_knownChanged |= m_knownChangedOrientation; | ||
779 | m_knownHas |= m_knownChangedOrientation; | ||
780 | } | ||
781 | } | ||
782 | |||
783 | private Vector3 VehicleVelocity | ||
784 | { | ||
785 | get | ||
786 | { | ||
787 | if ((m_knownHas & m_knownChangedVelocity) == 0) | ||
788 | { | ||
789 | m_knownVelocity = Prim.ForceVelocity; | ||
790 | m_knownHas |= m_knownChangedVelocity; | ||
791 | } | ||
792 | return (Vector3)m_knownVelocity; | ||
793 | } | ||
794 | set | ||
795 | { | ||
796 | m_knownVelocity = value; | ||
797 | m_knownChanged |= m_knownChangedVelocity; | ||
798 | m_knownHas |= m_knownChangedVelocity; | ||
799 | } | ||
800 | } | ||
801 | |||
802 | private void VehicleAddForce(Vector3 pForce) | ||
803 | { | ||
804 | if ((m_knownHas & m_knownChangedForce) == 0) | ||
805 | { | ||
806 | m_knownForce = Vector3.Zero; | ||
807 | m_knownHas |= m_knownChangedForce; | ||
808 | } | ||
809 | m_knownForce += pForce; | ||
810 | m_knownChanged |= m_knownChangedForce; | ||
811 | } | ||
812 | |||
813 | private void VehicleAddForceImpulse(Vector3 pImpulse) | ||
814 | { | ||
815 | if ((m_knownHas & m_knownChangedForceImpulse) == 0) | ||
816 | { | ||
817 | m_knownForceImpulse = Vector3.Zero; | ||
818 | m_knownHas |= m_knownChangedForceImpulse; | ||
819 | } | ||
820 | m_knownForceImpulse += pImpulse; | ||
821 | m_knownChanged |= m_knownChangedForceImpulse; | ||
822 | } | ||
823 | |||
824 | private Vector3 VehicleRotationalVelocity | ||
825 | { | ||
826 | get | ||
827 | { | ||
828 | if ((m_knownHas & m_knownChangedRotationalVelocity) == 0) | ||
829 | { | ||
830 | m_knownRotationalVelocity = Prim.ForceRotationalVelocity; | ||
831 | m_knownHas |= m_knownChangedRotationalVelocity; | ||
832 | } | ||
833 | return (Vector3)m_knownRotationalVelocity; | ||
834 | } | ||
835 | set | ||
836 | { | ||
837 | m_knownRotationalVelocity = value; | ||
838 | m_knownChanged |= m_knownChangedRotationalVelocity; | ||
839 | m_knownHas |= m_knownChangedRotationalVelocity; | ||
840 | } | ||
841 | } | ||
842 | private void VehicleAddAngularForce(Vector3 aForce) | ||
843 | { | ||
844 | if ((m_knownHas & m_knownChangedRotationalForce) == 0) | ||
845 | { | ||
846 | m_knownRotationalForce = Vector3.Zero; | ||
847 | } | ||
848 | m_knownRotationalForce += aForce; | ||
849 | m_knownChanged |= m_knownChangedRotationalForce; | ||
850 | m_knownHas |= m_knownChangedRotationalForce; | ||
851 | } | ||
852 | private void VehicleAddRotationalImpulse(Vector3 pImpulse) | ||
853 | { | ||
854 | if ((m_knownHas & m_knownChangedRotationalImpulse) == 0) | ||
855 | { | ||
856 | m_knownRotationalImpulse = Vector3.Zero; | ||
857 | m_knownHas |= m_knownChangedRotationalImpulse; | ||
858 | } | ||
859 | m_knownRotationalImpulse += pImpulse; | ||
860 | m_knownChanged |= m_knownChangedRotationalImpulse; | ||
861 | } | ||
862 | |||
863 | // Vehicle relative forward velocity | ||
864 | private Vector3 VehicleForwardVelocity | ||
865 | { | ||
866 | get | ||
867 | { | ||
868 | if ((m_knownHas & m_knownChangedForwardVelocity) == 0) | ||
869 | { | ||
870 | m_knownForwardVelocity = VehicleVelocity * Quaternion.Inverse(Quaternion.Normalize(VehicleOrientation)); | ||
871 | m_knownHas |= m_knownChangedForwardVelocity; | ||
872 | } | ||
873 | return m_knownForwardVelocity; | ||
874 | } | ||
875 | } | ||
876 | private float VehicleForwardSpeed | ||
877 | { | ||
878 | get | ||
879 | { | ||
880 | return VehicleForwardVelocity.X; | ||
881 | } | ||
882 | } | ||
883 | |||
884 | #endregion // Known vehicle value functions | ||
885 | |||
549 | // One step of the vehicle properties for the next 'pTimestep' seconds. | 886 | // One step of the vehicle properties for the next 'pTimestep' seconds. |
550 | internal void Step(float pTimestep) | 887 | internal void Step(float pTimestep) |
551 | { | 888 | { |
552 | if (!IsActive) return; | 889 | if (!IsActive) return; |
553 | 890 | ||
554 | // DEBUG | 891 | if (PhysicsScene.VehiclePhysicalLoggingEnabled) |
555 | // Because Bullet does apply forces to the vehicle, our last computed | 892 | PhysicsScene.PE.DumpRigidBody(PhysicsScene.World, Prim.PhysBody); |
556 | // linear and angular velocities are not what is happening now. | ||
557 | // Vector3 externalAngularVelocity = Prim.ForceRotationalVelocity - m_lastAngularVelocity; | ||
558 | // m_lastAngularVelocity += (externalAngularVelocity * 0.5f) * pTimestep; | ||
559 | // m_lastAngularVelocity = Prim.ForceRotationalVelocity; // DEBUG: account for what Bullet did last time | ||
560 | // m_lastLinearVelocityVector = Prim.ForceVelocity * Quaternion.Inverse(Prim.ForceOrientation); // DEBUG: | ||
561 | // END DEBUG | ||
562 | 893 | ||
563 | m_vehicleMass = Prim.Linkset.LinksetMass; | 894 | ForgetKnownVehicleProperties(); |
564 | 895 | ||
565 | MoveLinear(pTimestep); | 896 | MoveLinear(pTimestep); |
566 | // Commented out for debug | ||
567 | MoveAngular(pTimestep); | 897 | MoveAngular(pTimestep); |
568 | // Prim.ApplyTorqueImpulse(-Prim.RotationalVelocity * m_vehicleMass, false); // DEBUG DEBUG | ||
569 | // Prim.ForceRotationalVelocity = -Prim.RotationalVelocity; // DEBUG DEBUG | ||
570 | 898 | ||
571 | LimitRotation(pTimestep); | 899 | LimitRotation(pTimestep); |
572 | 900 | ||
573 | // remember the position so next step we can limit absolute movement effects | 901 | // remember the position so next step we can limit absolute movement effects |
574 | m_lastPositionVector = Prim.ForcePosition; | 902 | m_lastPositionVector = VehiclePosition; |
575 | 903 | ||
576 | VDetailLog("{0},BSDynamics.Step,frict={1},grav={2},inertia={3},mass={4}", // DEBUG DEBUG | 904 | // If we forced the changing of some vehicle parameters, update the values and |
577 | Prim.LocalID, | 905 | // for the physics engine to note the changes so an UpdateProperties event will happen. |
578 | BulletSimAPI.GetFriction2(Prim.PhysBody.ptr), | 906 | PushKnownChanged(); |
579 | BulletSimAPI.GetGravity2(Prim.PhysBody.ptr), | 907 | |
580 | Prim.Inertia, | 908 | if (PhysicsScene.VehiclePhysicalLoggingEnabled) |
581 | m_vehicleMass | 909 | PhysicsScene.PE.DumpRigidBody(PhysicsScene.World, Prim.PhysBody); |
582 | ); | ||
583 | VDetailLog("{0},BSDynamics.Step,done,pos={1},force={2},velocity={3},angvel={4}", | ||
584 | Prim.LocalID, Prim.ForcePosition, Prim.Force, Prim.ForceVelocity, Prim.RotationalVelocity); | ||
585 | }// end Step | ||
586 | 910 | ||
587 | // Apply the effect of the linear motor. | 911 | VDetailLog("{0},BSDynamics.Step,done,pos={1}, force={2},velocity={3},angvel={4}", |
588 | // Also does hover and float. | 912 | Prim.LocalID, VehiclePosition, m_knownForce, VehicleVelocity, VehicleRotationalVelocity); |
913 | } | ||
914 | |||
915 | // Apply the effect of the linear motor and other linear motions (like hover and float). | ||
589 | private void MoveLinear(float pTimestep) | 916 | private void MoveLinear(float pTimestep) |
590 | { | 917 | { |
591 | // m_linearMotorDirection is the target direction we are moving relative to the vehicle coordinates | 918 | ComputeLinearVelocity(pTimestep); |
592 | // m_lastLinearVelocityVector is the current speed we are moving in that direction | 919 | |
593 | if (m_linearMotorDirection.LengthSquared() > 0.001f) | 920 | ComputeLinearTerrainHeightCorrection(pTimestep); |
921 | |||
922 | ComputeLinearHover(pTimestep); | ||
923 | |||
924 | ComputeLinearBlockingEndPoint(pTimestep); | ||
925 | |||
926 | ComputeLinearMotorUp(pTimestep); | ||
927 | |||
928 | ApplyGravity(pTimestep); | ||
929 | |||
930 | // If not changing some axis, reduce out velocity | ||
931 | if ((m_flags & (VehicleFlag.NO_X | VehicleFlag.NO_Y | VehicleFlag.NO_Z)) != 0) | ||
932 | { | ||
933 | Vector3 vel = VehicleVelocity; | ||
934 | if ((m_flags & (VehicleFlag.NO_X)) != 0) | ||
935 | vel.X = 0; | ||
936 | if ((m_flags & (VehicleFlag.NO_Y)) != 0) | ||
937 | vel.Y = 0; | ||
938 | if ((m_flags & (VehicleFlag.NO_Z)) != 0) | ||
939 | vel.Z = 0; | ||
940 | VehicleVelocity = vel; | ||
941 | } | ||
942 | |||
943 | // ================================================================== | ||
944 | // Clamp high or low velocities | ||
945 | float newVelocityLengthSq = VehicleVelocity.LengthSquared(); | ||
946 | if (newVelocityLengthSq > 1000f) | ||
594 | { | 947 | { |
595 | Vector3 origDir = m_linearMotorDirection; // DEBUG | 948 | VehicleVelocity /= VehicleVelocity.Length(); |
596 | Vector3 origVel = m_lastLinearVelocityVector; // DEBUG | 949 | VehicleVelocity *= 1000f; |
597 | // DEBUG: the vehicle velocity rotated to be relative to vehicle coordinates for comparison | 950 | } |
598 | Vector3 vehicleVelocity = Prim.ForceVelocity * Quaternion.Inverse(Prim.ForceOrientation); // DEBUG | 951 | else if (newVelocityLengthSq < 0.001f) |
952 | VehicleVelocity = Vector3.Zero; | ||
599 | 953 | ||
600 | // Add (desiredVelocity - lastAppliedVelocity) / howLongItShouldTakeToComplete | 954 | VDetailLog("{0}, MoveLinear,done,isColl={1},newVel={2}", Prim.LocalID, Prim.IsColliding, VehicleVelocity ); |
601 | Vector3 addAmount = (m_linearMotorDirection - m_lastLinearVelocityVector)/(m_linearMotorTimescale) * pTimestep; | ||
602 | m_lastLinearVelocityVector += addAmount; | ||
603 | 955 | ||
604 | float decayFactor = (1.0f / m_linearMotorDecayTimescale) * pTimestep; | 956 | } // end MoveLinear() |
605 | m_linearMotorDirection *= (1f - decayFactor); | ||
606 | 957 | ||
607 | // Rotate new object velocity from vehicle relative to world coordinates | 958 | public void ComputeLinearVelocity(float pTimestep) |
608 | m_newVelocity = m_lastLinearVelocityVector * Prim.ForceOrientation; | 959 | { |
960 | Vector3 linearMotorStep = m_linearMotor.Step(pTimestep); | ||
609 | 961 | ||
610 | // Apply friction for next time | 962 | // The movement computed in the linear motor is relative to the vehicle |
611 | Vector3 frictionFactor = (Vector3.One / m_linearFrictionTimescale) * pTimestep; | 963 | // coordinates. Rotate the movement to world coordinates. |
612 | m_lastLinearVelocityVector *= (Vector3.One - frictionFactor); | 964 | Vector3 linearMotorVelocity = linearMotorStep * VehicleOrientation; |
613 | 965 | ||
614 | VDetailLog("{0},MoveLinear,nonZero,origlmDir={1},origlvVel={2},vehVel={3},add={4},decay={5},frict={6},lmDir={7},lvVec={8},newVel={9}", | 966 | // If we're a ground vehicle, don't loose any Z action (like gravity acceleration). |
615 | Prim.LocalID, origDir, origVel, vehicleVelocity, addAmount, decayFactor, frictionFactor, | 967 | float mixFactor = 1f; // 1 means use all linear motor Z value, 0 means use all existing Z |
616 | m_linearMotorDirection, m_lastLinearVelocityVector, m_newVelocity); | 968 | if ((m_flags & VehicleFlag.LIMIT_MOTOR_UP) != 0) |
969 | { | ||
970 | if (!Prim.IsColliding) | ||
971 | { | ||
972 | // If a ground vehicle and not on the ground, I want gravity effect | ||
973 | mixFactor = 0.2f; | ||
974 | } | ||
617 | } | 975 | } |
618 | else | 976 | else |
619 | { | 977 | { |
620 | // if what remains of direction is very small, zero it. | 978 | // I'm not a ground vehicle but don't totally loose the effect of the environment |
621 | m_linearMotorDirection = Vector3.Zero; | 979 | mixFactor = 0.8f; |
622 | m_lastLinearVelocityVector = Vector3.Zero; | ||
623 | m_newVelocity = Vector3.Zero; | ||
624 | |||
625 | VDetailLog("{0},MoveLinear,zeroed", Prim.LocalID); | ||
626 | } | 980 | } |
981 | linearMotorVelocity.Z = mixFactor * linearMotorVelocity.Z + (1f - mixFactor) * VehicleVelocity.Z; | ||
627 | 982 | ||
628 | // m_newVelocity is velocity computed from linear motor in world coordinates | 983 | // What we want to contribute to the vehicle's existing velocity |
984 | Vector3 linearMotorForce = linearMotorVelocity - VehicleVelocity; | ||
629 | 985 | ||
630 | // Gravity and Buoyancy | 986 | // Act against the inertia of the vehicle |
631 | // There is some gravity, make a gravity force vector that is applied after object velocity. | 987 | linearMotorForce *= m_vehicleMass; |
632 | // m_VehicleBuoyancy: -1=2g; 0=1g; 1=0g; | ||
633 | Vector3 grav = Prim.PhysicsScene.DefaultGravity * (1f - m_VehicleBuoyancy); | ||
634 | 988 | ||
635 | /* | 989 | VehicleAddForceImpulse(linearMotorForce * pTimestep); |
636 | * RA: Not sure why one would do this unless we are hoping external forces are doing gravity, ... | ||
637 | // Preserve the current Z velocity | ||
638 | Vector3 vel_now = m_prim.Velocity; | ||
639 | m_dir.Z = vel_now.Z; // Preserve the accumulated falling velocity | ||
640 | */ | ||
641 | 990 | ||
642 | Vector3 pos = Prim.ForcePosition; | 991 | VDetailLog("{0}, MoveLinear,velocity,vehVel={1},step={2},stepVel={3},mix={4},force={5}", |
643 | // Vector3 accel = new Vector3(-(m_dir.X - m_lastLinearVelocityVector.X / 0.1f), -(m_dir.Y - m_lastLinearVelocityVector.Y / 0.1f), m_dir.Z - m_lastLinearVelocityVector.Z / 0.1f); | 992 | Prim.LocalID, VehicleVelocity, linearMotorStep, linearMotorVelocity, mixFactor, linearMotorForce); |
993 | } | ||
644 | 994 | ||
995 | public void ComputeLinearTerrainHeightCorrection(float pTimestep) | ||
996 | { | ||
645 | // If below the terrain, move us above the ground a little. | 997 | // If below the terrain, move us above the ground a little. |
646 | float terrainHeight = Prim.PhysicsScene.TerrainManager.GetTerrainHeightAtXYZ(pos); | 998 | // TODO: Consider taking the rotated size of the object or possibly casting a ray. |
647 | // Taking the rotated size doesn't work here because m_prim.Size is the size of the root prim and not the linkset. | 999 | if (VehiclePosition.Z < GetTerrainHeight(VehiclePosition)) |
648 | // TODO: Add a m_prim.LinkSet.Size similar to m_prim.LinkSet.Mass. | ||
649 | // Vector3 rotatedSize = m_prim.Size * m_prim.ForceOrientation; | ||
650 | // if (rotatedSize.Z < terrainHeight) | ||
651 | if (pos.Z < terrainHeight) | ||
652 | { | 1000 | { |
653 | pos.Z = terrainHeight + 2; | 1001 | // Force position because applying force won't get the vehicle through the terrain |
654 | Prim.ForcePosition = pos; | 1002 | Vector3 newPosition = VehiclePosition; |
655 | VDetailLog("{0},MoveLinear,terrainHeight,terrainHeight={1},pos={2}", Prim.LocalID, terrainHeight, pos); | 1003 | newPosition.Z = GetTerrainHeight(VehiclePosition) + 1f; |
1004 | VehiclePosition = newPosition; | ||
1005 | VDetailLog("{0}, MoveLinear,terrainHeight,terrainHeight={1},pos={2}", | ||
1006 | Prim.LocalID, GetTerrainHeight(VehiclePosition), VehiclePosition); | ||
656 | } | 1007 | } |
1008 | } | ||
657 | 1009 | ||
658 | // Check if hovering | 1010 | public void ComputeLinearHover(float pTimestep) |
1011 | { | ||
659 | // m_VhoverEfficiency: 0=bouncy, 1=totally damped | 1012 | // m_VhoverEfficiency: 0=bouncy, 1=totally damped |
660 | // m_VhoverTimescale: time to achieve height | 1013 | // m_VhoverTimescale: time to achieve height |
661 | if ((m_flags & (VehicleFlag.HOVER_WATER_ONLY | VehicleFlag.HOVER_TERRAIN_ONLY | VehicleFlag.HOVER_GLOBAL_HEIGHT)) != 0) | 1014 | if ((m_flags & (VehicleFlag.HOVER_WATER_ONLY | VehicleFlag.HOVER_TERRAIN_ONLY | VehicleFlag.HOVER_GLOBAL_HEIGHT)) != 0) |
@@ -663,11 +1016,11 @@ namespace OpenSim.Region.Physics.BulletSPlugin | |||
663 | // We should hover, get the target height | 1016 | // We should hover, get the target height |
664 | if ((m_flags & VehicleFlag.HOVER_WATER_ONLY) != 0) | 1017 | if ((m_flags & VehicleFlag.HOVER_WATER_ONLY) != 0) |
665 | { | 1018 | { |
666 | m_VhoverTargetHeight = Prim.PhysicsScene.GetWaterLevelAtXYZ(pos) + m_VhoverHeight; | 1019 | m_VhoverTargetHeight = GetWaterLevel(VehiclePosition) + m_VhoverHeight; |
667 | } | 1020 | } |
668 | if ((m_flags & VehicleFlag.HOVER_TERRAIN_ONLY) != 0) | 1021 | if ((m_flags & VehicleFlag.HOVER_TERRAIN_ONLY) != 0) |
669 | { | 1022 | { |
670 | m_VhoverTargetHeight = terrainHeight + m_VhoverHeight; | 1023 | m_VhoverTargetHeight = GetTerrainHeight(VehiclePosition) + m_VhoverHeight; |
671 | } | 1024 | } |
672 | if ((m_flags & VehicleFlag.HOVER_GLOBAL_HEIGHT) != 0) | 1025 | if ((m_flags & VehicleFlag.HOVER_GLOBAL_HEIGHT) != 0) |
673 | { | 1026 | { |
@@ -677,45 +1030,63 @@ namespace OpenSim.Region.Physics.BulletSPlugin | |||
677 | if ((m_flags & VehicleFlag.HOVER_UP_ONLY) != 0) | 1030 | if ((m_flags & VehicleFlag.HOVER_UP_ONLY) != 0) |
678 | { | 1031 | { |
679 | // If body is already heigher, use its height as target height | 1032 | // If body is already heigher, use its height as target height |
680 | if (pos.Z > m_VhoverTargetHeight) | 1033 | if (VehiclePosition.Z > m_VhoverTargetHeight) |
681 | m_VhoverTargetHeight = pos.Z; | 1034 | m_VhoverTargetHeight = VehiclePosition.Z; |
682 | } | 1035 | } |
1036 | |||
683 | if ((m_flags & VehicleFlag.LOCK_HOVER_HEIGHT) != 0) | 1037 | if ((m_flags & VehicleFlag.LOCK_HOVER_HEIGHT) != 0) |
684 | { | 1038 | { |
685 | if (Math.Abs(pos.Z - m_VhoverTargetHeight) > 0.2f) | 1039 | if (Math.Abs(VehiclePosition.Z - m_VhoverTargetHeight) > 0.2f) |
686 | { | 1040 | { |
1041 | Vector3 pos = VehiclePosition; | ||
687 | pos.Z = m_VhoverTargetHeight; | 1042 | pos.Z = m_VhoverTargetHeight; |
688 | Prim.ForcePosition = pos; | 1043 | VehiclePosition = pos; |
1044 | |||
1045 | VDetailLog("{0}, MoveLinear,hover,pos={1},lockHoverHeight", Prim.LocalID, pos); | ||
689 | } | 1046 | } |
690 | } | 1047 | } |
691 | else | 1048 | else |
692 | { | 1049 | { |
693 | float verticalError = pos.Z - m_VhoverTargetHeight; | 1050 | // Error is positive if below the target and negative if above. |
694 | // RA: where does the 50 come from? | 1051 | Vector3 hpos = VehiclePosition; |
695 | float verticalCorrectionVelocity = pTimestep * ((verticalError * 50.0f) / m_VhoverTimescale); | 1052 | float verticalError = m_VhoverTargetHeight - hpos.Z; |
696 | // Replace Vertical speed with correction figure if significant | 1053 | float verticalCorrection = verticalError / m_VhoverTimescale; |
697 | if (Math.Abs(verticalError) > 0.01f) | 1054 | verticalCorrection *= m_VhoverEfficiency; |
698 | { | 1055 | |
699 | m_newVelocity.Z += verticalCorrectionVelocity; | 1056 | hpos.Z += verticalCorrection; |
700 | //KF: m_VhoverEfficiency is not yet implemented | 1057 | VehiclePosition = hpos; |
701 | } | 1058 | |
702 | else if (verticalError < -0.01) | 1059 | // Since we are hovering, we need to do the opposite of falling -- get rid of world Z |
703 | { | 1060 | Vector3 vel = VehicleVelocity; |
704 | m_newVelocity.Z -= verticalCorrectionVelocity; | 1061 | vel.Z = 0f; |
705 | } | 1062 | VehicleVelocity = vel; |
706 | else | 1063 | |
707 | { | 1064 | /* |
708 | m_newVelocity.Z = 0f; | 1065 | float verticalCorrectionVelocity = verticalError / m_VhoverTimescale; |
709 | } | 1066 | Vector3 verticalCorrection = new Vector3(0f, 0f, verticalCorrectionVelocity); |
1067 | verticalCorrection *= m_vehicleMass; | ||
1068 | |||
1069 | // TODO: implement m_VhoverEfficiency correctly | ||
1070 | VehicleAddForceImpulse(verticalCorrection); | ||
1071 | */ | ||
1072 | |||
1073 | VDetailLog("{0}, MoveLinear,hover,pos={1},eff={2},hoverTS={3},height={4},target={5},err={6},corr={7}", | ||
1074 | Prim.LocalID, VehiclePosition, m_VhoverEfficiency, | ||
1075 | m_VhoverTimescale, m_VhoverHeight, m_VhoverTargetHeight, | ||
1076 | verticalError, verticalCorrection); | ||
710 | } | 1077 | } |
711 | 1078 | ||
712 | VDetailLog("{0},MoveLinear,hover,pos={1},dir={2},height={3},target={4}", Prim.LocalID, pos, m_newVelocity, m_VhoverHeight, m_VhoverTargetHeight); | ||
713 | } | 1079 | } |
1080 | } | ||
1081 | |||
1082 | public bool ComputeLinearBlockingEndPoint(float pTimestep) | ||
1083 | { | ||
1084 | bool changed = false; | ||
714 | 1085 | ||
1086 | Vector3 pos = VehiclePosition; | ||
715 | Vector3 posChange = pos - m_lastPositionVector; | 1087 | Vector3 posChange = pos - m_lastPositionVector; |
716 | if (m_BlockingEndPoint != Vector3.Zero) | 1088 | if (m_BlockingEndPoint != Vector3.Zero) |
717 | { | 1089 | { |
718 | bool changed = false; | ||
719 | if (pos.X >= (m_BlockingEndPoint.X - (float)1)) | 1090 | if (pos.X >= (m_BlockingEndPoint.X - (float)1)) |
720 | { | 1091 | { |
721 | pos.X -= posChange.X + 1; | 1092 | pos.X -= posChange.X + 1; |
@@ -743,233 +1114,152 @@ namespace OpenSim.Region.Physics.BulletSPlugin | |||
743 | } | 1114 | } |
744 | if (changed) | 1115 | if (changed) |
745 | { | 1116 | { |
746 | Prim.ForcePosition = pos; | 1117 | VehiclePosition = pos; |
747 | VDetailLog("{0},MoveLinear,blockingEndPoint,block={1},origPos={2},pos={3}", | 1118 | VDetailLog("{0}, MoveLinear,blockingEndPoint,block={1},origPos={2},pos={3}", |
748 | Prim.LocalID, m_BlockingEndPoint, posChange, pos); | 1119 | Prim.LocalID, m_BlockingEndPoint, posChange, pos); |
749 | } | 1120 | } |
750 | } | 1121 | } |
1122 | return changed; | ||
1123 | } | ||
751 | 1124 | ||
752 | #region downForce | 1125 | // From http://wiki.secondlife.com/wiki/LlSetVehicleFlags : |
753 | Vector3 downForce = Vector3.Zero; | 1126 | // Prevent ground vehicles from motoring into the sky. This flag has a subtle effect when |
1127 | // used with conjunction with banking: the strength of the banking will decay when the | ||
1128 | // vehicle no longer experiences collisions. The decay timescale is the same as | ||
1129 | // VEHICLE_BANKING_TIMESCALE. This is to help prevent ground vehicles from steering | ||
1130 | // when they are in mid jump. | ||
1131 | // TODO: this code is wrong. Also, what should it do for boats (height from water)? | ||
1132 | // This is just using the ground and a general collision check. Should really be using | ||
1133 | // a downward raycast to find what is below. | ||
1134 | public void ComputeLinearMotorUp(float pTimestep) | ||
1135 | { | ||
1136 | Vector3 ret = Vector3.Zero; | ||
754 | 1137 | ||
755 | if ((m_flags & (VehicleFlag.LIMIT_MOTOR_UP)) != 0) | 1138 | if ((m_flags & (VehicleFlag.LIMIT_MOTOR_UP)) != 0) |
756 | { | 1139 | { |
757 | // If the vehicle is motoring into the sky, get it going back down. | 1140 | // This code tries to decide if the object is not on the ground and then pushing down |
758 | // Is this an angular force or both linear and angular?? | 1141 | /* |
759 | float distanceAboveGround = pos.Z - terrainHeight; | 1142 | float targetHeight = Type == Vehicle.TYPE_BOAT ? GetWaterLevel(VehiclePosition) : GetTerrainHeight(VehiclePosition); |
760 | if (distanceAboveGround > 2f) | 1143 | distanceAboveGround = VehiclePosition.Z - targetHeight; |
1144 | // Not colliding if the vehicle is off the ground | ||
1145 | if (!Prim.IsColliding) | ||
761 | { | 1146 | { |
762 | // downForce = new Vector3(0, 0, (-distanceAboveGround / m_bankingTimescale) * pTimestep); | ||
763 | // downForce = new Vector3(0, 0, -distanceAboveGround / m_bankingTimescale); | 1147 | // downForce = new Vector3(0, 0, -distanceAboveGround / m_bankingTimescale); |
764 | downForce = new Vector3(0, 0, -distanceAboveGround); | 1148 | VehicleVelocity += new Vector3(0, 0, -distanceAboveGround); |
765 | } | 1149 | } |
766 | // TODO: this calculation is all wrong. From the description at | 1150 | // TODO: this calculation is wrong. From the description at |
767 | // (http://wiki.secondlife.com/wiki/Category:LSL_Vehicle), the downForce | 1151 | // (http://wiki.secondlife.com/wiki/Category:LSL_Vehicle), the downForce |
768 | // has a decay factor. This says this force should | 1152 | // has a decay factor. This says this force should |
769 | // be computed with a motor. | 1153 | // be computed with a motor. |
770 | VDetailLog("{0},MoveLinear,limitMotorUp,distAbove={1},downForce={2}", | 1154 | // TODO: add interaction with banking. |
771 | Prim.LocalID, distanceAboveGround, downForce); | 1155 | VDetailLog("{0}, MoveLinear,limitMotorUp,distAbove={1},colliding={2},ret={3}", |
772 | } | 1156 | Prim.LocalID, distanceAboveGround, Prim.IsColliding, ret); |
773 | #endregion // downForce | 1157 | */ |
774 | 1158 | ||
775 | // If not changing some axis, reduce out velocity | 1159 | // Another approach is to measure if we're going up. If going up and not colliding, |
776 | if ((m_flags & (VehicleFlag.NO_X)) != 0) | 1160 | // the vehicle is in the air. Fix that by pushing down. |
777 | m_newVelocity.X = 0; | 1161 | if (!Prim.IsColliding && VehicleVelocity.Z > 0.1) |
778 | if ((m_flags & (VehicleFlag.NO_Y)) != 0) | 1162 | { |
779 | m_newVelocity.Y = 0; | 1163 | // Get rid of any of the velocity vector that is pushing us up. |
780 | if ((m_flags & (VehicleFlag.NO_Z)) != 0) | 1164 | float upVelocity = VehicleVelocity.Z; |
781 | m_newVelocity.Z = 0; | 1165 | VehicleVelocity += new Vector3(0, 0, -upVelocity); |
782 | 1166 | ||
783 | // Clamp REALLY high or low velocities | 1167 | /* |
784 | if (m_newVelocity.LengthSquared() > 1e6f) | 1168 | // If we're pointed up into the air, we should nose down |
785 | { | 1169 | Vector3 pointingDirection = Vector3.UnitX * VehicleOrientation; |
786 | m_newVelocity /= m_newVelocity.Length(); | 1170 | // The rotation around the Y axis is pitch up or down |
787 | m_newVelocity *= 1000f; | 1171 | if (pointingDirection.Y > 0.01f) |
788 | } | 1172 | { |
789 | else if (m_newVelocity.LengthSquared() < 1e-6f) | 1173 | float angularCorrectionForce = -(float)Math.Asin(pointingDirection.Y); |
790 | m_newVelocity = Vector3.Zero; | 1174 | Vector3 angularCorrectionVector = new Vector3(0f, angularCorrectionForce, 0f); |
791 | 1175 | // Rotate into world coordinates and apply to vehicle | |
792 | // Stuff new linear velocity into the vehicle | 1176 | angularCorrectionVector *= VehicleOrientation; |
793 | Prim.ForceVelocity = m_newVelocity; | 1177 | VehicleAddAngularForce(angularCorrectionVector); |
794 | // Prim.ApplyForceImpulse((m_newVelocity - Prim.Velocity) * m_vehicleMass, false); // DEBUG DEBUG | 1178 | VDetailLog("{0}, MoveLinear,limitMotorUp,newVel={1},pntDir={2},corrFrc={3},aCorr={4}", |
795 | 1179 | Prim.LocalID, VehicleVelocity, pointingDirection, angularCorrectionForce, angularCorrectionVector); | |
796 | Vector3 totalDownForce = downForce + grav; | 1180 | } |
797 | if (totalDownForce != Vector3.Zero) | 1181 | */ |
798 | { | 1182 | VDetailLog("{0}, MoveLinear,limitMotorUp,collide={1},upVel={2},newVel={3}", |
799 | Prim.AddForce(totalDownForce * m_vehicleMass, false); | 1183 | Prim.LocalID, Prim.IsColliding, upVelocity, VehicleVelocity); |
800 | // Prim.ApplyForceImpulse(totalDownForce * m_vehicleMass, false); | 1184 | } |
801 | } | 1185 | } |
1186 | } | ||
802 | 1187 | ||
803 | VDetailLog("{0},MoveLinear,done,lmDir={1},lmVel={2},newVel={3},primVel={4},totalDown={5}", | 1188 | private void ApplyGravity(float pTimeStep) |
804 | Prim.LocalID, m_linearMotorDirection, m_lastLinearVelocityVector, m_newVelocity, Prim.Velocity, totalDownForce); | 1189 | { |
1190 | Vector3 appliedGravity = m_VehicleGravity * m_vehicleMass; | ||
1191 | VehicleAddForce(appliedGravity); | ||
805 | 1192 | ||
806 | } // end MoveLinear() | 1193 | VDetailLog("{0}, MoveLinear,applyGravity,vehGrav={1},appliedForce-{2}", |
1194 | Prim.LocalID, m_VehicleGravity, appliedGravity); | ||
1195 | } | ||
807 | 1196 | ||
808 | // ======================================================================= | 1197 | // ======================================================================= |
1198 | // ======================================================================= | ||
809 | // Apply the effect of the angular motor. | 1199 | // Apply the effect of the angular motor. |
1200 | // The 'contribution' is how much angular correction velocity each function wants. | ||
1201 | // All the contributions are added together and the resulting velocity is | ||
1202 | // set directly on the vehicle. | ||
810 | private void MoveAngular(float pTimestep) | 1203 | private void MoveAngular(float pTimestep) |
811 | { | 1204 | { |
812 | // m_angularMotorDirection // angular velocity requested by LSL motor | 1205 | // The user wants this many radians per second angular change? |
813 | // m_angularMotorApply // application frame counter | 1206 | Vector3 angularMotorContribution = m_angularMotor.Step(pTimestep); |
814 | // m_angularMotorVelocity // current angular motor velocity (ramps up and down) | 1207 | |
815 | // m_angularMotorTimescale // motor angular velocity ramp up rate | 1208 | // ================================================================== |
816 | // m_angularMotorDecayTimescale // motor angular velocity decay rate | 1209 | // From http://wiki.secondlife.com/wiki/LlSetVehicleFlags : |
817 | // m_angularFrictionTimescale // body angular velocity decay rate | 1210 | // This flag prevents linear deflection parallel to world z-axis. This is useful |
818 | // m_lastAngularVelocity // what was last applied to body | 1211 | // for preventing ground vehicles with large linear deflection, like bumper cars, |
819 | 1212 | // from climbing their linear deflection into the sky. | |
820 | if (m_angularMotorDirection.LengthSquared() > 0.0001) | 1213 | // That is, NO_DEFLECTION_UP says angular motion should not add any pitch or roll movement |
821 | { | 1214 | // TODO: This is here because this is where ODE put it but documentation says it |
822 | Vector3 origVel = m_angularMotorVelocity; | 1215 | // is a linear effect. Where should this check go? |
823 | Vector3 origDir = m_angularMotorDirection; | 1216 | if ((m_flags & (VehicleFlag.NO_DEFLECTION_UP)) != 0) |
824 | |||
825 | // new velocity += error / ( time to get there / step interval) | ||
826 | // requested direction - current vehicle direction | ||
827 | m_angularMotorVelocity += (m_angularMotorDirection - m_angularMotorVelocity) / (m_angularMotorTimescale / pTimestep); | ||
828 | // decay requested direction | ||
829 | m_angularMotorDirection *= (1.0f - (pTimestep * 1.0f/m_angularMotorDecayTimescale)); | ||
830 | |||
831 | VDetailLog("{0},MoveAngular,angularMotorApply,angTScale={1},timeStep={2},origvel={3},origDir={4},vel={5}", | ||
832 | Prim.LocalID, m_angularMotorTimescale, pTimestep, origVel, origDir, m_angularMotorVelocity); | ||
833 | } | ||
834 | else | ||
835 | { | 1217 | { |
836 | m_angularMotorVelocity = Vector3.Zero; | 1218 | angularMotorContribution.X = 0f; |
1219 | angularMotorContribution.Y = 0f; | ||
1220 | VDetailLog("{0}, MoveAngular,noDeflectionUp,angularMotorContrib={1}", Prim.LocalID, angularMotorContribution); | ||
837 | } | 1221 | } |
838 | 1222 | ||
839 | #region Vertical attactor | 1223 | Vector3 verticalAttractionContribution = ComputeAngularVerticalAttraction(); |
840 | 1224 | ||
841 | Vector3 vertattr = Vector3.Zero; | 1225 | Vector3 deflectionContribution = ComputeAngularDeflection(); |
842 | Vector3 deflection = Vector3.Zero; | ||
843 | Vector3 banking = Vector3.Zero; | ||
844 | 1226 | ||
845 | // If vertical attaction timescale is reasonable and we applied an angular force last time... | 1227 | Vector3 bankingContribution = ComputeAngularBanking(); |
846 | if (m_verticalAttractionTimescale < 300 && m_lastAngularVelocity != Vector3.Zero) | ||
847 | { | ||
848 | float VAservo = pTimestep * 0.2f / m_verticalAttractionTimescale; | ||
849 | if (Prim.IsColliding) | ||
850 | VAservo = pTimestep * 0.05f / (m_verticalAttractionTimescale); | ||
851 | |||
852 | VAservo *= (m_verticalAttractionEfficiency * m_verticalAttractionEfficiency); | ||
853 | |||
854 | // Create a vector of the vehicle "up" in world coordinates | ||
855 | Vector3 verticalError = Vector3.UnitZ * Prim.ForceOrientation; | ||
856 | // verticalError.X and .Y are the World error amounts. They are 0 when there is no | ||
857 | // error (Vehicle Body is 'vertical'), and .Z will be 1. As the body leans to its | ||
858 | // side |.X| will increase to 1 and .Z fall to 0. As body inverts |.X| will fall | ||
859 | // and .Z will go // negative. Similar for tilt and |.Y|. .X and .Y must be | ||
860 | // modulated to prevent a stable inverted body. | ||
861 | |||
862 | // Error is 0 (no error) to +/- 2 (max error) | ||
863 | if (verticalError.Z < 0.0f) | ||
864 | { | ||
865 | verticalError.X = 2.0f - verticalError.X; | ||
866 | verticalError.Y = 2.0f - verticalError.Y; | ||
867 | } | ||
868 | // scale it by VAservo (timestep and timescale) | ||
869 | verticalError = verticalError * VAservo; | ||
870 | 1228 | ||
871 | // As the body rotates around the X axis, then verticalError.Y increases; Rotated around Y | 1229 | // ================================================================== |
872 | // then .X increases, so change Body angular velocity X based on Y, and Y based on X. | 1230 | m_lastVertAttractor = verticalAttractionContribution; |
873 | // Z is not changed. | ||
874 | vertattr.X = verticalError.Y; | ||
875 | vertattr.Y = - verticalError.X; | ||
876 | vertattr.Z = 0f; | ||
877 | 1231 | ||
878 | // scaling appears better usingsquare-law | 1232 | m_lastAngularVelocity = angularMotorContribution |
879 | Vector3 angularVelocity = Prim.ForceRotationalVelocity; | 1233 | + verticalAttractionContribution |
880 | float bounce = 1.0f - (m_verticalAttractionEfficiency * m_verticalAttractionEfficiency); | 1234 | + deflectionContribution |
881 | vertattr.X += bounce * angularVelocity.X; | 1235 | + bankingContribution; |
882 | vertattr.Y += bounce * angularVelocity.Y; | ||
883 | 1236 | ||
884 | VDetailLog("{0},MoveAngular,verticalAttraction,VAservo={1},effic={2},verticalError={3},bounce={4},vertattr={5}", | 1237 | // Add of the above computation are made relative to vehicle coordinates. |
885 | Prim.LocalID, VAservo, m_verticalAttractionEfficiency, verticalError, bounce, vertattr); | 1238 | // Convert to world coordinates. |
1239 | m_lastAngularVelocity *= VehicleOrientation; | ||
886 | 1240 | ||
887 | } | 1241 | // ================================================================== |
888 | #endregion // Vertical attactor | 1242 | // Apply the correction velocity. |
889 | 1243 | // TODO: Should this be applied as an angular force (torque)? | |
890 | #region Deflection | 1244 | if (!m_lastAngularVelocity.ApproxEquals(Vector3.Zero, 0.01f)) |
891 | |||
892 | if (m_angularDeflectionEfficiency != 0) | ||
893 | { | 1245 | { |
894 | // Compute a scaled vector that points in the preferred axis (X direction) | 1246 | VehicleRotationalVelocity = m_lastAngularVelocity; |
895 | Vector3 scaledDefaultDirection = | ||
896 | new Vector3((pTimestep * 10 * (m_angularDeflectionEfficiency / m_angularDeflectionTimescale)), 0, 0); | ||
897 | // Adding the current vehicle orientation and reference frame displaces the orientation to the frame. | ||
898 | // Rotate the scaled default axix relative to the actual vehicle direction giving where it should point. | ||
899 | Vector3 preferredAxisOfMotion = scaledDefaultDirection * Quaternion.Add(Prim.ForceOrientation, m_referenceFrame); | ||
900 | |||
901 | // Scale by efficiency and timescale | ||
902 | deflection = (preferredAxisOfMotion * (m_angularDeflectionEfficiency) / m_angularDeflectionTimescale) * pTimestep; | ||
903 | |||
904 | VDetailLog("{0},MoveAngular,Deflection,perfAxis={1},deflection={2}", | ||
905 | Prim.LocalID, preferredAxisOfMotion, deflection); | ||
906 | // This deflection computation is not correct. | ||
907 | deflection = Vector3.Zero; | ||
908 | } | ||
909 | 1247 | ||
910 | #endregion | 1248 | VDetailLog("{0}, MoveAngular,done,nonZero,angMotorContrib={1},vertAttrContrib={2},bankContrib={3},deflectContrib={4},totalContrib={5}", |
911 | 1249 | Prim.LocalID, | |
912 | #region Banking | 1250 | angularMotorContribution, verticalAttractionContribution, |
913 | 1251 | bankingContribution, deflectionContribution, | |
914 | if (m_bankingEfficiency != 0) | 1252 | m_lastAngularVelocity |
1253 | ); | ||
1254 | } | ||
1255 | else | ||
915 | { | 1256 | { |
916 | Vector3 dir = Vector3.One * Prim.ForceOrientation; | 1257 | // The vehicle is not adding anything angular wise. |
917 | float mult = (m_bankingMix*m_bankingMix)*-1*(m_bankingMix < 0 ? -1 : 1); | 1258 | VehicleRotationalVelocity = Vector3.Zero; |
918 | //Changes which way it banks in and out of turns | 1259 | VDetailLog("{0}, MoveAngular,done,zero", Prim.LocalID); |
919 | |||
920 | //Use the square of the efficiency, as it looks much more how SL banking works | ||
921 | float effSquared = (m_bankingEfficiency*m_bankingEfficiency); | ||
922 | if (m_bankingEfficiency < 0) | ||
923 | effSquared *= -1; //Keep the negative! | ||
924 | |||
925 | float mix = Math.Abs(m_bankingMix); | ||
926 | if (m_angularMotorVelocity.X == 0) | ||
927 | { | ||
928 | /*if (!parent.Orientation.ApproxEquals(this.m_referenceFrame, 0.25f)) | ||
929 | { | ||
930 | Vector3 axisAngle; | ||
931 | float angle; | ||
932 | parent.Orientation.GetAxisAngle(out axisAngle, out angle); | ||
933 | Vector3 rotatedVel = parent.Velocity * parent.Orientation; | ||
934 | if ((rotatedVel.X < 0 && axisAngle.Y > 0) || (rotatedVel.X > 0 && axisAngle.Y < 0)) | ||
935 | m_angularMotorVelocity.X += (effSquared * (mult * mix)) * (1f) * 10; | ||
936 | else | ||
937 | m_angularMotorVelocity.X += (effSquared * (mult * mix)) * (-1f) * 10; | ||
938 | }*/ | ||
939 | } | ||
940 | else | ||
941 | banking.Z += (effSquared*(mult*mix))*(m_angularMotorVelocity.X) * 4; | ||
942 | if (!Prim.IsColliding && Math.Abs(m_angularMotorVelocity.X) > mix) | ||
943 | //If they are colliding, we probably shouldn't shove the prim around... probably | ||
944 | { | ||
945 | float angVelZ = m_angularMotorVelocity.X*-1; | ||
946 | /*if(angVelZ > mix) | ||
947 | angVelZ = mix; | ||
948 | else if(angVelZ < -mix) | ||
949 | angVelZ = -mix;*/ | ||
950 | //This controls how fast and how far the banking occurs | ||
951 | Vector3 bankingRot = new Vector3(angVelZ*(effSquared*mult), 0, 0); | ||
952 | if (bankingRot.X > 3) | ||
953 | bankingRot.X = 3; | ||
954 | else if (bankingRot.X < -3) | ||
955 | bankingRot.X = -3; | ||
956 | bankingRot *= Prim.ForceOrientation; | ||
957 | banking += bankingRot; | ||
958 | } | ||
959 | m_angularMotorVelocity.X *= m_bankingEfficiency == 1 ? 0.0f : 1 - m_bankingEfficiency; | ||
960 | VDetailLog("{0},MoveAngular,Banking,bEff={1},angMotVel={2},banking={3}", | ||
961 | Prim.LocalID, m_bankingEfficiency, m_angularMotorVelocity, banking); | ||
962 | } | 1260 | } |
963 | 1261 | ||
964 | #endregion | 1262 | // ================================================================== |
965 | |||
966 | m_lastVertAttractor = vertattr; | ||
967 | |||
968 | // Sum velocities | ||
969 | m_lastAngularVelocity = m_angularMotorVelocity + vertattr + banking + deflection; | ||
970 | |||
971 | #region Linear Motor Offset | ||
972 | |||
973 | //Offset section | 1263 | //Offset section |
974 | if (m_linearMotorOffset != Vector3.Zero) | 1264 | if (m_linearMotorOffset != Vector3.Zero) |
975 | { | 1265 | { |
@@ -985,8 +1275,8 @@ namespace OpenSim.Region.Physics.BulletSPlugin | |||
985 | // | 1275 | // |
986 | // The torque created is the linear velocity crossed with the offset | 1276 | // The torque created is the linear velocity crossed with the offset |
987 | 1277 | ||
988 | // NOTE: this computation does should be in the linear section | 1278 | // TODO: this computation should be in the linear section |
989 | // because there we know the impulse being applied. | 1279 | // because that is where we know the impulse being applied. |
990 | Vector3 torqueFromOffset = Vector3.Zero; | 1280 | Vector3 torqueFromOffset = Vector3.Zero; |
991 | // torqueFromOffset = Vector3.Cross(m_linearMotorOffset, appliedImpulse); | 1281 | // torqueFromOffset = Vector3.Cross(m_linearMotorOffset, appliedImpulse); |
992 | if (float.IsNaN(torqueFromOffset.X)) | 1282 | if (float.IsNaN(torqueFromOffset.X)) |
@@ -995,47 +1285,185 @@ namespace OpenSim.Region.Physics.BulletSPlugin | |||
995 | torqueFromOffset.Y = 0; | 1285 | torqueFromOffset.Y = 0; |
996 | if (float.IsNaN(torqueFromOffset.Z)) | 1286 | if (float.IsNaN(torqueFromOffset.Z)) |
997 | torqueFromOffset.Z = 0; | 1287 | torqueFromOffset.Z = 0; |
998 | torqueFromOffset *= m_vehicleMass; | 1288 | |
999 | Prim.ApplyTorqueImpulse(torqueFromOffset, true); | 1289 | VehicleAddAngularForce(torqueFromOffset * m_vehicleMass); |
1000 | VDetailLog("{0},BSDynamic.MoveAngular,motorOffset,applyTorqueImpulse={1}", Prim.LocalID, torqueFromOffset); | 1290 | VDetailLog("{0}, BSDynamic.MoveAngular,motorOffset,applyTorqueImpulse={1}", Prim.LocalID, torqueFromOffset); |
1001 | } | 1291 | } |
1002 | 1292 | ||
1003 | #endregion | 1293 | } |
1294 | // From http://wiki.secondlife.com/wiki/Linden_Vehicle_Tutorial: | ||
1295 | // Some vehicles, like boats, should always keep their up-side up. This can be done by | ||
1296 | // enabling the "vertical attractor" behavior that springs the vehicle's local z-axis to | ||
1297 | // the world z-axis (a.k.a. "up"). To take advantage of this feature you would set the | ||
1298 | // VEHICLE_VERTICAL_ATTRACTION_TIMESCALE to control the period of the spring frequency, | ||
1299 | // and then set the VEHICLE_VERTICAL_ATTRACTION_EFFICIENCY to control the damping. An | ||
1300 | // efficiency of 0.0 will cause the spring to wobble around its equilibrium, while an | ||
1301 | // efficiency of 1.0 will cause the spring to reach its equilibrium with exponential decay. | ||
1302 | public Vector3 ComputeAngularVerticalAttraction() | ||
1303 | { | ||
1304 | Vector3 ret = Vector3.Zero; | ||
1004 | 1305 | ||
1005 | if ((m_flags & (VehicleFlag.NO_DEFLECTION_UP)) != 0) | 1306 | // If vertical attaction timescale is reasonable |
1307 | if (enableAngularVerticalAttraction && m_verticalAttractionTimescale < m_verticalAttractionCutoff) | ||
1006 | { | 1308 | { |
1007 | m_lastAngularVelocity.X = 0; | 1309 | // Take a vector pointing up and convert it from world to vehicle relative coords. |
1008 | m_lastAngularVelocity.Y = 0; | 1310 | Vector3 verticalError = Vector3.UnitZ * VehicleOrientation; |
1009 | VDetailLog("{0},MoveAngular,noDeflectionUp,lastAngular={1}", Prim.LocalID, m_lastAngularVelocity); | 1311 | |
1312 | // If vertical attraction correction is needed, the vector that was pointing up (UnitZ) | ||
1313 | // is now: | ||
1314 | // leaning to one side: rotated around the X axis with the Y value going | ||
1315 | // from zero (nearly straight up) to one (completely to the side)) or | ||
1316 | // leaning front-to-back: rotated around the Y axis with the value of X being between | ||
1317 | // zero and one. | ||
1318 | // The value of Z is how far the rotation is off with 1 meaning none and 0 being 90 degrees. | ||
1319 | |||
1320 | // Y error means needed rotation around X axis and visa versa. | ||
1321 | // Since the error goes from zero to one, the asin is the corresponding angle. | ||
1322 | ret.X = (float)Math.Asin(verticalError.Y); | ||
1323 | // (Tilt forward (positive X) needs to tilt back (rotate negative) around Y axis.) | ||
1324 | ret.Y = -(float)Math.Asin(verticalError.X); | ||
1325 | |||
1326 | // If verticalError.Z is negative, the vehicle is upside down. Add additional push. | ||
1327 | if (verticalError.Z < 0f) | ||
1328 | { | ||
1329 | ret.X += PIOverFour; | ||
1330 | ret.Y += PIOverFour; | ||
1331 | } | ||
1332 | |||
1333 | // 'ret' is now the necessary velocity to correct tilt in one second. | ||
1334 | // Correction happens over a number of seconds. | ||
1335 | Vector3 unscaledContrib = ret; | ||
1336 | ret /= m_verticalAttractionTimescale; | ||
1337 | |||
1338 | VDetailLog("{0}, MoveAngular,verticalAttraction,,verticalError={1},unscaled={2},eff={3},ts={4},vertAttr={5}", | ||
1339 | Prim.LocalID, verticalError, unscaledContrib, m_verticalAttractionEfficiency, m_verticalAttractionTimescale, ret); | ||
1010 | } | 1340 | } |
1341 | return ret; | ||
1342 | } | ||
1343 | |||
1344 | // Return the angular correction to correct the direction the vehicle is pointing to be | ||
1345 | // the direction is should want to be pointing. | ||
1346 | // The vehicle is moving in some direction and correct its orientation to it is pointing | ||
1347 | // in that direction. | ||
1348 | // TODO: implement reference frame. | ||
1349 | public Vector3 ComputeAngularDeflection() | ||
1350 | { | ||
1351 | Vector3 ret = Vector3.Zero; | ||
1352 | |||
1353 | // Since angularMotorUp and angularDeflection are computed independently, they will calculate | ||
1354 | // approximately the same X or Y correction. When added together (when contributions are combined) | ||
1355 | // this creates an over-correction and then wabbling as the target is overshot. | ||
1356 | // TODO: rethink how the different correction computations inter-relate. | ||
1011 | 1357 | ||
1012 | if (m_lastAngularVelocity.ApproxEquals(Vector3.Zero, 0.01f)) | 1358 | if (enableAngularDeflection && m_angularDeflectionEfficiency != 0 && VehicleForwardSpeed > 0.2) |
1013 | { | 1359 | { |
1014 | m_lastAngularVelocity = Vector3.Zero; // Reduce small value to zero. | 1360 | // The direction the vehicle is moving |
1015 | Prim.ZeroAngularMotion(true); | 1361 | Vector3 movingDirection = VehicleVelocity; |
1016 | VDetailLog("{0},MoveAngular,zeroAngularMotion,lastAngular={1}", Prim.LocalID, m_lastAngularVelocity); | 1362 | movingDirection.Normalize(); |
1363 | |||
1364 | // If the vehicle is going backward, it is still pointing forward | ||
1365 | movingDirection *= Math.Sign(VehicleForwardSpeed); | ||
1366 | |||
1367 | // The direction the vehicle is pointing | ||
1368 | Vector3 pointingDirection = Vector3.UnitX * VehicleOrientation; | ||
1369 | pointingDirection.Normalize(); | ||
1370 | |||
1371 | // The difference between what is and what should be. | ||
1372 | Vector3 deflectionError = movingDirection - pointingDirection; | ||
1373 | |||
1374 | // Don't try to correct very large errors (not our job) | ||
1375 | // if (Math.Abs(deflectionError.X) > PIOverFour) deflectionError.X = PIOverTwo * Math.Sign(deflectionError.X); | ||
1376 | // if (Math.Abs(deflectionError.Y) > PIOverFour) deflectionError.Y = PIOverTwo * Math.Sign(deflectionError.Y); | ||
1377 | // if (Math.Abs(deflectionError.Z) > PIOverFour) deflectionError.Z = PIOverTwo * Math.Sign(deflectionError.Z); | ||
1378 | if (Math.Abs(deflectionError.X) > PIOverFour) deflectionError.X = 0f; | ||
1379 | if (Math.Abs(deflectionError.Y) > PIOverFour) deflectionError.Y = 0f; | ||
1380 | if (Math.Abs(deflectionError.Z) > PIOverFour) deflectionError.Z = 0f; | ||
1381 | |||
1382 | // ret = m_angularDeflectionCorrectionMotor(1f, deflectionError); | ||
1383 | |||
1384 | // Scale the correction by recovery timescale and efficiency | ||
1385 | ret = (-deflectionError) * m_angularDeflectionEfficiency; | ||
1386 | ret /= m_angularDeflectionTimescale; | ||
1387 | |||
1388 | VDetailLog("{0}, MoveAngular,Deflection,movingDir={1},pointingDir={2},deflectError={3},ret={4}", | ||
1389 | Prim.LocalID, movingDirection, pointingDirection, deflectionError, ret); | ||
1390 | VDetailLog("{0}, MoveAngular,Deflection,fwdSpd={1},defEff={2},defTS={3}", | ||
1391 | Prim.LocalID, VehicleForwardSpeed, m_angularDeflectionEfficiency, m_angularDeflectionTimescale); | ||
1017 | } | 1392 | } |
1018 | else | 1393 | return ret; |
1394 | } | ||
1395 | |||
1396 | // Return an angular change to rotate the vehicle around the Z axis when the vehicle | ||
1397 | // is tipped around the X axis. | ||
1398 | // From http://wiki.secondlife.com/wiki/Linden_Vehicle_Tutorial: | ||
1399 | // The vertical attractor feature must be enabled in order for the banking behavior to | ||
1400 | // function. The way banking works is this: a rotation around the vehicle's roll-axis will | ||
1401 | // produce a angular velocity around the yaw-axis, causing the vehicle to turn. The magnitude | ||
1402 | // of the yaw effect will be proportional to the | ||
1403 | // VEHICLE_BANKING_EFFICIENCY, the angle of the roll rotation, and sometimes the vehicle's | ||
1404 | // velocity along its preferred axis of motion. | ||
1405 | // The VEHICLE_BANKING_EFFICIENCY can vary between -1 and +1. When it is positive then any | ||
1406 | // positive rotation (by the right-hand rule) about the roll-axis will effect a | ||
1407 | // (negative) torque around the yaw-axis, making it turn to the right--that is the | ||
1408 | // vehicle will lean into the turn, which is how real airplanes and motorcycle's work. | ||
1409 | // Negating the banking coefficient will make it so that the vehicle leans to the | ||
1410 | // outside of the turn (not very "physical" but might allow interesting vehicles so why not?). | ||
1411 | // The VEHICLE_BANKING_MIX is a fake (i.e. non-physical) parameter that is useful for making | ||
1412 | // banking vehicles do what you want rather than what the laws of physics allow. | ||
1413 | // For example, consider a real motorcycle...it must be moving forward in order for | ||
1414 | // it to turn while banking, however video-game motorcycles are often configured | ||
1415 | // to turn in place when at a dead stop--because they are often easier to control | ||
1416 | // that way using the limited interface of the keyboard or game controller. The | ||
1417 | // VEHICLE_BANKING_MIX enables combinations of both realistic and non-realistic | ||
1418 | // banking by functioning as a slider between a banking that is correspondingly | ||
1419 | // totally static (0.0) and totally dynamic (1.0). By "static" we mean that the | ||
1420 | // banking effect depends only on the vehicle's rotation about its roll-axis compared | ||
1421 | // to "dynamic" where the banking is also proportional to its velocity along its | ||
1422 | // roll-axis. Finding the best value of the "mixture" will probably require trial and error. | ||
1423 | // The time it takes for the banking behavior to defeat a preexisting angular velocity about the | ||
1424 | // world z-axis is determined by the VEHICLE_BANKING_TIMESCALE. So if you want the vehicle to | ||
1425 | // bank quickly then give it a banking timescale of about a second or less, otherwise you can | ||
1426 | // make a sluggish vehicle by giving it a timescale of several seconds. | ||
1427 | public Vector3 ComputeAngularBanking() | ||
1428 | { | ||
1429 | Vector3 ret = Vector3.Zero; | ||
1430 | |||
1431 | if (enableAngularBanking && m_bankingEfficiency != 0 && m_verticalAttractionTimescale < m_verticalAttractionCutoff) | ||
1019 | { | 1432 | { |
1020 | // Apply to the body. | 1433 | // Rotate a UnitZ vector (pointing up) to how the vehicle is oriented. |
1021 | // The above calculates the absolute angular velocity needed. Angular velocity is massless. | 1434 | // As the vehicle rolls to the right or left, the Y value will increase from |
1022 | // Since we are stuffing the angular velocity directly into the object, the computed | 1435 | // zero (straight up) to 1 or -1 (full tilt right or left) |
1023 | // velocity needs to be scaled by the timestep. | 1436 | Vector3 rollComponents = Vector3.UnitZ * VehicleOrientation; |
1024 | Vector3 applyAngularForce = ((m_lastAngularVelocity * pTimestep) - Prim.ForceRotationalVelocity); | 1437 | |
1025 | Prim.ForceRotationalVelocity = applyAngularForce; | 1438 | // Figure out the yaw value for this much roll. |
1026 | 1439 | // Squared because that seems to give a good value | |
1027 | // Decay the angular movement for next time | 1440 | float yawAngle = (float)Math.Asin(rollComponents.Y * rollComponents.Y) * m_bankingEfficiency; |
1028 | Vector3 decayamount = (Vector3.One / m_angularFrictionTimescale) * pTimestep; | 1441 | |
1029 | m_lastAngularVelocity *= Vector3.One - decayamount; | 1442 | // actual error = static turn error + dynamic turn error |
1030 | 1443 | float mixedYawAngle = yawAngle * (1f - m_bankingMix) + yawAngle * m_bankingMix * VehicleForwardSpeed; | |
1031 | VDetailLog("{0},MoveAngular,done,newRotVel={1},decay={2},lastAngular={3}", | 1444 | |
1032 | Prim.LocalID, applyAngularForce, decayamount, m_lastAngularVelocity); | 1445 | // TODO: the banking effect should not go to infinity but what to limit it to? |
1446 | mixedYawAngle = ClampInRange(-20f, mixedYawAngle, 20f); | ||
1447 | |||
1448 | // Build the force vector to change rotation from what it is to what it should be | ||
1449 | ret.Z = -mixedYawAngle; | ||
1450 | |||
1451 | // Don't do it all at once. | ||
1452 | ret /= m_bankingTimescale; | ||
1453 | |||
1454 | VDetailLog("{0}, MoveAngular,Banking,rollComp={1},speed={2},rollComp={3},yAng={4},mYAng={5},ret={6}", | ||
1455 | Prim.LocalID, rollComponents, VehicleForwardSpeed, rollComponents, yawAngle, mixedYawAngle, ret); | ||
1033 | } | 1456 | } |
1034 | } //end MoveAngular | 1457 | return ret; |
1458 | } | ||
1035 | 1459 | ||
1460 | // This is from previous instantiations of XXXDynamics.cs. | ||
1461 | // Applies roll reference frame. | ||
1462 | // TODO: is this the right way to separate the code to do this operation? | ||
1463 | // Should this be in MoveAngular()? | ||
1036 | internal void LimitRotation(float timestep) | 1464 | internal void LimitRotation(float timestep) |
1037 | { | 1465 | { |
1038 | Quaternion rotq = Prim.ForceOrientation; | 1466 | Quaternion rotq = VehicleOrientation; |
1039 | Quaternion m_rot = rotq; | 1467 | Quaternion m_rot = rotq; |
1040 | if (m_RollreferenceFrame != Quaternion.Identity) | 1468 | if (m_RollreferenceFrame != Quaternion.Identity) |
1041 | { | 1469 | { |
@@ -1063,12 +1491,18 @@ namespace OpenSim.Region.Physics.BulletSPlugin | |||
1063 | } | 1491 | } |
1064 | if (rotq != m_rot) | 1492 | if (rotq != m_rot) |
1065 | { | 1493 | { |
1066 | Prim.ForceOrientation = m_rot; | 1494 | VehicleOrientation = m_rot; |
1067 | VDetailLog("{0},LimitRotation,done,orig={1},new={2}", Prim.LocalID, rotq, m_rot); | 1495 | VDetailLog("{0}, LimitRotation,done,orig={1},new={2}", Prim.LocalID, rotq, m_rot); |
1068 | } | 1496 | } |
1069 | 1497 | ||
1070 | } | 1498 | } |
1071 | 1499 | ||
1500 | private float ClampInRange(float low, float val, float high) | ||
1501 | { | ||
1502 | return Math.Max(low, Math.Min(val, high)); | ||
1503 | // return Utils.Clamp(val, low, high); | ||
1504 | } | ||
1505 | |||
1072 | // Invoke the detailed logger and output something if it's enabled. | 1506 | // Invoke the detailed logger and output something if it's enabled. |
1073 | private void VDetailLog(string msg, params Object[] args) | 1507 | private void VDetailLog(string msg, params Object[] args) |
1074 | { | 1508 | { |