diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Physics/Manager/PhysicsScene.cs | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs index 9ab2997..3f08234 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs | |||
@@ -25,9 +25,9 @@ | |||
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 Axiom.Math; | ||
28 | using OpenSim.Framework; | 29 | using OpenSim.Framework; |
29 | using OpenSim.Framework.Console; | 30 | using OpenSim.Framework.Console; |
30 | using Axiom.Math; | ||
31 | 31 | ||
32 | namespace OpenSim.Region.Physics.Manager | 32 | namespace OpenSim.Region.Physics.Manager |
33 | { | 33 | { |
@@ -35,10 +35,7 @@ namespace OpenSim.Region.Physics.Manager | |||
35 | { | 35 | { |
36 | public static PhysicsScene Null | 36 | public static PhysicsScene Null |
37 | { | 37 | { |
38 | get | 38 | get { return new NullPhysicsScene(); } |
39 | { | ||
40 | return new NullPhysicsScene(); | ||
41 | } | ||
42 | } | 39 | } |
43 | 40 | ||
44 | public abstract PhysicsActor AddAvatar(string avName, PhysicsVector position); | 41 | public abstract PhysicsActor AddAvatar(string avName, PhysicsVector position); |
@@ -47,7 +44,8 @@ namespace OpenSim.Region.Physics.Manager | |||
47 | 44 | ||
48 | public abstract void RemovePrim(PhysicsActor prim); | 45 | public abstract void RemovePrim(PhysicsActor prim); |
49 | 46 | ||
50 | public abstract PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, PhysicsVector position, PhysicsVector size, Quaternion rotation); | 47 | public abstract PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, PhysicsVector position, |
48 | PhysicsVector size, Quaternion rotation); | ||
51 | 49 | ||
52 | public abstract void Simulate(float timeStep); | 50 | public abstract void Simulate(float timeStep); |
53 | 51 | ||
@@ -57,10 +55,7 @@ namespace OpenSim.Region.Physics.Manager | |||
57 | 55 | ||
58 | public abstract void DeleteTerrain(); | 56 | public abstract void DeleteTerrain(); |
59 | 57 | ||
60 | public abstract bool IsThreaded | 58 | public abstract bool IsThreaded { get; } |
61 | { | ||
62 | get; | ||
63 | } | ||
64 | 59 | ||
65 | private class NullPhysicsScene : PhysicsScene | 60 | private class NullPhysicsScene : PhysicsScene |
66 | { | 61 | { |
@@ -74,12 +69,10 @@ namespace OpenSim.Region.Physics.Manager | |||
74 | 69 | ||
75 | public override void RemoveAvatar(PhysicsActor actor) | 70 | public override void RemoveAvatar(PhysicsActor actor) |
76 | { | 71 | { |
77 | |||
78 | } | 72 | } |
79 | 73 | ||
80 | public override void RemovePrim(PhysicsActor prim) | 74 | public override void RemovePrim(PhysicsActor prim) |
81 | { | 75 | { |
82 | |||
83 | } | 76 | } |
84 | 77 | ||
85 | /* | 78 | /* |
@@ -89,7 +82,9 @@ namespace OpenSim.Region.Physics.Manager | |||
89 | return PhysicsActor.Null; | 82 | return PhysicsActor.Null; |
90 | } | 83 | } |
91 | */ | 84 | */ |
92 | public override PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, PhysicsVector position, PhysicsVector size, Quaternion rotation) | 85 | |
86 | public override PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, PhysicsVector position, | ||
87 | PhysicsVector size, Quaternion rotation) | ||
93 | { | 88 | { |
94 | MainLog.Instance.Verbose("NullPhysicsScene : AddPrim({0},{1})", position, size); | 89 | MainLog.Instance.Verbose("NullPhysicsScene : AddPrim({0},{1})", position, size); |
95 | return PhysicsActor.Null; | 90 | return PhysicsActor.Null; |
@@ -97,7 +92,7 @@ namespace OpenSim.Region.Physics.Manager | |||
97 | 92 | ||
98 | public override void Simulate(float timeStep) | 93 | public override void Simulate(float timeStep) |
99 | { | 94 | { |
100 | m_workIndicator = (m_workIndicator + 1) % 10; | 95 | m_workIndicator = (m_workIndicator + 1)%10; |
101 | 96 | ||
102 | //OpenSim.Framework.Console.MainLog.Instance.SetStatus(m_workIndicator.ToString()); | 97 | //OpenSim.Framework.Console.MainLog.Instance.SetStatus(m_workIndicator.ToString()); |
103 | } | 98 | } |
@@ -114,7 +109,6 @@ namespace OpenSim.Region.Physics.Manager | |||
114 | 109 | ||
115 | public override void DeleteTerrain() | 110 | public override void DeleteTerrain() |
116 | { | 111 | { |
117 | |||
118 | } | 112 | } |
119 | 113 | ||
120 | public override bool IsThreaded | 114 | public override bool IsThreaded |
@@ -123,4 +117,4 @@ namespace OpenSim.Region.Physics.Manager | |||
123 | } | 117 | } |
124 | } | 118 | } |
125 | } | 119 | } |
126 | } | 120 | } \ No newline at end of file |