diff options
Diffstat (limited to 'OpenSim/Region/Physics/Manager')
-rw-r--r-- | OpenSim/Region/Physics/Manager/IMesher.cs | 28 | ||||
-rw-r--r-- | OpenSim/Region/Physics/Manager/PhysicsActor.cs | 238 | ||||
-rw-r--r-- | OpenSim/Region/Physics/Manager/PhysicsScene.cs | 106 | ||||
-rw-r--r-- | OpenSim/Region/Physics/Manager/VehicleConstants.cs | 45 | ||||
-rw-r--r-- | OpenSim/Region/Physics/Manager/ZeroMesher.cs | 14 |
5 files changed, 337 insertions, 94 deletions
diff --git a/OpenSim/Region/Physics/Manager/IMesher.cs b/OpenSim/Region/Physics/Manager/IMesher.cs index 10c4bd3..df980ab 100644 --- a/OpenSim/Region/Physics/Manager/IMesher.cs +++ b/OpenSim/Region/Physics/Manager/IMesher.cs | |||
@@ -27,6 +27,7 @@ | |||
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.Runtime.InteropServices; | ||
30 | using OpenSim.Framework; | 31 | using OpenSim.Framework; |
31 | using OpenMetaverse; | 32 | using OpenMetaverse; |
32 | 33 | ||
@@ -36,7 +37,11 @@ namespace OpenSim.Region.Physics.Manager | |||
36 | { | 37 | { |
37 | IMesh CreateMesh(String primName, PrimitiveBaseShape primShape, Vector3 size, float lod); | 38 | IMesh CreateMesh(String primName, PrimitiveBaseShape primShape, Vector3 size, float lod); |
38 | IMesh CreateMesh(String primName, PrimitiveBaseShape primShape, Vector3 size, float lod, bool isPhysical); | 39 | IMesh CreateMesh(String primName, PrimitiveBaseShape primShape, Vector3 size, float lod, bool isPhysical); |
39 | IMesh CreateMesh(String primName, PrimitiveBaseShape primShape, Vector3 size, float lod, bool isPhysical, bool shouldCache); | 40 | IMesh CreateMesh(String primName, PrimitiveBaseShape primShape, Vector3 size, float lod, bool isPhysical, bool shouldCache, bool convex, bool forOde); |
41 | IMesh GetMesh(String primName, PrimitiveBaseShape primShape, Vector3 size, float lod, bool isPhysical, bool convex); | ||
42 | void ReleaseMesh(IMesh mesh); | ||
43 | void ExpireReleaseMeshs(); | ||
44 | void ExpireFileCache(); | ||
40 | } | 45 | } |
41 | 46 | ||
42 | // Values for level of detail to be passed to the mesher. | 47 | // Values for level of detail to be passed to the mesher. |
@@ -54,6 +59,25 @@ namespace OpenSim.Region.Physics.Manager | |||
54 | { | 59 | { |
55 | } | 60 | } |
56 | 61 | ||
62 | [Serializable()] | ||
63 | [StructLayout(LayoutKind.Explicit)] | ||
64 | public struct AMeshKey | ||
65 | { | ||
66 | [FieldOffset(0)] | ||
67 | public UUID uuid; | ||
68 | [FieldOffset(0)] | ||
69 | public ulong hashA; | ||
70 | [FieldOffset(8)] | ||
71 | public ulong hashB; | ||
72 | [FieldOffset(16)] | ||
73 | public ulong hashC; | ||
74 | |||
75 | public override string ToString() | ||
76 | { | ||
77 | return uuid.ToString() + "-" + hashC.ToString("x") ; | ||
78 | } | ||
79 | } | ||
80 | |||
57 | public interface IMesh | 81 | public interface IMesh |
58 | { | 82 | { |
59 | List<Vector3> getVertexList(); | 83 | List<Vector3> getVertexList(); |
@@ -66,5 +90,7 @@ namespace OpenSim.Region.Physics.Manager | |||
66 | void releasePinned(); | 90 | void releasePinned(); |
67 | void Append(IMesh newMesh); | 91 | void Append(IMesh newMesh); |
68 | void TransformLinear(float[,] matrix, float[] offset); | 92 | void TransformLinear(float[,] matrix, float[] offset); |
93 | Vector3 GetCentroid(); | ||
94 | Vector3 GetOBB(); | ||
69 | } | 95 | } |
70 | } | 96 | } |
diff --git a/OpenSim/Region/Physics/Manager/PhysicsActor.cs b/OpenSim/Region/Physics/Manager/PhysicsActor.cs index d119791..e2789d6 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsActor.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsActor.cs | |||
@@ -43,7 +43,8 @@ namespace OpenSim.Region.Physics.Manager | |||
43 | Unknown = 0, | 43 | Unknown = 0, |
44 | Agent = 1, | 44 | Agent = 1, |
45 | Prim = 2, | 45 | Prim = 2, |
46 | Ground = 3 | 46 | Ground = 3, |
47 | Water = 4 | ||
47 | } | 48 | } |
48 | 49 | ||
49 | public enum PIDHoverType | 50 | public enum PIDHoverType |
@@ -59,15 +60,41 @@ namespace OpenSim.Region.Physics.Manager | |||
59 | public Vector3 Position; | 60 | public Vector3 Position; |
60 | public Vector3 SurfaceNormal; | 61 | public Vector3 SurfaceNormal; |
61 | public float PenetrationDepth; | 62 | public float PenetrationDepth; |
63 | public float RelativeSpeed; | ||
64 | public bool CharacterFeet; | ||
62 | 65 | ||
63 | public ContactPoint(Vector3 position, Vector3 surfaceNormal, float penetrationDepth) | 66 | public ContactPoint(Vector3 position, Vector3 surfaceNormal, float penetrationDepth) |
64 | { | 67 | { |
65 | Position = position; | 68 | Position = position; |
66 | SurfaceNormal = surfaceNormal; | 69 | SurfaceNormal = surfaceNormal; |
67 | PenetrationDepth = penetrationDepth; | 70 | PenetrationDepth = penetrationDepth; |
71 | RelativeSpeed = 0f; // for now let this one be set explicity | ||
72 | CharacterFeet = true; // keep other plugins work as before | ||
73 | } | ||
74 | |||
75 | public ContactPoint(Vector3 position, Vector3 surfaceNormal, float penetrationDepth, bool feet) | ||
76 | { | ||
77 | Position = position; | ||
78 | SurfaceNormal = surfaceNormal; | ||
79 | PenetrationDepth = penetrationDepth; | ||
80 | RelativeSpeed = 0f; // for now let this one be set explicity | ||
81 | CharacterFeet = feet; // keep other plugins work as before | ||
68 | } | 82 | } |
69 | } | 83 | } |
70 | 84 | ||
85 | public struct ContactData | ||
86 | { | ||
87 | public float mu; | ||
88 | public float bounce; | ||
89 | public bool softcolide; | ||
90 | |||
91 | public ContactData(float _mu, float _bounce, bool _softcolide) | ||
92 | { | ||
93 | mu = _mu; | ||
94 | bounce = _bounce; | ||
95 | softcolide = _softcolide; | ||
96 | } | ||
97 | } | ||
71 | /// <summary> | 98 | /// <summary> |
72 | /// Used to pass collision information to OnCollisionUpdate listeners. | 99 | /// Used to pass collision information to OnCollisionUpdate listeners. |
73 | /// </summary> | 100 | /// </summary> |
@@ -99,7 +126,7 @@ namespace OpenSim.Region.Physics.Manager | |||
99 | m_objCollisionList.Add(localID, contact); | 126 | m_objCollisionList.Add(localID, contact); |
100 | } | 127 | } |
101 | else | 128 | else |
102 | { | 129 | { |
103 | if (m_objCollisionList[localID].PenetrationDepth < contact.PenetrationDepth) | 130 | if (m_objCollisionList[localID].PenetrationDepth < contact.PenetrationDepth) |
104 | m_objCollisionList[localID] = contact; | 131 | m_objCollisionList[localID] = contact; |
105 | } | 132 | } |
@@ -135,6 +162,8 @@ namespace OpenSim.Region.Physics.Manager | |||
135 | /// </summary> | 162 | /// </summary> |
136 | public event CollisionUpdate OnCollisionUpdate; | 163 | public event CollisionUpdate OnCollisionUpdate; |
137 | 164 | ||
165 | public virtual void SetVehicle(object vdata) { } | ||
166 | |||
138 | public event OutOfBounds OnOutOfBounds; | 167 | public event OutOfBounds OnOutOfBounds; |
139 | #pragma warning restore 67 | 168 | #pragma warning restore 67 |
140 | 169 | ||
@@ -142,11 +171,34 @@ namespace OpenSim.Region.Physics.Manager | |||
142 | { | 171 | { |
143 | get { return new NullPhysicsActor(); } | 172 | get { return new NullPhysicsActor(); } |
144 | } | 173 | } |
174 | |||
175 | public virtual bool Building { get; set; } | ||
176 | |||
177 | public virtual void getContactData(ref ContactData cdata) | ||
178 | { | ||
179 | cdata.mu = 0; | ||
180 | cdata.bounce = 0; | ||
181 | } | ||
145 | 182 | ||
146 | public abstract bool Stopped { get; } | 183 | public abstract bool Stopped { get; } |
147 | 184 | ||
148 | public abstract Vector3 Size { get; set; } | 185 | public abstract Vector3 Size { get; set; } |
149 | 186 | ||
187 | public virtual void setAvatarSize(Vector3 size, float feetOffset) | ||
188 | { | ||
189 | Size = size; | ||
190 | } | ||
191 | |||
192 | public virtual bool Phantom { get; set; } | ||
193 | |||
194 | public virtual bool IsVolumeDtc | ||
195 | { | ||
196 | get { return false; } | ||
197 | set { return; } | ||
198 | } | ||
199 | |||
200 | public virtual byte PhysicsShapeType { get; set; } | ||
201 | |||
150 | public abstract PrimitiveBaseShape Shape { set; } | 202 | public abstract PrimitiveBaseShape Shape { set; } |
151 | 203 | ||
152 | uint m_baseLocalID; | 204 | uint m_baseLocalID; |
@@ -167,7 +219,7 @@ namespace OpenSim.Region.Physics.Manager | |||
167 | /// XXX: Bizarrely, this cannot be "Terrain" or "Water" right now unless it really is simulating terrain or | 219 | /// XXX: Bizarrely, this cannot be "Terrain" or "Water" right now unless it really is simulating terrain or |
168 | /// water. This is not a problem due to the formatting of names given by prims and avatars. | 220 | /// water. This is not a problem due to the formatting of names given by prims and avatars. |
169 | /// </remarks> | 221 | /// </remarks> |
170 | public string Name { get; protected set; } | 222 | public string Name { get; set; } |
171 | 223 | ||
172 | /// <summary> | 224 | /// <summary> |
173 | /// This is being used by ODE joint code. | 225 | /// This is being used by ODE joint code. |
@@ -218,9 +270,11 @@ namespace OpenSim.Region.Physics.Manager | |||
218 | handler(e); | 270 | handler(e); |
219 | } | 271 | } |
220 | 272 | ||
221 | public virtual void SetMaterial (int material) | 273 | public virtual void SetMaterial (int material) { } |
222 | { | 274 | public virtual float Density { get; set; } |
223 | } | 275 | public virtual float GravModifier { get; set; } |
276 | public virtual float Friction { get; set; } | ||
277 | public virtual float Bounce { get; set; } | ||
224 | 278 | ||
225 | /// <summary> | 279 | /// <summary> |
226 | /// Position of this actor. | 280 | /// Position of this actor. |
@@ -249,6 +303,51 @@ namespace OpenSim.Region.Physics.Manager | |||
249 | public abstract Vector3 GeometricCenter { get; } | 303 | public abstract Vector3 GeometricCenter { get; } |
250 | public abstract Vector3 CenterOfMass { get; } | 304 | public abstract Vector3 CenterOfMass { get; } |
251 | 305 | ||
306 | public virtual Vector3 OOBsize | ||
307 | { | ||
308 | get | ||
309 | { | ||
310 | Vector3 s=Size; | ||
311 | s.X *=0.5f; | ||
312 | s.Y *=0.5f; | ||
313 | s.Z *=0.5f; | ||
314 | return s; | ||
315 | } | ||
316 | } | ||
317 | |||
318 | public virtual Vector3 OOBoffset | ||
319 | { | ||
320 | get | ||
321 | { | ||
322 | return Vector3.Zero; | ||
323 | } | ||
324 | } | ||
325 | |||
326 | public virtual float OOBRadiusSQ | ||
327 | { | ||
328 | get | ||
329 | { | ||
330 | return Size.LengthSquared() * 0.25f; // ((0.5^2) | ||
331 | } | ||
332 | } | ||
333 | |||
334 | |||
335 | public virtual float PhysicsCost | ||
336 | { | ||
337 | get | ||
338 | { | ||
339 | return 0.1f; | ||
340 | } | ||
341 | } | ||
342 | |||
343 | public virtual float StreamCost | ||
344 | { | ||
345 | get | ||
346 | { | ||
347 | return 1.0f; | ||
348 | } | ||
349 | } | ||
350 | |||
252 | /// <summary> | 351 | /// <summary> |
253 | /// The desired velocity of this actor. | 352 | /// The desired velocity of this actor. |
254 | /// </summary> | 353 | /// </summary> |
@@ -309,13 +408,22 @@ namespace OpenSim.Region.Physics.Manager | |||
309 | public abstract void SubscribeEvents(int ms); | 408 | public abstract void SubscribeEvents(int ms); |
310 | public abstract void UnSubscribeEvents(); | 409 | public abstract void UnSubscribeEvents(); |
311 | public abstract bool SubscribedEvents(); | 410 | public abstract bool SubscribedEvents(); |
411 | |||
412 | public virtual void AddCollisionEvent(uint CollidedWith, ContactPoint contact) { } | ||
413 | |||
414 | // Warning in a parent part it returns itself, not null | ||
415 | public virtual PhysicsActor ParentActor { get { return this; } } | ||
416 | |||
417 | |||
312 | } | 418 | } |
313 | 419 | ||
314 | public class NullPhysicsActor : PhysicsActor | 420 | public class NullPhysicsActor : PhysicsActor |
315 | { | 421 | { |
422 | private ActorTypes m_actorType = ActorTypes.Unknown; | ||
423 | |||
316 | public override bool Stopped | 424 | public override bool Stopped |
317 | { | 425 | { |
318 | get{ return false; } | 426 | get{ return true; } |
319 | } | 427 | } |
320 | 428 | ||
321 | public override Vector3 Position | 429 | public override Vector3 Position |
@@ -332,6 +440,7 @@ namespace OpenSim.Region.Physics.Manager | |||
332 | 440 | ||
333 | public override uint LocalID | 441 | public override uint LocalID |
334 | { | 442 | { |
443 | get { return 0; } | ||
335 | set { return; } | 444 | set { return; } |
336 | } | 445 | } |
337 | 446 | ||
@@ -391,50 +500,17 @@ namespace OpenSim.Region.Physics.Manager | |||
391 | set { return; } | 500 | set { return; } |
392 | } | 501 | } |
393 | 502 | ||
394 | public override void VehicleFloatParam(int param, float value) | 503 | public override void VehicleFloatParam(int param, float value) {} |
395 | { | 504 | public override void VehicleVectorParam(int param, Vector3 value) { } |
505 | public override void VehicleRotationParam(int param, Quaternion rotation) { } | ||
506 | public override void VehicleFlags(int param, bool remove) { } | ||
507 | public override void SetVolumeDetect(int param) {} | ||
508 | public override void SetMaterial(int material) {} | ||
509 | public override Vector3 CenterOfMass { get { return Vector3.Zero; }} | ||
396 | 510 | ||
397 | } | 511 | public override Vector3 GeometricCenter { get { return Vector3.Zero; }} |
398 | |||
399 | public override void VehicleVectorParam(int param, Vector3 value) | ||
400 | { | ||
401 | |||
402 | } | ||
403 | |||
404 | public override void VehicleRotationParam(int param, Quaternion rotation) | ||
405 | { | ||
406 | 512 | ||
407 | } | 513 | public override PrimitiveBaseShape Shape { set { return; }} |
408 | |||
409 | public override void VehicleFlags(int param, bool remove) | ||
410 | { | ||
411 | |||
412 | } | ||
413 | |||
414 | public override void SetVolumeDetect(int param) | ||
415 | { | ||
416 | |||
417 | } | ||
418 | |||
419 | public override void SetMaterial(int material) | ||
420 | { | ||
421 | |||
422 | } | ||
423 | |||
424 | public override Vector3 CenterOfMass | ||
425 | { | ||
426 | get { return Vector3.Zero; } | ||
427 | } | ||
428 | |||
429 | public override Vector3 GeometricCenter | ||
430 | { | ||
431 | get { return Vector3.Zero; } | ||
432 | } | ||
433 | |||
434 | public override PrimitiveBaseShape Shape | ||
435 | { | ||
436 | set { return; } | ||
437 | } | ||
438 | 514 | ||
439 | public override Vector3 Velocity | 515 | public override Vector3 Velocity |
440 | { | 516 | { |
@@ -454,9 +530,7 @@ namespace OpenSim.Region.Physics.Manager | |||
454 | set { } | 530 | set { } |
455 | } | 531 | } |
456 | 532 | ||
457 | public override void CrossingFailure() | 533 | public override void CrossingFailure() {} |
458 | { | ||
459 | } | ||
460 | 534 | ||
461 | public override Quaternion Orientation | 535 | public override Quaternion Orientation |
462 | { | 536 | { |
@@ -496,8 +570,20 @@ namespace OpenSim.Region.Physics.Manager | |||
496 | 570 | ||
497 | public override int PhysicsActorType | 571 | public override int PhysicsActorType |
498 | { | 572 | { |
499 | get { return (int) ActorTypes.Unknown; } | 573 | get { return (int)m_actorType; } |
500 | set { return; } | 574 | set { |
575 | ActorTypes type = (ActorTypes)value; | ||
576 | switch (type) | ||
577 | { | ||
578 | case ActorTypes.Ground: | ||
579 | case ActorTypes.Water: | ||
580 | m_actorType = type; | ||
581 | break; | ||
582 | default: | ||
583 | m_actorType = ActorTypes.Unknown; | ||
584 | break; | ||
585 | } | ||
586 | } | ||
501 | } | 587 | } |
502 | 588 | ||
503 | public override bool Kinematic | 589 | public override bool Kinematic |
@@ -506,26 +592,11 @@ namespace OpenSim.Region.Physics.Manager | |||
506 | set { return; } | 592 | set { return; } |
507 | } | 593 | } |
508 | 594 | ||
509 | public override void link(PhysicsActor obj) | 595 | public override void link(PhysicsActor obj) { } |
510 | { | 596 | public override void delink() { } |
511 | } | 597 | public override void LockAngularMotion(Vector3 axis) { } |
512 | 598 | public override void AddForce(Vector3 force, bool pushforce) { } | |
513 | public override void delink() | 599 | public override void AddAngularForce(Vector3 force, bool pushforce) { } |
514 | { | ||
515 | } | ||
516 | |||
517 | public override void LockAngularMotion(Vector3 axis) | ||
518 | { | ||
519 | } | ||
520 | |||
521 | public override void AddForce(Vector3 force, bool pushforce) | ||
522 | { | ||
523 | } | ||
524 | |||
525 | public override void AddAngularForce(Vector3 force, bool pushforce) | ||
526 | { | ||
527 | |||
528 | } | ||
529 | 600 | ||
530 | public override Vector3 RotationalVelocity | 601 | public override Vector3 RotationalVelocity |
531 | { | 602 | { |
@@ -547,21 +618,10 @@ namespace OpenSim.Region.Physics.Manager | |||
547 | public override float APIDStrength { set { return; } } | 618 | public override float APIDStrength { set { return; } } |
548 | public override float APIDDamping { set { return; } } | 619 | public override float APIDDamping { set { return; } } |
549 | 620 | ||
550 | public override void SetMomentum(Vector3 momentum) | 621 | public override void SetMomentum(Vector3 momentum) { } |
551 | { | ||
552 | } | ||
553 | |||
554 | public override void SubscribeEvents(int ms) | ||
555 | { | ||
556 | |||
557 | } | ||
558 | public override void UnSubscribeEvents() | ||
559 | { | ||
560 | 622 | ||
561 | } | 623 | public override void SubscribeEvents(int ms) { } |
562 | public override bool SubscribedEvents() | 624 | public override void UnSubscribeEvents() { } |
563 | { | 625 | public override bool SubscribedEvents() { return false; } |
564 | return false; | ||
565 | } | ||
566 | } | 626 | } |
567 | } | 627 | } |
diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs index 488900e..d24ab2a 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs | |||
@@ -38,11 +38,44 @@ namespace OpenSim.Region.Physics.Manager | |||
38 | 38 | ||
39 | public delegate void RaycastCallback(bool hitYN, Vector3 collisionPoint, uint localid, float distance, Vector3 normal); | 39 | public delegate void RaycastCallback(bool hitYN, Vector3 collisionPoint, uint localid, float distance, Vector3 normal); |
40 | public delegate void RayCallback(List<ContactResult> list); | 40 | public delegate void RayCallback(List<ContactResult> list); |
41 | public delegate void ProbeBoxCallback(List<ContactResult> list); | ||
42 | public delegate void ProbeSphereCallback(List<ContactResult> list); | ||
43 | public delegate void ProbePlaneCallback(List<ContactResult> list); | ||
44 | public delegate void SitAvatarCallback(int status, uint partID, Vector3 offset, Quaternion Orientation); | ||
41 | 45 | ||
42 | public delegate void JointMoved(PhysicsJoint joint); | 46 | public delegate void JointMoved(PhysicsJoint joint); |
43 | public delegate void JointDeactivated(PhysicsJoint joint); | 47 | public delegate void JointDeactivated(PhysicsJoint joint); |
44 | public delegate void JointErrorMessage(PhysicsJoint joint, string message); // this refers to an "error message due to a problem", not "amount of joint constraint violation" | 48 | public delegate void JointErrorMessage(PhysicsJoint joint, string message); // this refers to an "error message due to a problem", not "amount of joint constraint violation" |
45 | 49 | ||
50 | public enum RayFilterFlags:ushort | ||
51 | { | ||
52 | // the flags | ||
53 | water = 0x01, | ||
54 | land = 0x02, | ||
55 | agent = 0x04, | ||
56 | nonphysical = 0x08, | ||
57 | physical = 0x10, | ||
58 | phantom = 0x20, | ||
59 | volumedtc = 0x40, | ||
60 | |||
61 | // ray cast colision control (may only work for meshs) | ||
62 | ContactsUnImportant = 0x2000, | ||
63 | BackFaceCull = 0x4000, | ||
64 | ClosestHit = 0x8000, | ||
65 | |||
66 | // some combinations | ||
67 | LSLPhanton = phantom | volumedtc, | ||
68 | PrimsNonPhantom = nonphysical | physical, | ||
69 | PrimsNonPhantomAgents = nonphysical | physical | agent, | ||
70 | |||
71 | AllPrims = nonphysical | phantom | volumedtc | physical, | ||
72 | AllButLand = agent | nonphysical | physical | phantom | volumedtc, | ||
73 | |||
74 | ClosestAndBackCull = ClosestHit | BackFaceCull, | ||
75 | |||
76 | All = 0x3f | ||
77 | } | ||
78 | |||
46 | public delegate void RequestAssetDelegate(UUID assetID, AssetReceivedDelegate callback); | 79 | public delegate void RequestAssetDelegate(UUID assetID, AssetReceivedDelegate callback); |
47 | public delegate void AssetReceivedDelegate(AssetBase asset); | 80 | public delegate void AssetReceivedDelegate(AssetBase asset); |
48 | 81 | ||
@@ -57,6 +90,8 @@ namespace OpenSim.Region.Physics.Manager | |||
57 | public Vector3 Normal; | 90 | public Vector3 Normal; |
58 | } | 91 | } |
59 | 92 | ||
93 | |||
94 | |||
60 | public abstract class PhysicsScene | 95 | public abstract class PhysicsScene |
61 | { | 96 | { |
62 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 97 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
@@ -97,8 +132,10 @@ namespace OpenSim.Region.Physics.Manager | |||
97 | /// <param name="size"></param> | 132 | /// <param name="size"></param> |
98 | /// <param name="isFlying"></param> | 133 | /// <param name="isFlying"></param> |
99 | /// <returns></returns> | 134 | /// <returns></returns> |
100 | public abstract PhysicsActor AddAvatar(string avName, Vector3 position, Vector3 size, bool isFlying); | 135 | public virtual PhysicsActor AddAvatar(string avName, Vector3 position, Vector3 size, bool isFlying) |
101 | 136 | { | |
137 | return null; | ||
138 | } | ||
102 | /// <summary> | 139 | /// <summary> |
103 | /// Add an avatar | 140 | /// Add an avatar |
104 | /// </summary> | 141 | /// </summary> |
@@ -115,6 +152,12 @@ namespace OpenSim.Region.Physics.Manager | |||
115 | return ret; | 152 | return ret; |
116 | } | 153 | } |
117 | 154 | ||
155 | public virtual PhysicsActor AddAvatar(uint localID, string avName, Vector3 position, Vector3 size, float feetOffset, bool isFlying) | ||
156 | { | ||
157 | PhysicsActor ret = AddAvatar(localID, avName, position, size, isFlying); | ||
158 | return ret; | ||
159 | } | ||
160 | |||
118 | /// <summary> | 161 | /// <summary> |
119 | /// Remove an avatar. | 162 | /// Remove an avatar. |
120 | /// </summary> | 163 | /// </summary> |
@@ -130,6 +173,25 @@ namespace OpenSim.Region.Physics.Manager | |||
130 | public abstract PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position, | 173 | public abstract PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position, |
131 | Vector3 size, Quaternion rotation, bool isPhysical, uint localid); | 174 | Vector3 size, Quaternion rotation, bool isPhysical, uint localid); |
132 | 175 | ||
176 | public virtual PhysicsActor AddPrimShape(string primName, PhysicsActor parent, PrimitiveBaseShape pbs, Vector3 position, | ||
177 | uint localid, byte[] sdata) | ||
178 | { | ||
179 | return null; | ||
180 | } | ||
181 | |||
182 | public virtual PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position, | ||
183 | Vector3 size, Quaternion rotation, bool isPhysical, bool isPhantom, uint localid) | ||
184 | { | ||
185 | return AddPrimShape(primName, pbs, position, size, rotation, isPhysical, localid); | ||
186 | } | ||
187 | |||
188 | |||
189 | public virtual PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position, | ||
190 | Vector3 size, Quaternion rotation, bool isPhysical, bool isPhantom, byte shapetype, uint localid) | ||
191 | { | ||
192 | return AddPrimShape(primName, pbs, position, size, rotation, isPhysical, localid); | ||
193 | } | ||
194 | |||
133 | public virtual float TimeDilation | 195 | public virtual float TimeDilation |
134 | { | 196 | { |
135 | get { return 1.0f; } | 197 | get { return 1.0f; } |
@@ -197,6 +259,9 @@ namespace OpenSim.Region.Physics.Manager | |||
197 | 259 | ||
198 | public abstract void AddPhysicsActorTaint(PhysicsActor prim); | 260 | public abstract void AddPhysicsActorTaint(PhysicsActor prim); |
199 | 261 | ||
262 | |||
263 | public virtual void PrepareSimulation() { } | ||
264 | |||
200 | /// <summary> | 265 | /// <summary> |
201 | /// Perform a simulation of the current physics scene over the given timestep. | 266 | /// Perform a simulation of the current physics scene over the given timestep. |
202 | /// </summary> | 267 | /// </summary> |
@@ -241,7 +306,7 @@ namespace OpenSim.Region.Physics.Manager | |||
241 | } | 306 | } |
242 | 307 | ||
243 | public virtual void Combine(PhysicsScene pScene, Vector3 offset, Vector3 extents) {} | 308 | public virtual void Combine(PhysicsScene pScene, Vector3 offset, Vector3 extents) {} |
244 | 309 | public virtual void CombineTerrain(float[] heightMap, Vector3 pOffset) {} | |
245 | public virtual void UnCombine(PhysicsScene pScene) {} | 310 | public virtual void UnCombine(PhysicsScene pScene) {} |
246 | 311 | ||
247 | /// <summary> | 312 | /// <summary> |
@@ -279,5 +344,40 @@ namespace OpenSim.Region.Physics.Manager | |||
279 | { | 344 | { |
280 | return new List<ContactResult>(); | 345 | return new List<ContactResult>(); |
281 | } | 346 | } |
347 | |||
348 | public virtual object RaycastWorld(Vector3 position, Vector3 direction, float length, int Count, RayFilterFlags filter) | ||
349 | { | ||
350 | return null; | ||
351 | } | ||
352 | |||
353 | public virtual bool SuportsRaycastWorldFiltered() | ||
354 | { | ||
355 | return false; | ||
356 | } | ||
357 | |||
358 | public virtual List<ContactResult> RaycastActor(PhysicsActor actor, Vector3 position, Vector3 direction, float length, int Count, RayFilterFlags flags) | ||
359 | { | ||
360 | return new List<ContactResult>(); | ||
361 | } | ||
362 | |||
363 | public virtual List<ContactResult> BoxProbe(Vector3 position, Vector3 size, Quaternion orientation, int Count, RayFilterFlags flags) | ||
364 | { | ||
365 | return new List<ContactResult>(); | ||
366 | } | ||
367 | |||
368 | public virtual List<ContactResult> SphereProbe(Vector3 position, float radius, int Count, RayFilterFlags flags) | ||
369 | { | ||
370 | return new List<ContactResult>(); | ||
371 | } | ||
372 | |||
373 | public virtual List<ContactResult> PlaneProbe(PhysicsActor actor, Vector4 plane, int Count, RayFilterFlags flags) | ||
374 | { | ||
375 | return new List<ContactResult>(); | ||
376 | } | ||
377 | |||
378 | public virtual int SitAvatar(PhysicsActor actor, Vector3 AbsolutePosition, Vector3 CameraPosition, Vector3 offset, Vector3 AvatarSize, SitAvatarCallback PhysicsSitResponse) | ||
379 | { | ||
380 | return 0; | ||
381 | } | ||
282 | } | 382 | } |
283 | } | 383 | } |
diff --git a/OpenSim/Region/Physics/Manager/VehicleConstants.cs b/OpenSim/Region/Physics/Manager/VehicleConstants.cs index f0775c1..8e24b4c 100644 --- a/OpenSim/Region/Physics/Manager/VehicleConstants.cs +++ b/OpenSim/Region/Physics/Manager/VehicleConstants.cs | |||
@@ -26,6 +26,7 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using OpenMetaverse; | ||
29 | 30 | ||
30 | namespace OpenSim.Region.Physics.Manager | 31 | namespace OpenSim.Region.Physics.Manager |
31 | { | 32 | { |
@@ -117,5 +118,47 @@ namespace OpenSim.Region.Physics.Manager | |||
117 | NO_DEFLECTION = 16392, | 118 | NO_DEFLECTION = 16392, |
118 | LOCK_ROTATION = 32784 | 119 | LOCK_ROTATION = 32784 |
119 | } | 120 | } |
120 | 121 | ||
122 | public struct VehicleData | ||
123 | { | ||
124 | public Vehicle m_type; | ||
125 | public VehicleFlag m_flags; | ||
126 | |||
127 | // Linear properties | ||
128 | public Vector3 m_linearMotorDirection; | ||
129 | public Vector3 m_linearFrictionTimescale; | ||
130 | public float m_linearMotorDecayTimescale; | ||
131 | public float m_linearMotorTimescale; | ||
132 | public Vector3 m_linearMotorOffset; | ||
133 | |||
134 | //Angular properties | ||
135 | public Vector3 m_angularMotorDirection; | ||
136 | public float m_angularMotorTimescale; | ||
137 | public float m_angularMotorDecayTimescale; | ||
138 | public Vector3 m_angularFrictionTimescale; | ||
139 | |||
140 | //Deflection properties | ||
141 | public float m_angularDeflectionEfficiency; | ||
142 | public float m_angularDeflectionTimescale; | ||
143 | public float m_linearDeflectionEfficiency; | ||
144 | public float m_linearDeflectionTimescale; | ||
145 | |||
146 | //Banking properties | ||
147 | public float m_bankingEfficiency; | ||
148 | public float m_bankingMix; | ||
149 | public float m_bankingTimescale; | ||
150 | |||
151 | //Hover and Buoyancy properties | ||
152 | public float m_VhoverHeight; | ||
153 | public float m_VhoverEfficiency; | ||
154 | public float m_VhoverTimescale; | ||
155 | public float m_VehicleBuoyancy; | ||
156 | |||
157 | //Attractor properties | ||
158 | public float m_verticalAttractionEfficiency; | ||
159 | public float m_verticalAttractionTimescale; | ||
160 | |||
161 | // Axis | ||
162 | public Quaternion m_referenceFrame; | ||
163 | } | ||
121 | } | 164 | } |
diff --git a/OpenSim/Region/Physics/Manager/ZeroMesher.cs b/OpenSim/Region/Physics/Manager/ZeroMesher.cs index 270d2ec..80ecf66 100644 --- a/OpenSim/Region/Physics/Manager/ZeroMesher.cs +++ b/OpenSim/Region/Physics/Manager/ZeroMesher.cs | |||
@@ -67,6 +67,11 @@ namespace OpenSim.Region.Physics.Manager | |||
67 | return CreateMesh(primName, primShape, size, lod, false, false); | 67 | return CreateMesh(primName, primShape, size, lod, false, false); |
68 | } | 68 | } |
69 | 69 | ||
70 | public IMesh CreateMesh(String primName, PrimitiveBaseShape primShape, Vector3 size, float lod, bool isPhysical, bool shouldCache, bool convex,bool forOde) | ||
71 | { | ||
72 | return CreateMesh(primName, primShape, size, lod, false); | ||
73 | } | ||
74 | |||
70 | public IMesh CreateMesh(String primName, PrimitiveBaseShape primShape, Vector3 size, float lod, bool isPhysical) | 75 | public IMesh CreateMesh(String primName, PrimitiveBaseShape primShape, Vector3 size, float lod, bool isPhysical) |
71 | { | 76 | { |
72 | return CreateMesh(primName, primShape, size, lod, false, false); | 77 | return CreateMesh(primName, primShape, size, lod, false, false); |
@@ -79,5 +84,14 @@ namespace OpenSim.Region.Physics.Manager | |||
79 | 84 | ||
80 | return null; | 85 | return null; |
81 | } | 86 | } |
87 | |||
88 | public IMesh GetMesh(String primName, PrimitiveBaseShape primShape, Vector3 size, float lod, bool isPhysical, bool convex) | ||
89 | { | ||
90 | return null; | ||
91 | } | ||
92 | |||
93 | public void ReleaseMesh(IMesh mesh) { } | ||
94 | public void ExpireReleaseMeshs() { } | ||
95 | public void ExpireFileCache() { } | ||
82 | } | 96 | } |
83 | } | 97 | } |