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

* Fixes the function 'GetTerrainHeightAtXY'

remotes/origin/0.6.7-post-fixes
Teravus Ovares (Dan Olivares) 2009-09-04 00:03:54 -04:00
parent e39d0ef627
commit bb5857c4bb
1 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
View File

@ -1590,10 +1590,14 @@ namespace OpenSim.Region.Physics.OdePlugin
x = x - offsetX; x = x - offsetX;
y = y - offsetY; y = y - offsetY;
index = (int)((int)y * (int)Constants.RegionSize + (int)x); index = (int)((int)x * ((int)Constants.RegionSize + 2) + (int)y);
if (index < TerrainHeightFieldHeights[heightFieldGeom].Length) if (index < TerrainHeightFieldHeights[heightFieldGeom].Length)
return (float)TerrainHeightFieldHeights[heightFieldGeom][(int)y * (int)Constants.RegionSize + (int)x]; {
//m_log.DebugFormat("x{0} y{1} = {2}", x, y, (float)TerrainHeightFieldHeights[heightFieldGeom][index]);
return (float)TerrainHeightFieldHeights[heightFieldGeom][index];
}
else else
return 0f; return 0f;
} }
@ -3366,7 +3370,7 @@ namespace OpenSim.Region.Physics.OdePlugin
const float thickness = 0.2f; const float thickness = 0.2f;
const int wrap = 0; const int wrap = 0;
int regionsize = (int) Constants.RegionSize; int regionsize = (int) Constants.RegionSize + 2;
//Double resolution //Double resolution
//if (((int)Constants.RegionSize) == 256) //if (((int)Constants.RegionSize) == 256)
// heightMap = ResizeTerrain512Interpolation(heightMap); // heightMap = ResizeTerrain512Interpolation(heightMap);
@ -3377,19 +3381,25 @@ namespace OpenSim.Region.Physics.OdePlugin
float hfmin = 2000; float hfmin = 2000;
float hfmax = -2000; float hfmax = -2000;
for (int x = 0; x < heightmapWidthSamples; x++)
{ for (int x = 0; x < heightmapWidthSamples; x++)
for (int y = 0; y < heightmapHeightSamples; y++)
{ {
int xx = Util.Clip(x - 1, 0, regionsize - 1); for (int y = 0; y < heightmapHeightSamples; y++)
int yy = Util.Clip(y - 1, 0, regionsize - 1); {
int xx = Util.Clip(x - 1, 0, regionsize - 1);
float val = heightMap[yy * regionsize + xx]; int yy = Util.Clip(y - 1, 0, regionsize - 1);
_heightmap[x * heightmapHeightSamples + y] = val;
hfmin = (val < hfmin) ? val : hfmin;
hfmax = (val > hfmax) ? val : hfmax; float val= heightMap[yy * (int)Constants.RegionSize + xx];
_heightmap[x * ((int)Constants.RegionSize + 2) + y] = val;
hfmin = (val < hfmin) ? val : hfmin;
hfmax = (val > hfmax) ? val : hfmax;
}
} }
}
lock (OdeLock) lock (OdeLock)
{ {
@ -3409,8 +3419,8 @@ namespace OpenSim.Region.Physics.OdePlugin
} }
IntPtr HeightmapData = d.GeomHeightfieldDataCreate(); IntPtr HeightmapData = d.GeomHeightfieldDataCreate();
d.GeomHeightfieldDataBuildSingle(HeightmapData, _heightmap, 0, heightmapWidth, heightmapHeight, d.GeomHeightfieldDataBuildSingle(HeightmapData, _heightmap, 0, heightmapWidth + 1, heightmapHeight + 1,
(int)heightmapWidthSamples, (int)heightmapHeightSamples, scale, (int)heightmapWidthSamples + 1, (int)heightmapHeightSamples + 1, scale,
offset, thickness, wrap); offset, thickness, wrap);
d.GeomHeightfieldDataSetBounds(HeightmapData, hfmin - 1, hfmax + 1); d.GeomHeightfieldDataSetBounds(HeightmapData, hfmin - 1, hfmax + 1);
GroundGeom = d.CreateHeightfield(space, HeightmapData, 1); GroundGeom = d.CreateHeightfield(space, HeightmapData, 1);