diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Physics/Manager/PhysicsScene.cs | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs index ce269fa..a442cf0 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs | |||
@@ -38,6 +38,7 @@ 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 SitAvatarCallback(int status, uint partID, Vector3 offset, Quaternion Orientation); | ||
41 | 42 | ||
42 | public delegate void JointMoved(PhysicsJoint joint); | 43 | public delegate void JointMoved(PhysicsJoint joint); |
43 | public delegate void JointDeactivated(PhysicsJoint joint); | 44 | public delegate void JointDeactivated(PhysicsJoint joint); |
@@ -127,8 +128,10 @@ namespace OpenSim.Region.Physics.Manager | |||
127 | /// <param name="size"></param> | 128 | /// <param name="size"></param> |
128 | /// <param name="isFlying"></param> | 129 | /// <param name="isFlying"></param> |
129 | /// <returns></returns> | 130 | /// <returns></returns> |
130 | public abstract PhysicsActor AddAvatar(string avName, Vector3 position, Vector3 size, bool isFlying); | 131 | public virtual PhysicsActor AddAvatar(string avName, Vector3 position, Vector3 size, bool isFlying) |
131 | 132 | { | |
133 | return null; | ||
134 | } | ||
132 | /// <summary> | 135 | /// <summary> |
133 | /// Add an avatar | 136 | /// Add an avatar |
134 | /// </summary> | 137 | /// </summary> |
@@ -145,6 +148,12 @@ namespace OpenSim.Region.Physics.Manager | |||
145 | return ret; | 148 | return ret; |
146 | } | 149 | } |
147 | 150 | ||
151 | public virtual PhysicsActor AddAvatar(uint localID, string avName, Vector3 position, Vector3 size, float feetOffset, bool isFlying) | ||
152 | { | ||
153 | PhysicsActor ret = AddAvatar(localID, avName, position, size, isFlying); | ||
154 | return ret; | ||
155 | } | ||
156 | |||
148 | /// <summary> | 157 | /// <summary> |
149 | /// Remove an avatar. | 158 | /// Remove an avatar. |
150 | /// </summary> | 159 | /// </summary> |
@@ -349,5 +358,9 @@ namespace OpenSim.Region.Physics.Manager | |||
349 | return new List<ContactResult>(); | 358 | return new List<ContactResult>(); |
350 | } | 359 | } |
351 | 360 | ||
361 | public virtual int SitAvatar(PhysicsActor actor, Vector3 AbsolutePosition, Vector3 CameraPosition, Vector3 offset, Vector3 AvatarSize, SitAvatarCallback PhysicsSitResponse) | ||
362 | { | ||
363 | return 0; | ||
364 | } | ||
352 | } | 365 | } |
353 | } | 366 | } |