aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics
diff options
context:
space:
mode:
authorlbsa712007-07-02 08:03:11 +0000
committerlbsa712007-07-02 08:03:11 +0000
commit686f6a83319eaccd27f426eda82c020246566963 (patch)
tree1a2f4d75316282d4d36de11789af7d0e91950254 /OpenSim/Region/Physics
parent* Applied Weathros/tedd's IP v6 patch (diff)
downloadopensim-SC_OLD-686f6a83319eaccd27f426eda82c020246566963.zip
opensim-SC_OLD-686f6a83319eaccd27f426eda82c020246566963.tar.gz
opensim-SC_OLD-686f6a83319eaccd27f426eda82c020246566963.tar.bz2
opensim-SC_OLD-686f6a83319eaccd27f426eda82c020246566963.tar.xz
* Fixed Issue #161 by using PhysicsScene.Null instead of BasePhysicsScene
* Hid NullPhysicsScene for great justice * Fixed broken Grid build
Diffstat (limited to 'OpenSim/Region/Physics')
-rw-r--r--OpenSim/Region/Physics/Manager/PhysicsManager.cs2
-rw-r--r--OpenSim/Region/Physics/Manager/PhysicsScene.cs74
2 files changed, 38 insertions, 38 deletions
diff --git a/OpenSim/Region/Physics/Manager/PhysicsManager.cs b/OpenSim/Region/Physics/Manager/PhysicsManager.cs
index efccb36..0e28522 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsManager.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsManager.cs
@@ -51,7 +51,7 @@ namespace OpenSim.Physics.Manager
51 { 51 {
52 if (String.IsNullOrEmpty(engineName)) 52 if (String.IsNullOrEmpty(engineName))
53 { 53 {
54 return new NullPhysicsScene(); 54 return PhysicsScene.Null;
55 } 55 }
56 56
57 if(_plugins.ContainsKey(engineName)) 57 if(_plugins.ContainsKey(engineName))
diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
index 0901c2f..3f22585 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
@@ -53,61 +53,61 @@ namespace OpenSim.Physics.Manager
53 public abstract void GetResults(); 53 public abstract void GetResults();
54 54
55 public abstract void SetTerrain(float[] heightMap); 55 public abstract void SetTerrain(float[] heightMap);
56 56
57 public abstract void DeleteTerrain(); 57 public abstract void DeleteTerrain();
58 58
59 public abstract bool IsThreaded 59 public abstract bool IsThreaded
60 { 60 {
61 get; 61 get;
62 } 62 }
63 }
64 63
65 public class NullPhysicsScene : PhysicsScene 64 private class NullPhysicsScene : PhysicsScene
66 {
67 private static int m_workIndicator;
68
69 public override PhysicsActor AddAvatar(PhysicsVector position)
70 { 65 {
71 OpenSim.Framework.Console.MainLog.Instance.Verbose("NullPhysicsScene : AddAvatar({0})", position); 66 private static int m_workIndicator;
72 return PhysicsActor.Null;
73 }
74 67
75 public override void RemoveAvatar(PhysicsActor actor) 68 public override PhysicsActor AddAvatar(PhysicsVector position)
76 { 69 {
70 OpenSim.Framework.Console.MainLog.Instance.Verbose("NullPhysicsScene : AddAvatar({0})", position);
71 return PhysicsActor.Null;
72 }
77 73
78 } 74 public override void RemoveAvatar(PhysicsActor actor)
75 {
79 76
80 public override PhysicsActor AddPrim(PhysicsVector position, PhysicsVector size) 77 }
81 {
82 OpenSim.Framework.Console.MainLog.Instance.Verbose( "NullPhysicsScene : AddPrim({0},{1})", position, size);
83 return PhysicsActor.Null;
84 }
85 78
86 public override void Simulate(float timeStep) 79 public override PhysicsActor AddPrim(PhysicsVector position, PhysicsVector size)
87 { 80 {
88 m_workIndicator = (m_workIndicator + 1) % 10; 81 OpenSim.Framework.Console.MainLog.Instance.Verbose("NullPhysicsScene : AddPrim({0},{1})", position, size);
82 return PhysicsActor.Null;
83 }
89 84
90 //OpenSim.Framework.Console.MainLog.Instance.SetStatus(m_workIndicator.ToString()); 85 public override void Simulate(float timeStep)
91 } 86 {
87 m_workIndicator = (m_workIndicator + 1) % 10;
92 88
93 public override void GetResults() 89 //OpenSim.Framework.Console.MainLog.Instance.SetStatus(m_workIndicator.ToString());
94 { 90 }
95 OpenSim.Framework.Console.MainLog.Instance.Verbose( "NullPhysicsScene : GetResults()");
96 }
97 91
98 public override void SetTerrain(float[] heightMap) 92 public override void GetResults()
99 { 93 {
100 OpenSim.Framework.Console.MainLog.Instance.Verbose( "NullPhysicsScene : SetTerrain({0} items)", heightMap.Length); 94 OpenSim.Framework.Console.MainLog.Instance.Verbose("NullPhysicsScene : GetResults()");
101 } 95 }
102 96
103 public override void DeleteTerrain() 97 public override void SetTerrain(float[] heightMap)
104 { 98 {
99 OpenSim.Framework.Console.MainLog.Instance.Verbose("NullPhysicsScene : SetTerrain({0} items)", heightMap.Length);
100 }
105 101
106 } 102 public override void DeleteTerrain()
103 {
107 104
108 public override bool IsThreaded 105 }
109 { 106
110 get { return false; } 107 public override bool IsThreaded
108 {
109 get { return false; }
110 }
111 } 111 }
112 } 112 }
113} 113}