aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-10-14 01:38:14 +0100
committerJustin Clark-Casey (justincc)2011-10-14 01:38:14 +0100
commit77c65951e06c1d309f2bc8f6d2451b2b9a82c9df (patch)
tree8469539e3da2ac5691b24d8095a7645b1323d571
parentDon't execute rest of code in XEngine.RemoveRegion() and Close() if the modul... (diff)
downloadopensim-SC_OLD-77c65951e06c1d309f2bc8f6d2451b2b9a82c9df.zip
opensim-SC_OLD-77c65951e06c1d309f2bc8f6d2451b2b9a82c9df.tar.gz
opensim-SC_OLD-77c65951e06c1d309f2bc8f6d2451b2b9a82c9df.tar.bz2
opensim-SC_OLD-77c65951e06c1d309f2bc8f6d2451b2b9a82c9df.tar.xz
Extract NullPhysicsScene from PhysicsScene to improve code readability
-rw-r--r--OpenSim/Region/Physics/Manager/NullPhysicsScene.cs121
-rw-r--r--OpenSim/Region/Physics/Manager/PhysicsScene.cs92
2 files changed, 125 insertions, 88 deletions
diff --git a/OpenSim/Region/Physics/Manager/NullPhysicsScene.cs b/OpenSim/Region/Physics/Manager/NullPhysicsScene.cs
new file mode 100644
index 0000000..1ccf46d
--- /dev/null
+++ b/OpenSim/Region/Physics/Manager/NullPhysicsScene.cs
@@ -0,0 +1,121 @@
1/*
2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSimulator Project nor the
13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */
27
28using System.Collections.Generic;
29using System.Reflection;
30using log4net;
31using Nini.Config;
32using OpenSim.Framework;
33using OpenMetaverse;
34
35namespace OpenSim.Region.Physics.Manager
36{
37 class NullPhysicsScene : PhysicsScene
38 {
39 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
40
41 private static int m_workIndicator;
42
43 public override void Initialise(IMesher meshmerizer, IConfigSource config)
44 {
45 // Does nothing right now
46 }
47
48 public override PhysicsActor AddAvatar(string avName, Vector3 position, Vector3 size, bool isFlying)
49 {
50 m_log.InfoFormat("[PHYSICS]: NullPhysicsScene : AddAvatar({0})", position);
51 return PhysicsActor.Null;
52 }
53
54 public override void RemoveAvatar(PhysicsActor actor)
55 {
56 }
57
58 public override void RemovePrim(PhysicsActor prim)
59 {
60 }
61 public override void SetWaterLevel(float baseheight)
62 {
63
64 }
65
66/*
67 public override PhysicsActor AddPrim(Vector3 position, Vector3 size, Quaternion rotation)
68 {
69 m_log.InfoFormat("NullPhysicsScene : AddPrim({0},{1})", position, size);
70 return PhysicsActor.Null;
71 }
72*/
73
74 public override PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position,
75 Vector3 size, Quaternion rotation, bool isPhysical, uint localid)
76 {
77 m_log.InfoFormat("[PHYSICS]: NullPhysicsScene : AddPrim({0},{1})", position, size);
78 return PhysicsActor.Null;
79 }
80
81 public override void AddPhysicsActorTaint(PhysicsActor prim)
82 {
83 }
84
85 public override float Simulate(float timeStep)
86 {
87 m_workIndicator = (m_workIndicator + 1) % 10;
88
89 return 0f;
90 }
91
92 public override void GetResults()
93 {
94 m_log.Info("[PHYSICS]: NullPhysicsScene : GetResults()");
95 }
96
97 public override void SetTerrain(float[] heightMap)
98 {
99 m_log.InfoFormat("[PHYSICS]: NullPhysicsScene : SetTerrain({0} items)", heightMap.Length);
100 }
101
102 public override void DeleteTerrain()
103 {
104 }
105
106 public override bool IsThreaded
107 {
108 get { return false; }
109 }
110
111 public override void Dispose()
112 {
113 }
114
115 public override Dictionary<uint,float> GetTopColliders()
116 {
117 Dictionary<uint, float> returncolliders = new Dictionary<uint, float>();
118 return returncolliders;
119 }
120 }
121} \ No newline at end of file
diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
index 052ee9e..f1cc8e6 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
@@ -39,6 +39,10 @@ namespace OpenSim.Region.Physics.Manager
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 41
42 public delegate void JointMoved(PhysicsJoint joint);
43 public delegate void JointDeactivated(PhysicsJoint joint);
44 public delegate void JointErrorMessage(PhysicsJoint joint, string message); // this refers to an "error message due to a problem", not "amount of joint constraint violation"
45
42 /// <summary> 46 /// <summary>
43 /// Contact result from a raycast. 47 /// Contact result from a raycast.
44 /// </summary> 48 /// </summary>
@@ -258,93 +262,5 @@ namespace OpenSim.Region.Physics.Manager
258 { 262 {
259 return new List<ContactResult>(); 263 return new List<ContactResult>();
260 } 264 }
261
262 private class NullPhysicsScene : PhysicsScene
263 {
264 private static int m_workIndicator;
265
266
267 public override void Initialise(IMesher meshmerizer, IConfigSource config)
268 {
269 // Does nothing right now
270 }
271
272 public override PhysicsActor AddAvatar(string avName, Vector3 position, Vector3 size, bool isFlying)
273 {
274 m_log.InfoFormat("[PHYSICS]: NullPhysicsScene : AddAvatar({0})", position);
275 return PhysicsActor.Null;
276 }
277
278 public override void RemoveAvatar(PhysicsActor actor)
279 {
280 }
281
282 public override void RemovePrim(PhysicsActor prim)
283 {
284 }
285 public override void SetWaterLevel(float baseheight)
286 {
287
288 }
289
290/*
291 public override PhysicsActor AddPrim(Vector3 position, Vector3 size, Quaternion rotation)
292 {
293 m_log.InfoFormat("NullPhysicsScene : AddPrim({0},{1})", position, size);
294 return PhysicsActor.Null;
295 }
296*/
297
298 public override PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position,
299 Vector3 size, Quaternion rotation, bool isPhysical, uint localid)
300 {
301 m_log.InfoFormat("[PHYSICS]: NullPhysicsScene : AddPrim({0},{1})", position, size);
302 return PhysicsActor.Null;
303 }
304
305 public override void AddPhysicsActorTaint(PhysicsActor prim)
306 {
307 }
308
309 public override float Simulate(float timeStep)
310 {
311 m_workIndicator = (m_workIndicator + 1) % 10;
312
313 return 0f;
314 }
315
316 public override void GetResults()
317 {
318 m_log.Info("[PHYSICS]: NullPhysicsScene : GetResults()");
319 }
320
321 public override void SetTerrain(float[] heightMap)
322 {
323 m_log.InfoFormat("[PHYSICS]: NullPhysicsScene : SetTerrain({0} items)", heightMap.Length);
324 }
325
326 public override void DeleteTerrain()
327 {
328 }
329
330 public override bool IsThreaded
331 {
332 get { return false; }
333 }
334
335 public override void Dispose()
336 {
337 }
338
339 public override Dictionary<uint,float> GetTopColliders()
340 {
341 Dictionary<uint, float> returncolliders = new Dictionary<uint, float>();
342 return returncolliders;
343 }
344
345 }
346 } 265 }
347 public delegate void JointMoved(PhysicsJoint joint);
348 public delegate void JointDeactivated(PhysicsJoint joint);
349 public delegate void JointErrorMessage(PhysicsJoint joint, string message); // this refers to an "error message due to a problem", not "amount of joint constraint violation"
350} 266}