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/ClientStack/RegionApplicationBase.cs | |
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/ClientStack/RegionApplicationBase.cs')
-rw-r--r-- | OpenSim/Region/ClientStack/RegionApplicationBase.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs index 853b72d..1ce166e 100644 --- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs +++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs | |||
@@ -69,7 +69,7 @@ namespace OpenSim.Region.ClientStack | |||
69 | /// The name of the OpenSim scene this physics scene is serving. This will be used in log messages. | 69 | /// The name of the OpenSim scene this physics scene is serving. This will be used in log messages. |
70 | /// </param> | 70 | /// </param> |
71 | /// <returns></returns> | 71 | /// <returns></returns> |
72 | protected abstract PhysicsScene GetPhysicsScene(string osSceneIdentifier); | 72 | protected abstract PhysicsScene GetPhysicsScene(string osSceneIdentifier, Vector3 regionExtent); |
73 | 73 | ||
74 | protected abstract ClientStackManager CreateClientStackManager(); | 74 | protected abstract ClientStackManager CreateClientStackManager(); |
75 | protected abstract Scene CreateScene(RegionInfo regionInfo, ISimulationDataService simDataService, IEstateDataService estateDataService, AgentCircuitManager circuitManager); | 75 | protected abstract Scene CreateScene(RegionInfo regionInfo, ISimulationDataService simDataService, IEstateDataService estateDataService, AgentCircuitManager circuitManager); |
@@ -123,13 +123,13 @@ namespace OpenSim.Region.ClientStack | |||
123 | /// </param> | 123 | /// </param> |
124 | /// <returns></returns> | 124 | /// <returns></returns> |
125 | protected PhysicsScene GetPhysicsScene( | 125 | protected PhysicsScene GetPhysicsScene( |
126 | string engine, string meshEngine, IConfigSource config, string osSceneIdentifier) | 126 | string engine, string meshEngine, IConfigSource config, string osSceneIdentifier, Vector3 regionExtent) |
127 | { | 127 | { |
128 | PhysicsPluginManager physicsPluginManager; | 128 | PhysicsPluginManager physicsPluginManager; |
129 | physicsPluginManager = new PhysicsPluginManager(); | 129 | physicsPluginManager = new PhysicsPluginManager(); |
130 | physicsPluginManager.LoadPluginsFromAssemblies("Physics"); | 130 | physicsPluginManager.LoadPluginsFromAssemblies("Physics"); |
131 | 131 | ||
132 | return physicsPluginManager.GetPhysicsScene(engine, meshEngine, config, osSceneIdentifier); | 132 | return physicsPluginManager.GetPhysicsScene(engine, meshEngine, config, osSceneIdentifier, regionExtent); |
133 | } | 133 | } |
134 | } | 134 | } |
135 | } \ No newline at end of file | 135 | } \ No newline at end of file |