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

should help with ODE bounce on region cross

afrisby
dan miller 2007-10-29 06:15:06 +00:00
parent 2cf117cc6c
commit c29f8b3873
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -123,7 +123,7 @@ namespace OpenSim.Region.Physics.OdePlugin
d.WorldSetContactMaxCorrectingVel(world, 1000.0f); d.WorldSetContactMaxCorrectingVel(world, 1000.0f);
} }
_heightmap = new double[65536]; _heightmap = new double[258*258];
} }
// This function blatantly ripped off from BoxStack.cs // This function blatantly ripped off from BoxStack.cs
@ -392,14 +392,24 @@ namespace OpenSim.Region.Physics.OdePlugin
} }
public override void SetTerrain(float[] heightMap) public override void SetTerrain(float[] heightMap)
{
for (int i = 0; i < 65536; i++)
{ {
// this._heightmap[i] = (double)heightMap[i]; // this._heightmap[i] = (double)heightMap[i];
// dbm (danx0r) -- heightmap x,y must be swapped for Ode (should fix ODE, but for now...) // dbm (danx0r) -- heightmap x,y must be swapped for Ode (should fix ODE, but for now...)
int x = i & 0xff; // also, creating a buffer zone of one extra sample all around
int y = i >> 8; for (int x = 0; x < 258; x++)
_heightmap[i] = (double)heightMap[x * 256 + y]; {
for (int y = 0; y < 258; y++)
{
int xx = x-1;
if (xx < 0) xx = 0;
if (xx > 255) xx = 255;
int yy = y-1;
if (yy < 0) yy = 0;
if (yy > 255) yy = 255;
double val = (double)heightMap[yy * 256 + xx];
_heightmap[x * 258 + y] = val;
}
} }
lock (OdeLock) lock (OdeLock)
@ -409,7 +419,7 @@ namespace OpenSim.Region.Physics.OdePlugin
d.SpaceRemove(space, LandGeom); d.SpaceRemove(space, LandGeom);
} }
IntPtr HeightmapData = d.GeomHeightfieldDataCreate(); IntPtr HeightmapData = d.GeomHeightfieldDataCreate();
d.GeomHeightfieldDataBuildDouble(HeightmapData, _heightmap, 0, 256, 256, 256, 256, 1.0f, 0.0f, 2.0f, 1); d.GeomHeightfieldDataBuildDouble(HeightmapData, _heightmap, 0, 258, 258, 258, 258, 1.0f, 0.0f, 2.0f, 0);
d.GeomHeightfieldDataSetBounds(HeightmapData, 256, 256); d.GeomHeightfieldDataSetBounds(HeightmapData, 256, 256);
LandGeom = d.CreateHeightfield(space, HeightmapData, 1); LandGeom = d.CreateHeightfield(space, HeightmapData, 1);
this.geom_name_map[LandGeom]="Terrain"; this.geom_name_map[LandGeom]="Terrain";