OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Fixed an assorted group of bugs with tiled terrain import.

afrisby
Adam Frisby 2007-08-01 22:45:05 +00:00
parent a2d71904f1
commit 04d40b71d4
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs
View File

@ -346,7 +346,7 @@ namespace OpenSim.Region.Terrain
break; break;
case "load": case "load":
args[2].Replace("%name%", simName); args[3].Replace("%name%", simName);
switch (args[1].ToLower()) switch (args[1].ToLower())
{ {
case "f32": case "f32":
@ -363,7 +363,7 @@ namespace OpenSim.Region.Terrain
case "img": case "img":
heightmap.LoadImage(args[2]); heightmap.LoadImage(args[2]);
return false; break;
default: default:
resultText = "Unknown image or data format"; resultText = "Unknown image or data format";
@ -385,7 +385,7 @@ namespace OpenSim.Region.Terrain
break; break;
case "save": case "save":
args[2].Replace("%name%", simName); args[3].Replace("%name%", simName);
switch (args[1].ToLower()) switch (args[1].ToLower())
{ {
case "f32": case "f32":
@ -603,7 +603,7 @@ namespace OpenSim.Region.Terrain
int sectionToLoadX = ((this.offsetX - lowerboundX) * this.w); int sectionToLoadX = ((this.offsetX - lowerboundX) * this.w);
int sectionToLoadY = ((this.offsetY - lowerboundY) * this.h); int sectionToLoadY = ((this.offsetY - lowerboundY) * this.h);
double[,] tempMap = new double[dimensionX, dimensionY]; double[,] tempMap = new double[dimensionY, dimensionX];
FileInfo file = new FileInfo(filename); FileInfo file = new FileInfo(filename);
FileStream s = file.Open(FileMode.Open, FileAccess.Read); FileStream s = file.Open(FileMode.Open, FileAccess.Read);
@ -614,7 +614,7 @@ namespace OpenSim.Region.Terrain
{ {
for (y = 0; y < dimensionY; y++) for (y = 0; y < dimensionY; y++)
{ {
tempMap[x,y] = (double)bs.ReadSingle(); tempMap[y,x] = (double)bs.ReadSingle();
} }
} }
@ -622,7 +622,7 @@ namespace OpenSim.Region.Terrain
{ {
for (y = 0; y < h; y++) for (y = 0; y < h; y++)
{ {
heightmap.Set(x, y, tempMap[x + sectionToLoadX, y + sectionToLoadY]); heightmap.Set(x, y, tempMap[x + sectionToLoadY, y + sectionToLoadX]);
} }
} }