diff options
| author | UbitUmarov | 2015-09-23 03:31:23 +0100 |
|---|---|---|
| committer | UbitUmarov | 2015-09-23 03:31:23 +0100 |
| commit | 9e183cbd3003b1e16cc1d543a44e0d23c7ad1f7b (patch) | |
| tree | bf1b24af199f03b5e4496164a72983b42964efe4 | |
| parent | same for old Ode (diff) | |
| download | opensim-SC-9e183cbd3003b1e16cc1d543a44e0d23c7ad1f7b.zip opensim-SC-9e183cbd3003b1e16cc1d543a44e0d23c7ad1f7b.tar.gz opensim-SC-9e183cbd3003b1e16cc1d543a44e0d23c7ad1f7b.tar.bz2 opensim-SC-9e183cbd3003b1e16cc1d543a44e0d23c7ad1f7b.tar.xz | |
fix for future non square regions
| -rw-r--r-- | OpenSim/Region/PhysicsModules/Ode/OdeScene.cs | 4 | ||||
| -rw-r--r-- | 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 8fe3130..144d762 100644 --- a/OpenSim/Region/PhysicsModules/Ode/OdeScene.cs +++ b/OpenSim/Region/PhysicsModules/Ode/OdeScene.cs | |||
| @@ -3939,8 +3939,8 @@ namespace OpenSim.Region.PhysicsModule.ODE | |||
| 3939 | 3939 | ||
| 3940 | } | 3940 | } |
| 3941 | IntPtr HeightmapData = d.GeomHeightfieldDataCreate(); | 3941 | IntPtr HeightmapData = d.GeomHeightfieldDataCreate(); |
| 3942 | d.GeomHeightfieldDataBuildSingle(HeightmapData, _heightmap, 0, heightmapWidth, heightmapHeight, | 3942 | d.GeomHeightfieldDataBuildSingle(HeightmapData, _heightmap, 0, heightmapHeight, heightmapWidth, |
| 3943 | (int)heightmapWidthSamples, (int)heightmapHeightSamples, scale, | 3943 | (int)heightmapHeightSamples, (int)heightmapWidthSamples, scale, |
| 3944 | offset, thickness, wrap); | 3944 | offset, thickness, wrap); |
| 3945 | 3945 | ||
| 3946 | d.GeomHeightfieldDataSetBounds(HeightmapData, hfmin - 1, hfmax + 1); | 3946 | d.GeomHeightfieldDataSetBounds(HeightmapData, hfmin - 1, hfmax + 1); |
diff --git a/OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs b/OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs index 41fec89..f51016c 100644 --- a/OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs +++ b/OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs | |||
| @@ -2275,9 +2275,10 @@ namespace OpenSim.Region.PhysicsModule.ubOde | |||
| 2275 | 2275 | ||
| 2276 | GCHandle _heightmaphandler = GCHandle.Alloc(_heightmap, GCHandleType.Pinned); | 2276 | GCHandle _heightmaphandler = GCHandle.Alloc(_heightmap, GCHandleType.Pinned); |
| 2277 | 2277 | ||
| 2278 | d.GeomHeightfieldDataBuildSingle(HeightmapData, _heightmaphandler.AddrOfPinnedObject(), 0, heightmapWidth , heightmapHeight, | 2278 | d.GeomHeightfieldDataBuildSingle(HeightmapData, _heightmaphandler.AddrOfPinnedObject(), 0, |
| 2279 | (int)heightmapWidthSamples, (int)heightmapHeightSamples, scale, | 2279 | heightmapHeight, heightmapWidth , |
| 2280 | offset, thickness, wrap); | 2280 | (int)heightmapHeightSamples, (int)heightmapWidthSamples, scale, |
| 2281 | offset, thickness, wrap); | ||
| 2281 | 2282 | ||
| 2282 | d.GeomHeightfieldDataSetBounds(HeightmapData, hfmin - 1, hfmax + 1); | 2283 | d.GeomHeightfieldDataSetBounds(HeightmapData, hfmin - 1, hfmax + 1); |
| 2283 | 2284 | ||