diff options
Diffstat (limited to 'OpenSim/Region/Physics/Manager')
-rw-r--r-- | OpenSim/Region/Physics/Manager/PhysicsActor.cs | 5 | ||||
-rw-r--r-- | OpenSim/Region/Physics/Manager/PhysicsScene.cs | 9 |
2 files changed, 13 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/Manager/PhysicsActor.cs b/OpenSim/Region/Physics/Manager/PhysicsActor.cs index 3cf2646..c87e748 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsActor.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsActor.cs | |||
@@ -176,7 +176,7 @@ namespace OpenSim.Region.Physics.Manager | |||
176 | public abstract PhysicsVector GeometricCenter { get; } | 176 | public abstract PhysicsVector GeometricCenter { get; } |
177 | public abstract PhysicsVector CenterOfMass { get; } | 177 | public abstract PhysicsVector CenterOfMass { get; } |
178 | public abstract PhysicsVector Velocity { get; set; } | 178 | public abstract PhysicsVector Velocity { get; set; } |
179 | public abstract float CollisionScore { get;} | 179 | public abstract float CollisionScore { get; set;} |
180 | public abstract PhysicsVector Acceleration { get; } | 180 | public abstract PhysicsVector Acceleration { get; } |
181 | public abstract Quaternion Orientation { get; set; } | 181 | public abstract Quaternion Orientation { get; set; } |
182 | public abstract int PhysicsActorType { get; set; } | 182 | public abstract int PhysicsActorType { get; set; } |
@@ -208,8 +208,10 @@ namespace OpenSim.Region.Physics.Manager | |||
208 | public override bool Stopped | 208 | public override bool Stopped |
209 | { | 209 | { |
210 | get{ return false; } | 210 | get{ return false; } |
211 | |||
211 | } | 212 | } |
212 | 213 | ||
214 | |||
213 | public override PhysicsVector Position | 215 | public override PhysicsVector Position |
214 | { | 216 | { |
215 | get { return PhysicsVector.Zero; } | 217 | get { return PhysicsVector.Zero; } |
@@ -300,6 +302,7 @@ namespace OpenSim.Region.Physics.Manager | |||
300 | public override float CollisionScore | 302 | public override float CollisionScore |
301 | { | 303 | { |
302 | get { return 0f; } | 304 | get { return 0f; } |
305 | set { } | ||
303 | } | 306 | } |
304 | 307 | ||
305 | public override void CrossingFailure() | 308 | public override void CrossingFailure() |
diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs index de93f22..f9d990b 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs | |||
@@ -25,6 +25,7 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System.Collections.Generic; | ||
28 | using System.Reflection; | 29 | using System.Reflection; |
29 | using Axiom.Math; | 30 | using Axiom.Math; |
30 | using log4net; | 31 | using log4net; |
@@ -86,6 +87,8 @@ namespace OpenSim.Region.Physics.Manager | |||
86 | 87 | ||
87 | public abstract void Dispose(); | 88 | public abstract void Dispose(); |
88 | 89 | ||
90 | public abstract Dictionary<uint, float> GetTopColliders(); | ||
91 | |||
89 | public abstract bool IsThreaded { get; } | 92 | public abstract bool IsThreaded { get; } |
90 | 93 | ||
91 | private class NullPhysicsScene : PhysicsScene | 94 | private class NullPhysicsScene : PhysicsScene |
@@ -170,6 +173,12 @@ namespace OpenSim.Region.Physics.Manager | |||
170 | public override void Dispose() | 173 | public override void Dispose() |
171 | { | 174 | { |
172 | } | 175 | } |
176 | |||
177 | public override Dictionary<uint,float> GetTopColliders() | ||
178 | { | ||
179 | Dictionary<uint, float> returncolliders = new Dictionary<uint, float>(); | ||
180 | return returncolliders; | ||
181 | } | ||
173 | } | 182 | } |
174 | } | 183 | } |
175 | } | 184 | } |