diff options
author | Adam Frisby | 2008-05-28 23:52:24 +0000 |
---|---|---|
committer | Adam Frisby | 2008-05-28 23:52:24 +0000 |
commit | 3c47fd2cb228c47997ce8a0bc7f40d1e23047b36 (patch) | |
tree | 4de03ef1a452c7b7fc8d9e55fbb17b937454b5cb /OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders | |
parent | *Added a Few External Checks relating to scripts including the seperation of ... (diff) | |
download | opensim-SC_OLD-3c47fd2cb228c47997ce8a0bc7f40d1e23047b36.zip opensim-SC_OLD-3c47fd2cb228c47997ce8a0bc7f40d1e23047b36.tar.gz opensim-SC_OLD-3c47fd2cb228c47997ce8a0bc7f40d1e23047b36.tar.bz2 opensim-SC_OLD-3c47fd2cb228c47997ce8a0bc7f40d1e23047b36.tar.xz |
* 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.
Diffstat (limited to 'OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders')
-rw-r--r-- | OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/LLRAW.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/LLRAW.cs b/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/LLRAW.cs index 2e8fa9e..85afaf8 100644 --- a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/LLRAW.cs +++ b/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/LLRAW.cs | |||
@@ -61,7 +61,7 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders | |||
61 | { | 61 | { |
62 | for (int j = 0; j < 256; j++) | 62 | for (int j = 0; j < 256; j++) |
63 | { | 63 | { |
64 | LookupHeightTable[i + (j * 256)] = new HeightmapLookupValue(i + (j * 256), ((double)i * ((double)j / 127.0d))); | 64 | LookupHeightTable[i + (j * 256)] = new HeightmapLookupValue(i + (j * 256), ((double)i * ((double)j / 128.0d))); |
65 | } | 65 | } |
66 | } | 66 | } |
67 | Array.Sort<HeightmapLookupValue>(LookupHeightTable); | 67 | Array.Sort<HeightmapLookupValue>(LookupHeightTable); |
@@ -82,7 +82,7 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders | |||
82 | int x; | 82 | int x; |
83 | for (x = 0; x < retval.Width; x++) | 83 | for (x = 0; x < retval.Width; x++) |
84 | { | 84 | { |
85 | retval[x, y] = bs.ReadByte() * (bs.ReadByte() / 127.0); | 85 | retval[x, y] = bs.ReadByte() * (bs.ReadByte() / 128.0); |
86 | bs.ReadBytes(11); // Advance the stream to next bytes. | 86 | bs.ReadBytes(11); // Advance the stream to next bytes. |
87 | } | 87 | } |
88 | } | 88 | } |