diff options
| author | UbitUmarov | 2015-09-04 15:47:21 +0100 |
|---|---|---|
| committer | UbitUmarov | 2015-09-04 15:47:21 +0100 |
| commit | ce1c5de793e95134a0844e69e175dd0da4e6ceee (patch) | |
| tree | f4693991aadd95eed147525e8a164f3eadd5b848 | |
| parent | remove a forgotten 1000.9 factor on physics fps (diff) | |
| download | opensim-SC-ce1c5de793e95134a0844e69e175dd0da4e6ceee.zip opensim-SC-ce1c5de793e95134a0844e69e175dd0da4e6ceee.tar.gz opensim-SC-ce1c5de793e95134a0844e69e175dd0da4e6ceee.tar.bz2 opensim-SC-ce1c5de793e95134a0844e69e175dd0da4e6ceee.tar.xz | |
bug fix on ode spaces and allow more of them on large regions
| -rw-r--r-- | OpenSim/Region/Physics/OdePlugin/OdeScene.cs | 12 | ||||
| -rw-r--r-- | OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs index 0e71e7f..243a323 100644 --- a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs +++ b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs | |||
| @@ -726,15 +726,15 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 726 | spaceGridMaxY = (int)(WorldExtents.Y * spacesPerMeterY); | 726 | spaceGridMaxY = (int)(WorldExtents.Y * spacesPerMeterY); |
| 727 | 727 | ||
| 728 | // ubit: limit number of spaces | 728 | // ubit: limit number of spaces |
| 729 | if (spaceGridMaxX > 40) | 729 | if (spaceGridMaxX > 100) |
| 730 | { | 730 | { |
| 731 | spaceGridMaxX = 40; | 731 | spaceGridMaxX = 100; |
| 732 | spacesPerMeterX = WorldExtents.X / spaceGridMaxX; | 732 | spacesPerMeterX = spaceGridMaxX / WorldExtents.X ; |
| 733 | } | 733 | } |
| 734 | if (spaceGridMaxY > 40) | 734 | if (spaceGridMaxY > 100) |
| 735 | { | 735 | { |
| 736 | spaceGridMaxY = 40; | 736 | spaceGridMaxY = 100; |
| 737 | spacesPerMeterY = WorldExtents.X / spaceGridMaxY; | 737 | spacesPerMeterY = spaceGridMaxY / WorldExtents.Y; |
| 738 | } | 738 | } |
| 739 | 739 | ||
| 740 | staticPrimspace = new IntPtr[spaceGridMaxX, spaceGridMaxY]; | 740 | staticPrimspace = new IntPtr[spaceGridMaxX, spaceGridMaxY]; |
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs index dd39c95..c688727 100644 --- a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs +++ b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs | |||
| @@ -552,16 +552,16 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 552 | spaceGridMaxX = (int)(WorldExtents.X * spacesPerMeterX); | 552 | spaceGridMaxX = (int)(WorldExtents.X * spacesPerMeterX); |
| 553 | spaceGridMaxY = (int)(WorldExtents.Y * spacesPerMeterY); | 553 | spaceGridMaxY = (int)(WorldExtents.Y * spacesPerMeterY); |
| 554 | 554 | ||
| 555 | if (spaceGridMaxX > 40) | 555 | if (spaceGridMaxX > 100) |
| 556 | { | 556 | { |
| 557 | spaceGridMaxX = 40; | 557 | spaceGridMaxX = 100; |
| 558 | spacesPerMeterX = WorldExtents.X / spaceGridMaxX; | 558 | spacesPerMeterX = spaceGridMaxX / WorldExtents.X ; |
| 559 | } | 559 | } |
| 560 | 560 | ||
| 561 | if (spaceGridMaxY > 40) | 561 | if (spaceGridMaxY > 100) |
| 562 | { | 562 | { |
| 563 | spaceGridMaxY = 40; | 563 | spaceGridMaxY = 100; |
| 564 | spacesPerMeterY = WorldExtents.Y / spaceGridMaxY; | 564 | spacesPerMeterY = spaceGridMaxY / WorldExtents.Y ; |
| 565 | } | 565 | } |
| 566 | 566 | ||
| 567 | staticPrimspace = new IntPtr[spaceGridMaxX, spaceGridMaxY]; | 567 | staticPrimspace = new IntPtr[spaceGridMaxX, spaceGridMaxY]; |