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

* Fixed a slight issue with the LLRAW exporter. 

* Linden uses a neutral height channel of 128.0 on their multiplier. OpenSim was using a neutral of 127.0 - this has been changed to 128.0, this may cause files exported to the .RAW format to look slightly different when loaded back in - it is highly recommended to use the R32 format instead which avoids these sorts of issues.
* Made a tweak to the Terrain Plugin loading process.
0.6.0-stable
Adam Frisby 2008-05-28 23:52:24 +00:00
parent 1d38510bd2
commit 3c47fd2cb2
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/LLRAW.cs
View File

@ -61,7 +61,7 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders
{ {
for (int j = 0; j < 256; j++) for (int j = 0; j < 256; j++)
{ {
LookupHeightTable[i + (j * 256)] = new HeightmapLookupValue(i + (j * 256), ((double)i * ((double)j / 127.0d))); LookupHeightTable[i + (j * 256)] = new HeightmapLookupValue(i + (j * 256), ((double)i * ((double)j / 128.0d)));
} }
} }
Array.Sort<HeightmapLookupValue>(LookupHeightTable); Array.Sort<HeightmapLookupValue>(LookupHeightTable);
@ -82,7 +82,7 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders
int x; int x;
for (x = 0; x < retval.Width; x++) for (x = 0; x < retval.Width; x++)
{ {
retval[x, y] = bs.ReadByte() * (bs.ReadByte() / 127.0); retval[x, y] = bs.ReadByte() * (bs.ReadByte() / 128.0);
bs.ReadBytes(11); // Advance the stream to next bytes. bs.ReadBytes(11); // Advance the stream to next bytes.
} }
} }

3
OpenSim/Region/Environment/Modules/World/Terrain/TerrainModule.cs
View File

@ -279,7 +279,8 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain
} }
else else
{ {
m_log.Warn("E ... " + pluginName + " (Skipping)"); m_plugineffects[pluginName] = effect;
m_log.Warn("E ... " + pluginName + " (Replaced)");
} }
} }
} }