ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-07 09:45:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

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**

Browse Source
This commit is contained in:
Adam Frisby
2007-04-11 05:19:27 +00:00
parent b5494438e5
commit adb56a46f4
19 changed files with 70 additions and 310 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim.RegionServer/world/Avatar.cs
View File

@@ -44,7 +44,7 @@ namespace OpenSim.world
OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Avatar.cs - Loading details from grid (DUMMY)");
ControllingClient = TheClient;
localid = 8880000 + (this.m_world._localNumber++);
Pos = new LLVector3(100.0f, 100.0f, m_world.Terrain.map[(int)Pos.X, (int)Pos.Y] + 1.0f);
Pos = new LLVector3(100.0f, 100.0f, m_world.Terrain[(int)Pos.X, (int)Pos.Y] + 1.0f);
visualParams = new byte[218];
for (int i = 0; i < 218; i++)
{
@@ -332,7 +332,7 @@ namespace OpenSim.world
public override void LandRenegerated()
{
Pos = new LLVector3(100.0f, 100.0f, m_world.Terrain.map[(int)Pos.X, (int)Pos.Y] + 50.0f);
Pos = new LLVector3(100.0f, 100.0f, m_world.Terrain[(int)Pos.X, (int)Pos.Y] + 50.0f);
}
}

12
OpenSim.RegionServer/world/World.cs
View File

@@ -198,7 +198,7 @@ namespace OpenSim.world
{
this.phyScene.SetTerrain(Terrain.getHeights1D());
}
this.localStorage.SaveMap(this.Terrain.map);
this.localStorage.SaveMap(this.Terrain.getHeights1D());
foreach (SimClient client in m_clientThreads.Values)
{
@@ -213,12 +213,12 @@ namespace OpenSim.world
public void RegenerateTerrain(float[,] newMap)
{
this.Terrain.map = newMap;
this.Terrain.setHeights2D(newMap);
lock (this.LockPhysicsEngine)
{
this.phyScene.SetTerrain(this.Terrain.getHeights1D());
}
this.localStorage.SaveMap(this.Terrain.map);
this.localStorage.SaveMap(this.Terrain.getHeights1D());
foreach (SimClient client in m_clientThreads.Values)
{
@@ -239,7 +239,7 @@ namespace OpenSim.world
{
this.phyScene.SetTerrain(this.Terrain.getHeights1D());
}
this.localStorage.SaveMap(this.Terrain.map);
this.localStorage.SaveMap(this.Terrain.getHeights1D());
foreach (SimClient client in m_clientThreads.Values)
{
@@ -252,7 +252,7 @@ namespace OpenSim.world
public void LoadWorldMap()
{
float[,] map = this.localStorage.LoadWorld();
float[] map = this.localStorage.LoadWorld();
if (map == null)
{
this.Terrain.hills();
@@ -260,7 +260,7 @@ namespace OpenSim.world
}
else
{
this.Terrain.map = map;
this.Terrain.setHeights1D(map);
}
}