diff options
Diffstat (limited to 'OpenSim/Region/Physics/Manager/PhysicsActor.cs')
-rw-r--r-- | OpenSim/Region/Physics/Manager/PhysicsActor.cs | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/Manager/PhysicsActor.cs b/OpenSim/Region/Physics/Manager/PhysicsActor.cs index 0587054..be67204 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsActor.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsActor.cs | |||
@@ -68,6 +68,19 @@ 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 | public bool softcolide; | ||
76 | |||
77 | public ContactData(float _mu, float _bounce, bool _softcolide) | ||
78 | { | ||
79 | mu = _mu; | ||
80 | bounce = _bounce; | ||
81 | softcolide = _softcolide; | ||
82 | } | ||
83 | } | ||
71 | /// <summary> | 84 | /// <summary> |
72 | /// Used to pass collision information to OnCollisionUpdate listeners. | 85 | /// Used to pass collision information to OnCollisionUpdate listeners. |
73 | /// </summary> | 86 | /// </summary> |
@@ -135,6 +148,8 @@ namespace OpenSim.Region.Physics.Manager | |||
135 | /// </summary> | 148 | /// </summary> |
136 | public event CollisionUpdate OnCollisionUpdate; | 149 | public event CollisionUpdate OnCollisionUpdate; |
137 | 150 | ||
151 | public virtual void SetVehicle(object vdata) { } | ||
152 | |||
138 | public event OutOfBounds OnOutOfBounds; | 153 | public event OutOfBounds OnOutOfBounds; |
139 | #pragma warning restore 67 | 154 | #pragma warning restore 67 |
140 | 155 | ||
@@ -142,11 +157,23 @@ namespace OpenSim.Region.Physics.Manager | |||
142 | { | 157 | { |
143 | get { return new NullPhysicsActor(); } | 158 | get { return new NullPhysicsActor(); } |
144 | } | 159 | } |
160 | |||
161 | public virtual bool Building { get; set; } | ||
162 | |||
163 | public virtual void getContactData(ref ContactData cdata) | ||
164 | { | ||
165 | cdata.mu = 0; | ||
166 | cdata.bounce = 0; | ||
167 | } | ||
145 | 168 | ||
146 | public abstract bool Stopped { get; } | 169 | public abstract bool Stopped { get; } |
147 | 170 | ||
148 | public abstract Vector3 Size { get; set; } | 171 | public abstract Vector3 Size { get; set; } |
149 | 172 | ||
173 | public virtual bool Phantom { get; set; } | ||
174 | |||
175 | public virtual byte PhysicsShapeType { get; set; } | ||
176 | |||
150 | public abstract PrimitiveBaseShape Shape { set; } | 177 | public abstract PrimitiveBaseShape Shape { set; } |
151 | 178 | ||
152 | uint m_baseLocalID; | 179 | uint m_baseLocalID; |
@@ -195,6 +222,11 @@ namespace OpenSim.Region.Physics.Manager | |||
195 | } | 222 | } |
196 | } | 223 | } |
197 | 224 | ||
225 | public virtual byte[] Serialize(bool PhysIsRunning) | ||
226 | { | ||
227 | return new byte[0]; | ||
228 | } | ||
229 | |||
198 | public virtual void RaiseOutOfBounds(Vector3 pos) | 230 | public virtual void RaiseOutOfBounds(Vector3 pos) |
199 | { | 231 | { |
200 | // Make a temporary copy of the event to avoid possibility of | 232 | // Make a temporary copy of the event to avoid possibility of |
@@ -222,6 +254,11 @@ namespace OpenSim.Region.Physics.Manager | |||
222 | { | 254 | { |
223 | } | 255 | } |
224 | 256 | ||
257 | public virtual float Density { get; set; } | ||
258 | public virtual float GravModifier { get; set; } | ||
259 | public virtual float Friction { get; set; } | ||
260 | public virtual float Bounce { get; set; } | ||
261 | |||
225 | /// <summary> | 262 | /// <summary> |
226 | /// Position of this actor. | 263 | /// Position of this actor. |
227 | /// </summary> | 264 | /// </summary> |
@@ -554,5 +591,6 @@ namespace OpenSim.Region.Physics.Manager | |||
554 | { | 591 | { |
555 | return false; | 592 | return false; |
556 | } | 593 | } |
594 | |||
557 | } | 595 | } |
558 | } | 596 | } |