aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2012-02-23 13:10:02 +0100
committerMelanie2012-02-23 13:10:02 +0100
commitf266c54f82e9ee156e8abddccdc567040db6f879 (patch)
tree18a58c29a7a7c76bce0b5d586dfb3947193df95a
parentShow avatars as sitting on proot prims only to avoid motion jitter (diff)
parentMerge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff)
downloadopensim-SC_OLD-f266c54f82e9ee156e8abddccdc567040db6f879.zip
opensim-SC_OLD-f266c54f82e9ee156e8abddccdc567040db6f879.tar.gz
opensim-SC_OLD-f266c54f82e9ee156e8abddccdc567040db6f879.tar.bz2
opensim-SC_OLD-f266c54f82e9ee156e8abddccdc567040db6f879.tar.xz
Merge branch 'ubitwork'
-rw-r--r--OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs8
1 files changed, 5 insertions, 3 deletions
diff --git a/OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs
index 03059f7..61fb2d0 100644
--- a/OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs
@@ -3443,8 +3443,8 @@ namespace OpenSim.Region.Physics.OdePlugin
3443 int heightmapWidth = regionsize + 2; // ODE map size 257 x 257 (Meters) (1 extra 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 + 2; // Sample file size, 258 x 258 samples 3446 int heightmapWidthSamples = (int)regionsize + 3; // Sample file size, 258 x 258 samples
3447 int heightmapHeightSamples = (int)regionsize + 2; 3447 int heightmapHeightSamples = (int)regionsize + 3;
3448 3448
3449 // Array of height samples for ODE 3449 // Array of height samples for ODE
3450 float[] _heightmap; 3450 float[] _heightmap;
@@ -3481,7 +3481,7 @@ namespace OpenSim.Region.Physics.OdePlugin
3481 // Output x = 0 1 2 3 ..... 255 256 257 258 total out 3481 // Output x = 0 1 2 3 ..... 255 256 257 258 total out
3482 float val= heightMap[(yy * regionsize) + xx]; // input from heightMap, <0-255 * 256> <0-255> 3482 float val= heightMap[(yy * regionsize) + xx]; // input from heightMap, <0-255 * 256> <0-255>
3483 if (val < minele) val = minele; 3483 if (val < minele) val = minele;
3484 _heightmap[x * (regionsize + 2) + y] = val; // samples output to _heightmap, <0-257 * 258> <0-257> 3484 _heightmap[x * (heightmapHeightSamples) + y] = val; // samples output to _heightmap, <0-257 * 258> <0-257>
3485 hfmin = (val < hfmin) ? val : hfmin; 3485 hfmin = (val < hfmin) ? val : hfmin;
3486 hfmax = (val > hfmax) ? val : hfmax; 3486 hfmax = (val > hfmax) ? val : hfmax;
3487 } 3487 }
@@ -3531,6 +3531,8 @@ namespace OpenSim.Region.Physics.OdePlugin
3531 d.RFromAxisAndAngle(out R, v3.X, v3.Y, v3.Z, angle); 3531 d.RFromAxisAndAngle(out R, v3.X, v3.Y, v3.Z, angle);
3532 d.GeomSetRotation(GroundGeom, ref R); 3532 d.GeomSetRotation(GroundGeom, ref R);
3533 d.GeomSetPosition(GroundGeom, (pOffset.X + (regionsize * 0.5f)) - 0.5f, (pOffset.Y + (regionsize * 0.5f)) - 0.5f, 0); 3533 d.GeomSetPosition(GroundGeom, (pOffset.X + (regionsize * 0.5f)) - 0.5f, (pOffset.Y + (regionsize * 0.5f)) - 0.5f, 0);
3534 // having nsamples = size + 1 center is actually at size/2
3535 d.GeomSetPosition(GroundGeom, (pOffset.X + (regionsize * 0.5f)), (pOffset.Y + (regionsize * 0.5f)), 0);
3534 IntPtr testGround = IntPtr.Zero; 3536 IntPtr testGround = IntPtr.Zero;
3535 if (RegionTerrain.TryGetValue(pOffset, out testGround)) 3537 if (RegionTerrain.TryGetValue(pOffset, out testGround))
3536 { 3538 {