diff options
| author | Melanie | 2012-02-21 21:34:02 +0100 |
|---|---|---|
| committer | Melanie | 2012-02-21 21:34:02 +0100 |
| commit | cb4509f3b8c88c1cfa1a46328661d58abe714db6 (patch) | |
| tree | 11f3e2e938ab16c337956144936c9478d1c07e31 /OpenSim | |
| parent | Merge branch 'master' into careminster (diff) | |
| download | opensim-SC-cb4509f3b8c88c1cfa1a46328661d58abe714db6.zip opensim-SC-cb4509f3b8c88c1cfa1a46328661d58abe714db6.tar.gz opensim-SC-cb4509f3b8c88c1cfa1a46328661d58abe714db6.tar.bz2 opensim-SC-cb4509f3b8c88c1cfa1a46328661d58abe714db6.tar.xz | |
Reverse the changed to ODE heightmap. It results in SERIOUS issues like an
irreversible y-flip and holes in the map.
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs index b5b30ee..03059f7 100644 --- a/OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs +++ b/OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs | |||
| @@ -3440,15 +3440,15 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 3440 | 3440 | ||
| 3441 | int regionsize = (int) Constants.RegionSize; // visible region size eg. 256(M) | 3441 | int regionsize = (int) Constants.RegionSize; // visible region size eg. 256(M) |
| 3442 | 3442 | ||
| 3443 | int heightmapWidth = regionsize + 2; // ODE map size 258 x 258 (Meters) (1 extra each side) | 3443 | int heightmapWidth = regionsize + 2; // ODE map size 257 x 257 (Meters) (1 extra |
| 3444 | int heightmapHeight = regionsize + 2; | 3444 | int heightmapHeight = regionsize + 2; |
| 3445 | 3445 | ||
| 3446 | int heightmapWidthSamples = (int)regionsize + 3; // to have 258m we need 259 samples | 3446 | int heightmapWidthSamples = (int)regionsize + 2; // Sample file size, 258 x 258 samples |
| 3447 | int heightmapHeightSamples = (int)regionsize + 3; | 3447 | int heightmapHeightSamples = (int)regionsize + 2; |
| 3448 | 3448 | ||
| 3449 | // Array of height samples for ODE | 3449 | // Array of height samples for ODE |
| 3450 | float[] _heightmap; | 3450 | float[] _heightmap; |
| 3451 | _heightmap = new float[(heightmapWidthSamples * heightmapHeightSamples)]; // loaded samples 259 x 259 | 3451 | _heightmap = new float[(heightmapWidthSamples * heightmapHeightSamples)]; // loaded samples 258 x 258 |
| 3452 | 3452 | ||
| 3453 | // Other ODE parameters | 3453 | // Other ODE parameters |
| 3454 | const float scale = 1.0f; | 3454 | const float scale = 1.0f; |