diff options
Diffstat (limited to 'OpenSim/Region/Physics/Manager/PhysicsActor.cs')
-rw-r--r-- | OpenSim/Region/Physics/Manager/PhysicsActor.cs | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/Manager/PhysicsActor.cs b/OpenSim/Region/Physics/Manager/PhysicsActor.cs index 0587054..f525e9e 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsActor.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsActor.cs | |||
@@ -68,6 +68,17 @@ namespace OpenSim.Region.Physics.Manager | |||
68 | } | 68 | } |
69 | } | 69 | } |
70 | 70 | ||
71 | public struct ContactData | ||
72 | { | ||
73 | public float mu; | ||
74 | public float bounce; | ||
75 | |||
76 | public ContactData(float _mu, float _bounce) | ||
77 | { | ||
78 | mu = _mu; | ||
79 | bounce = _bounce; | ||
80 | } | ||
81 | } | ||
71 | /// <summary> | 82 | /// <summary> |
72 | /// Used to pass collision information to OnCollisionUpdate listeners. | 83 | /// Used to pass collision information to OnCollisionUpdate listeners. |
73 | /// </summary> | 84 | /// </summary> |
@@ -135,6 +146,8 @@ namespace OpenSim.Region.Physics.Manager | |||
135 | /// </summary> | 146 | /// </summary> |
136 | public event CollisionUpdate OnCollisionUpdate; | 147 | public event CollisionUpdate OnCollisionUpdate; |
137 | 148 | ||
149 | public virtual void SetVehicle(object vdata) { } | ||
150 | |||
138 | public event OutOfBounds OnOutOfBounds; | 151 | public event OutOfBounds OnOutOfBounds; |
139 | #pragma warning restore 67 | 152 | #pragma warning restore 67 |
140 | 153 | ||
@@ -142,6 +155,13 @@ namespace OpenSim.Region.Physics.Manager | |||
142 | { | 155 | { |
143 | get { return new NullPhysicsActor(); } | 156 | get { return new NullPhysicsActor(); } |
144 | } | 157 | } |
158 | |||
159 | public virtual bool Building { get; set; } | ||
160 | |||
161 | public virtual ContactData ContactData | ||
162 | { | ||
163 | get { return new ContactData(0, 0); } | ||
164 | } | ||
145 | 165 | ||
146 | public abstract bool Stopped { get; } | 166 | public abstract bool Stopped { get; } |
147 | 167 | ||
@@ -195,6 +215,11 @@ namespace OpenSim.Region.Physics.Manager | |||
195 | } | 215 | } |
196 | } | 216 | } |
197 | 217 | ||
218 | public virtual byte[] Serialize(bool PhysIsRunning) | ||
219 | { | ||
220 | return new byte[0]; | ||
221 | } | ||
222 | |||
198 | public virtual void RaiseOutOfBounds(Vector3 pos) | 223 | public virtual void RaiseOutOfBounds(Vector3 pos) |
199 | { | 224 | { |
200 | // Make a temporary copy of the event to avoid possibility of | 225 | // Make a temporary copy of the event to avoid possibility of |
@@ -554,5 +579,6 @@ namespace OpenSim.Region.Physics.Manager | |||
554 | { | 579 | { |
555 | return false; | 580 | return false; |
556 | } | 581 | } |
582 | |||
557 | } | 583 | } |
558 | } | 584 | } |