diff options
author | Robert Adams | 2013-11-04 22:10:54 -0800 |
---|---|---|
committer | Robert Adams | 2013-11-04 22:10:54 -0800 |
commit | f2810bf03a3e254e0ef8d9bdd639c69cc5cf570c (patch) | |
tree | 15637fe54b419ea5639a08717b1c9978714b49fe /OpenSim/Region/Application | |
parent | varregion: remove uses of region size constant. In particular, update scene (diff) | |
download | opensim-SC_OLD-f2810bf03a3e254e0ef8d9bdd639c69cc5cf570c.zip opensim-SC_OLD-f2810bf03a3e254e0ef8d9bdd639c69cc5cf570c.tar.gz opensim-SC_OLD-f2810bf03a3e254e0ef8d9bdd639c69cc5cf570c.tar.bz2 opensim-SC_OLD-f2810bf03a3e254e0ef8d9bdd639c69cc5cf570c.tar.xz |
varregion: add plumbing to pass region size from Scene down to the
physics engine.
Older physics engines will default to the legacy region size.
Update BulletSim to use the new region size information.
Diffstat (limited to 'OpenSim/Region/Application')
-rw-r--r-- | OpenSim/Region/Application/OpenSimBase.cs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index 1e34a1e..70d7ee9 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs | |||
@@ -690,7 +690,8 @@ namespace OpenSim | |||
690 | clientServer = clientNetworkServers; | 690 | clientServer = clientNetworkServers; |
691 | scene.LoadWorldMap(); | 691 | scene.LoadWorldMap(); |
692 | 692 | ||
693 | scene.PhysicsScene = GetPhysicsScene(scene.RegionInfo.RegionName); | 693 | Vector3 regionExtent = new Vector3(regionInfo.RegionSizeX, regionInfo.RegionSizeY, regionInfo.RegionSizeZ); |
694 | scene.PhysicsScene = GetPhysicsScene(scene.RegionInfo.RegionName, regionExtent); | ||
694 | scene.PhysicsScene.RequestAssetMethod = scene.PhysicsRequestAsset; | 695 | scene.PhysicsScene.RequestAssetMethod = scene.PhysicsRequestAsset; |
695 | scene.PhysicsScene.SetTerrain(scene.Heightmap.GetFloatsSerialised()); | 696 | scene.PhysicsScene.SetTerrain(scene.Heightmap.GetFloatsSerialised()); |
696 | scene.PhysicsScene.SetWaterLevel((float) regionInfo.RegionSettings.WaterHeight); | 697 | scene.PhysicsScene.SetWaterLevel((float) regionInfo.RegionSettings.WaterHeight); |
@@ -752,10 +753,10 @@ namespace OpenSim | |||
752 | 753 | ||
753 | # region Setup methods | 754 | # region Setup methods |
754 | 755 | ||
755 | protected override PhysicsScene GetPhysicsScene(string osSceneIdentifier) | 756 | protected override PhysicsScene GetPhysicsScene(string osSceneIdentifier, Vector3 regionExtent) |
756 | { | 757 | { |
757 | return GetPhysicsScene( | 758 | return GetPhysicsScene( |
758 | m_configSettings.PhysicsEngine, m_configSettings.MeshEngineName, Config, osSceneIdentifier); | 759 | m_configSettings.PhysicsEngine, m_configSettings.MeshEngineName, Config, osSceneIdentifier, regionExtent); |
759 | } | 760 | } |
760 | 761 | ||
761 | /// <summary> | 762 | /// <summary> |