diff options
author | Robert Adams | 2014-01-29 06:44:14 -0800 |
---|---|---|
committer | Robert Adams | 2014-01-29 06:44:14 -0800 |
commit | 0842e2e15b6af6f940648b0b74488f2da88ce920 (patch) | |
tree | e836bebbc79f4a05d13bb370bf7ad3db28eb9aa5 /OpenSim/Region/Physics/BulletSPlugin/BSScene.cs | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-0842e2e15b6af6f940648b0b74488f2da88ce920.zip opensim-SC_OLD-0842e2e15b6af6f940648b0b74488f2da88ce920.tar.gz opensim-SC_OLD-0842e2e15b6af6f940648b0b74488f2da88ce920.tar.bz2 opensim-SC_OLD-0842e2e15b6af6f940648b0b74488f2da88ce920.tar.xz |
BulletSim: default physical terrain implementation to heightmap.
It originally looked like mesh terrain would perform better for vehicles
but, after much use, heightmap is the clear winner.
Force terrain implementation to heightmap if the physics region is
larger than legacy region size. This solves running out of memory for
very large regions.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BSScene.cs | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs index fe014fc..2d2e55f 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs | |||
@@ -235,6 +235,14 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters | |||
235 | // Set default values for physics parameters plus any overrides from the ini file | 235 | // Set default values for physics parameters plus any overrides from the ini file |
236 | GetInitialParameterValues(config); | 236 | GetInitialParameterValues(config); |
237 | 237 | ||
238 | // Force some parameters to values depending on other configurations | ||
239 | // Only use heightmap terrain implementation if terrain larger than legacy size | ||
240 | if ((uint)regionExtent.X > Constants.RegionSize || (uint)regionExtent.Y > Constants.RegionSize) | ||
241 | { | ||
242 | m_log.WarnFormat("{0} Forcing terrain implementation to heightmap for large region", LogHeader); | ||
243 | BSParam.TerrainImplementation = (float)BSTerrainPhys.TerrainImplementation.Heightmap; | ||
244 | } | ||
245 | |||
238 | // Get the connection to the physics engine (could be native or one of many DLLs) | 246 | // Get the connection to the physics engine (could be native or one of many DLLs) |
239 | PE = SelectUnderlyingBulletEngine(BulletEngineName); | 247 | PE = SelectUnderlyingBulletEngine(BulletEngineName); |
240 | 248 | ||