diff options
author | UbitUmarov | 2013-01-02 19:39:46 +0000 |
---|---|---|
committer | UbitUmarov | 2013-01-02 19:39:46 +0000 |
commit | 7980a1d8496b71e46eeead7d77382cd10ac9fa78 (patch) | |
tree | a56fbe3ffc665efcdf54c35573fdd100d96357d4 /OpenSim/Region/Physics/Manager/PhysicsScene.cs | |
parent | Merge branch 'ubitwork' into avination (diff) | |
download | opensim-SC-7980a1d8496b71e46eeead7d77382cd10ac9fa78.zip opensim-SC-7980a1d8496b71e46eeead7d77382cd10ac9fa78.tar.gz opensim-SC-7980a1d8496b71e46eeead7d77382cd10ac9fa78.tar.bz2 opensim-SC-7980a1d8496b71e46eeead7d77382cd10ac9fa78.tar.xz |
*TEST* avatar unscripted sit. Some guessing/automation
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Physics/Manager/PhysicsScene.cs | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs index 86e0713..d24ab2a 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs | |||
@@ -38,6 +38,9 @@ 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); | ||
41 | public delegate void SitAvatarCallback(int status, uint partID, Vector3 offset, Quaternion Orientation); | 44 | public delegate void SitAvatarCallback(int status, uint partID, Vector3 offset, Quaternion Orientation); |
42 | 45 | ||
43 | public delegate void JointMoved(PhysicsJoint joint); | 46 | public delegate void JointMoved(PhysicsJoint joint); |
@@ -56,6 +59,7 @@ namespace OpenSim.Region.Physics.Manager | |||
56 | volumedtc = 0x40, | 59 | volumedtc = 0x40, |
57 | 60 | ||
58 | // ray cast colision control (may only work for meshs) | 61 | // ray cast colision control (may only work for meshs) |
62 | ContactsUnImportant = 0x2000, | ||
59 | BackFaceCull = 0x4000, | 63 | BackFaceCull = 0x4000, |
60 | ClosestHit = 0x8000, | 64 | ClosestHit = 0x8000, |
61 | 65 | ||
@@ -351,13 +355,26 @@ namespace OpenSim.Region.Physics.Manager | |||
351 | return false; | 355 | return false; |
352 | } | 356 | } |
353 | 357 | ||
354 | public virtual void RaycastActor(PhysicsActor actor, Vector3 position, Vector3 direction, float length, RaycastCallback retMethod){} | ||
355 | public virtual void RaycastActor(PhysicsActor actor, Vector3 position, Vector3 direction, float length, int Count, RayCallback retMethod) { } | ||
356 | public virtual List<ContactResult> RaycastActor(PhysicsActor actor, Vector3 position, Vector3 direction, float length, int Count, RayFilterFlags flags) | 358 | public virtual List<ContactResult> RaycastActor(PhysicsActor actor, Vector3 position, Vector3 direction, float length, int Count, RayFilterFlags flags) |
357 | { | 359 | { |
358 | return new List<ContactResult>(); | 360 | return new List<ContactResult>(); |
359 | } | 361 | } |
360 | 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 | |||
361 | public virtual int SitAvatar(PhysicsActor actor, Vector3 AbsolutePosition, Vector3 CameraPosition, Vector3 offset, Vector3 AvatarSize, SitAvatarCallback PhysicsSitResponse) | 378 | public virtual int SitAvatar(PhysicsActor actor, Vector3 AbsolutePosition, Vector3 CameraPosition, Vector3 offset, Vector3 AvatarSize, SitAvatarCallback PhysicsSitResponse) |
362 | { | 379 | { |
363 | return 0; | 380 | return 0; |