aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim.Physics
diff options
context:
space:
mode:
authorMW2007-04-06 19:08:24 +0000
committerMW2007-04-06 19:08:24 +0000
commit0311fef2447217fb87111835d82654cdc6c6dd31 (patch)
tree807f294533592c850794ee23377017a8085c0fb5 /OpenSim.Physics
parentAdded getHeights1D() function to TerrainEngine (diff)
downloadopensim-SC_OLD-0311fef2447217fb87111835d82654cdc6c6dd31.zip
opensim-SC_OLD-0311fef2447217fb87111835d82654cdc6c6dd31.tar.gz
opensim-SC_OLD-0311fef2447217fb87111835d82654cdc6c6dd31.tar.bz2
opensim-SC_OLD-0311fef2447217fb87111835d82654cdc6c6dd31.tar.xz
Now back to compiling, just no terrain generation at the moment
Diffstat (limited to '')
-rw-r--r--OpenSim.Physics/Manager/PhysicsScene.cs4
-rw-r--r--OpenSim.Physics/OdePlugin/OdePlugin.cs2
-rw-r--r--OpenSim.Physics/PhysXPlugin/PhysXPlugin.cs2
3 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim.Physics/Manager/PhysicsScene.cs b/OpenSim.Physics/Manager/PhysicsScene.cs
index 25e2104..0b3dfd2 100644
--- a/OpenSim.Physics/Manager/PhysicsScene.cs
+++ b/OpenSim.Physics/Manager/PhysicsScene.cs
@@ -49,7 +49,7 @@ namespace OpenSim.Physics.Manager
49 49
50 public abstract void GetResults(); 50 public abstract void GetResults();
51 51
52 public abstract void SetTerrain(float[,] heightMap); 52 public abstract void SetTerrain(float[] heightMap);
53 53
54 public abstract void DeleteTerrain(); 54 public abstract void DeleteTerrain();
55 55
@@ -87,7 +87,7 @@ namespace OpenSim.Physics.Manager
87 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("NullPhysicsScene : GetResults()"); 87 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("NullPhysicsScene : GetResults()");
88 } 88 }
89 89
90 public override void SetTerrain(float[,] heightMap) 90 public override void SetTerrain(float[] heightMap)
91 { 91 {
92 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("NullPhysicsScene : SetTerrain({0} items)", heightMap.Length); 92 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("NullPhysicsScene : SetTerrain({0} items)", heightMap.Length);
93 } 93 }
diff --git a/OpenSim.Physics/OdePlugin/OdePlugin.cs b/OpenSim.Physics/OdePlugin/OdePlugin.cs
index 7c9c684..325e2fd 100644
--- a/OpenSim.Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim.Physics/OdePlugin/OdePlugin.cs
@@ -173,7 +173,7 @@ namespace OpenSim.Physics.OdePlugin
173 } 173 }
174 } 174 }
175 175
176 public override void SetTerrain(float[,] heightMap) 176 public override void SetTerrain(float[] heightMap)
177 { 177 {
178 for (int i = 0; i < 65536; i++) 178 for (int i = 0; i < 65536; i++)
179 { 179 {
diff --git a/OpenSim.Physics/PhysXPlugin/PhysXPlugin.cs b/OpenSim.Physics/PhysXPlugin/PhysXPlugin.cs
index 74e7cb8..10e92fe 100644
--- a/OpenSim.Physics/PhysXPlugin/PhysXPlugin.cs
+++ b/OpenSim.Physics/PhysXPlugin/PhysXPlugin.cs
@@ -173,7 +173,7 @@ namespace OpenSim.Physics.PhysXPlugin
173 } 173 }
174 } 174 }
175 175
176 public override void SetTerrain(float[,] heightMap) 176 public override void SetTerrain(float[] heightMap)
177 { 177 {
178 if (this._heightMap != null) 178 if (this._heightMap != null)
179 { 179 {