From cb4509f3b8c88c1cfa1a46328661d58abe714db6 Mon Sep 17 00:00:00 2001 From: Melanie Date: Tue, 21 Feb 2012 21:34:02 +0100 Subject: [PATCH] Reverse the changed to ODE heightmap. It results in SERIOUS issues like an irreversible y-flip and holes in the map. --- OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs index b5b30ee33d..03059f7e67 100644 --- a/OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs +++ b/OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs @@ -3440,15 +3440,15 @@ namespace OpenSim.Region.Physics.OdePlugin int regionsize = (int) Constants.RegionSize; // visible region size eg. 256(M) - int heightmapWidth = regionsize + 2; // ODE map size 258 x 258 (Meters) (1 extra each side) + int heightmapWidth = regionsize + 2; // ODE map size 257 x 257 (Meters) (1 extra int heightmapHeight = regionsize + 2; - int heightmapWidthSamples = (int)regionsize + 3; // to have 258m we need 259 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; - _heightmap = new float[(heightmapWidthSamples * heightmapHeightSamples)]; // loaded samples 259 x 259 + _heightmap = new float[(heightmapWidthSamples * heightmapHeightSamples)]; // loaded samples 258 x 258 // Other ODE parameters const float scale = 1.0f;