From 9e183cbd3003b1e16cc1d543a44e0d23c7ad1f7b Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Wed, 23 Sep 2015 03:31:23 +0100 Subject: [PATCH] fix for future non square regions --- OpenSim/Region/PhysicsModules/Ode/OdeScene.cs | 4 ++-- OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/OpenSim/Region/PhysicsModules/Ode/OdeScene.cs b/OpenSim/Region/PhysicsModules/Ode/OdeScene.cs index 8fe3130ad8..144d762946 100644 --- a/OpenSim/Region/PhysicsModules/Ode/OdeScene.cs +++ b/OpenSim/Region/PhysicsModules/Ode/OdeScene.cs @@ -3939,8 +3939,8 @@ namespace OpenSim.Region.PhysicsModule.ODE } IntPtr HeightmapData = d.GeomHeightfieldDataCreate(); - d.GeomHeightfieldDataBuildSingle(HeightmapData, _heightmap, 0, heightmapWidth, heightmapHeight, - (int)heightmapWidthSamples, (int)heightmapHeightSamples, scale, + d.GeomHeightfieldDataBuildSingle(HeightmapData, _heightmap, 0, heightmapHeight, heightmapWidth, + (int)heightmapHeightSamples, (int)heightmapWidthSamples, scale, offset, thickness, wrap); d.GeomHeightfieldDataSetBounds(HeightmapData, hfmin - 1, hfmax + 1); diff --git a/OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs b/OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs index 41fec8913c..f51016c94a 100644 --- a/OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs +++ b/OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs @@ -2275,9 +2275,10 @@ namespace OpenSim.Region.PhysicsModule.ubOde GCHandle _heightmaphandler = GCHandle.Alloc(_heightmap, GCHandleType.Pinned); - d.GeomHeightfieldDataBuildSingle(HeightmapData, _heightmaphandler.AddrOfPinnedObject(), 0, heightmapWidth , heightmapHeight, - (int)heightmapWidthSamples, (int)heightmapHeightSamples, scale, - offset, thickness, wrap); + d.GeomHeightfieldDataBuildSingle(HeightmapData, _heightmaphandler.AddrOfPinnedObject(), 0, + heightmapHeight, heightmapWidth , + (int)heightmapHeightSamples, (int)heightmapWidthSamples, scale, + offset, thickness, wrap); d.GeomHeightfieldDataSetBounds(HeightmapData, hfmin - 1, hfmax + 1);