aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim.RegionServer
diff options
context:
space:
mode:
authorAdam Frisby2007-04-11 05:19:27 +0000
committerAdam Frisby2007-04-11 05:19:27 +0000
commitadb56a46f49127911a2df169c86f2cdfde034966 (patch)
treec5a7b5e279f93538c9506f630b7304b9d55e93e8 /OpenSim.RegionServer
parent(no commit message) (diff)
downloadopensim-SC_OLD-adb56a46f49127911a2df169c86f2cdfde034966.zip
opensim-SC_OLD-adb56a46f49127911a2df169c86f2cdfde034966.tar.gz
opensim-SC_OLD-adb56a46f49127911a2df169c86f2cdfde034966.tar.bz2
opensim-SC_OLD-adb56a46f49127911a2df169c86f2cdfde034966.tar.xz
Major ass changes to terrain (now uses libTerrain-BSD!) and all-round improvements to code quality. Terrain saving/loading may work now (running through setHeights1D and getHeights1D before DB4o) **WARNING: UNTESTED**
Diffstat (limited to 'OpenSim.RegionServer')
-rw-r--r--OpenSim.RegionServer/world/Avatar.cs4
-rw-r--r--OpenSim.RegionServer/world/World.cs12
2 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim.RegionServer/world/Avatar.cs b/OpenSim.RegionServer/world/Avatar.cs
index f507797..843c3af 100644
--- a/OpenSim.RegionServer/world/Avatar.cs
+++ b/OpenSim.RegionServer/world/Avatar.cs
@@ -44,7 +44,7 @@ namespace OpenSim.world
44 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Avatar.cs - Loading details from grid (DUMMY)"); 44 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Avatar.cs - Loading details from grid (DUMMY)");
45 ControllingClient = TheClient; 45 ControllingClient = TheClient;
46 localid = 8880000 + (this.m_world._localNumber++); 46 localid = 8880000 + (this.m_world._localNumber++);
47 Pos = new LLVector3(100.0f, 100.0f, m_world.Terrain.map[(int)Pos.X, (int)Pos.Y] + 1.0f); 47 Pos = new LLVector3(100.0f, 100.0f, m_world.Terrain[(int)Pos.X, (int)Pos.Y] + 1.0f);
48 visualParams = new byte[218]; 48 visualParams = new byte[218];
49 for (int i = 0; i < 218; i++) 49 for (int i = 0; i < 218; i++)
50 { 50 {
@@ -332,7 +332,7 @@ namespace OpenSim.world
332 332
333 public override void LandRenegerated() 333 public override void LandRenegerated()
334 { 334 {
335 Pos = new LLVector3(100.0f, 100.0f, m_world.Terrain.map[(int)Pos.X, (int)Pos.Y] + 50.0f); 335 Pos = new LLVector3(100.0f, 100.0f, m_world.Terrain[(int)Pos.X, (int)Pos.Y] + 50.0f);
336 } 336 }
337 } 337 }
338 338
diff --git a/OpenSim.RegionServer/world/World.cs b/OpenSim.RegionServer/world/World.cs
index 580804a..c7c57d1 100644
--- a/OpenSim.RegionServer/world/World.cs
+++ b/OpenSim.RegionServer/world/World.cs
@@ -198,7 +198,7 @@ namespace OpenSim.world
198 { 198 {
199 this.phyScene.SetTerrain(Terrain.getHeights1D()); 199 this.phyScene.SetTerrain(Terrain.getHeights1D());
200 } 200 }
201 this.localStorage.SaveMap(this.Terrain.map); 201 this.localStorage.SaveMap(this.Terrain.getHeights1D());
202 202
203 foreach (SimClient client in m_clientThreads.Values) 203 foreach (SimClient client in m_clientThreads.Values)
204 { 204 {
@@ -213,12 +213,12 @@ namespace OpenSim.world
213 213
214 public void RegenerateTerrain(float[,] newMap) 214 public void RegenerateTerrain(float[,] newMap)
215 { 215 {
216 this.Terrain.map = newMap; 216 this.Terrain.setHeights2D(newMap);
217 lock (this.LockPhysicsEngine) 217 lock (this.LockPhysicsEngine)
218 { 218 {
219 this.phyScene.SetTerrain(this.Terrain.getHeights1D()); 219 this.phyScene.SetTerrain(this.Terrain.getHeights1D());
220 } 220 }
221 this.localStorage.SaveMap(this.Terrain.map); 221 this.localStorage.SaveMap(this.Terrain.getHeights1D());
222 222
223 foreach (SimClient client in m_clientThreads.Values) 223 foreach (SimClient client in m_clientThreads.Values)
224 { 224 {
@@ -239,7 +239,7 @@ namespace OpenSim.world
239 { 239 {
240 this.phyScene.SetTerrain(this.Terrain.getHeights1D()); 240 this.phyScene.SetTerrain(this.Terrain.getHeights1D());
241 } 241 }
242 this.localStorage.SaveMap(this.Terrain.map); 242 this.localStorage.SaveMap(this.Terrain.getHeights1D());
243 243
244 foreach (SimClient client in m_clientThreads.Values) 244 foreach (SimClient client in m_clientThreads.Values)
245 { 245 {
@@ -252,7 +252,7 @@ namespace OpenSim.world
252 252
253 public void LoadWorldMap() 253 public void LoadWorldMap()
254 { 254 {
255 float[,] map = this.localStorage.LoadWorld(); 255 float[] map = this.localStorage.LoadWorld();
256 if (map == null) 256 if (map == null)
257 { 257 {
258 this.Terrain.hills(); 258 this.Terrain.hills();
@@ -260,7 +260,7 @@ namespace OpenSim.world
260 } 260 }
261 else 261 else
262 { 262 {
263 this.Terrain.map = map; 263 this.Terrain.setHeights1D(map);
264 } 264 }
265 } 265 }
266 266