OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'ubitwork'

avinationmerge
Melanie 2012-02-23 13:10:02 +01:00
parent 56cc573d2f e827bcaf2b
commit f266c54f82
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs
View File

@ -3443,8 +3443,8 @@ namespace OpenSim.Region.Physics.OdePlugin
int heightmapWidth = regionsize + 2; // ODE map size 257 x 257 (Meters) (1 extra int heightmapWidth = regionsize + 2; // ODE map size 257 x 257 (Meters) (1 extra
int heightmapHeight = regionsize + 2; int heightmapHeight = regionsize + 2;
int heightmapWidthSamples = (int)regionsize + 2; // Sample file size, 258 x 258 samples int heightmapWidthSamples = (int)regionsize + 3; // Sample file size, 258 x 258 samples
int heightmapHeightSamples = (int)regionsize + 2; int heightmapHeightSamples = (int)regionsize + 3;
// Array of height samples for ODE // Array of height samples for ODE
float[] _heightmap; float[] _heightmap;
@ -3481,7 +3481,7 @@ namespace OpenSim.Region.Physics.OdePlugin
// Output x = 0 1 2 3 ..... 255 256 257 258 total out // 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> float val= heightMap[(yy * regionsize) + xx]; // input from heightMap, <0-255 * 256> <0-255>
if (val < minele) val = minele; if (val < minele) val = minele;
_heightmap[x * (regionsize + 2) + y] = val; // samples output to _heightmap, <0-257 * 258> <0-257> _heightmap[x * (heightmapHeightSamples) + y] = val; // samples output to _heightmap, <0-257 * 258> <0-257>
hfmin = (val < hfmin) ? val : hfmin; hfmin = (val < hfmin) ? val : hfmin;
hfmax = (val > hfmax) ? val : hfmax; hfmax = (val > hfmax) ? val : hfmax;
} }
@ -3531,6 +3531,8 @@ namespace OpenSim.Region.Physics.OdePlugin
d.RFromAxisAndAngle(out R, v3.X, v3.Y, v3.Z, angle); d.RFromAxisAndAngle(out R, v3.X, v3.Y, v3.Z, angle);
d.GeomSetRotation(GroundGeom, ref R); d.GeomSetRotation(GroundGeom, ref R);
d.GeomSetPosition(GroundGeom, (pOffset.X + (regionsize * 0.5f)) - 0.5f, (pOffset.Y + (regionsize * 0.5f)) - 0.5f, 0); d.GeomSetPosition(GroundGeom, (pOffset.X + (regionsize * 0.5f)) - 0.5f, (pOffset.Y + (regionsize * 0.5f)) - 0.5f, 0);
// having nsamples = size + 1 center is actually at size/2
d.GeomSetPosition(GroundGeom, (pOffset.X + (regionsize * 0.5f)), (pOffset.Y + (regionsize * 0.5f)), 0);
IntPtr testGround = IntPtr.Zero; IntPtr testGround = IntPtr.Zero;
if (RegionTerrain.TryGetValue(pOffset, out testGround)) if (RegionTerrain.TryGetValue(pOffset, out testGround))
{ {