From bfcba0a417f876a09eae7612f08919304f7513e3 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Fri, 2 Mar 2012 22:20:02 +0100
Subject: This still causes terrain artefacts
Revert " fix my bug on ChODE terrain heightmap build"
This reverts commit aa77d1d486f11da7dc841190f1ca85e085d0d648.
---
OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs
index ccdd32e..7a1e671 100644
--- a/OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs
@@ -3457,8 +3457,8 @@ namespace OpenSim.Region.Physics.OdePlugin
int heightmapWidth = regionsize + 2; // ODE map size 257 x 257 (Meters) (1 extra
int heightmapHeight = regionsize + 2;
- int heightmapWidthSamples = (int)regionsize + 3; // Sample file size, 258 x 258 samples
- int heightmapHeightSamples = (int)regionsize + 3;
+ int heightmapWidthSamples = (int)regionsize + 2; // Sample file size, 258 x 258 samples
+ int heightmapHeightSamples = (int)regionsize + 2;
// Array of height samples for ODE
float[] _heightmap;
@@ -3495,7 +3495,7 @@ namespace OpenSim.Region.Physics.OdePlugin
// Output x = 0 1 2 3 ..... 255 256 257 258 total out
float val= heightMap[(yy * regionsize) + xx]; // input from heightMap, <0-255 * 256> <0-255>
if (val < minele) val = minele;
- _heightmap[x * (heightmapWidthSamples) + y] = val; // samples output to _heightmap, <0-257 * 258> <0-257>
+ _heightmap[x * (regionsize + 2) + y] = val; // samples output to _heightmap, <0-257 * 258> <0-257>
hfmin = (val < hfmin) ? val : hfmin;
hfmax = (val > hfmax) ? val : hfmax;
}
--
cgit v1.1