diff options
author | Diva Canto | 2015-08-31 14:09:15 -0700 |
---|---|---|
committer | Diva Canto | 2015-08-31 14:09:15 -0700 |
commit | 11194209df8a29f5103e6e34104eae7834f3280a (patch) | |
tree | 605cd55258ef11167a8bfa4c894e1e026e172919 /OpenSim/Region/ClientStack | |
parent | All physics plugins are now region modules. Compiles but doesn't run. (diff) | |
download | opensim-SC_OLD-11194209df8a29f5103e6e34104eae7834f3280a.zip opensim-SC_OLD-11194209df8a29f5103e6e34104eae7834f3280a.tar.gz opensim-SC_OLD-11194209df8a29f5103e6e34104eae7834f3280a.tar.bz2 opensim-SC_OLD-11194209df8a29f5103e6e34104eae7834f3280a.tar.xz |
First commit where physics work as region module.
Moved all physics dlls out of Physics and into bin directly, so they can be found by the module loader.
Removed call to PhysicsPluginManager.
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r-- | OpenSim/Region/ClientStack/RegionApplicationBase.cs | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs index 374e34d..343780b 100644 --- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs +++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs | |||
@@ -62,16 +62,6 @@ namespace OpenSim.Region.ClientStack | |||
62 | 62 | ||
63 | protected abstract void Initialize(); | 63 | protected abstract void Initialize(); |
64 | 64 | ||
65 | /// <summary> | ||
66 | /// Get a new physics scene. | ||
67 | /// </summary> | ||
68 | /// | ||
69 | /// <param name="osSceneIdentifier"> | ||
70 | /// The name of the OpenSim scene this physics scene is serving. This will be used in log messages. | ||
71 | /// </param> | ||
72 | /// <returns></returns> | ||
73 | protected abstract PhysicsScene GetPhysicsScene(string osSceneIdentifier, Vector3 regionExtent); | ||
74 | |||
75 | protected abstract ClientStackManager CreateClientStackManager(); | 65 | protected abstract ClientStackManager CreateClientStackManager(); |
76 | protected abstract Scene CreateScene(RegionInfo regionInfo, ISimulationDataService simDataService, IEstateDataService estateDataService, AgentCircuitManager circuitManager); | 66 | protected abstract Scene CreateScene(RegionInfo regionInfo, ISimulationDataService simDataService, IEstateDataService estateDataService, AgentCircuitManager circuitManager); |
77 | 67 | ||
@@ -113,24 +103,5 @@ namespace OpenSim.Region.ClientStack | |||
113 | base.StartupSpecific(); | 103 | base.StartupSpecific(); |
114 | } | 104 | } |
115 | 105 | ||
116 | /// <summary> | ||
117 | /// Get a new physics scene. | ||
118 | /// </summary> | ||
119 | /// <param name="engine">The name of the physics engine to use</param> | ||
120 | /// <param name="meshEngine">The name of the mesh engine to use</param> | ||
121 | /// <param name="config">The configuration data to pass to the physics and mesh engines</param> | ||
122 | /// <param name="osSceneIdentifier"> | ||
123 | /// The name of the OpenSim scene this physics scene is serving. This will be used in log messages. | ||
124 | /// </param> | ||
125 | /// <returns></returns> | ||
126 | protected PhysicsScene GetPhysicsScene( | ||
127 | string engine, string meshEngine, IConfigSource config, string osSceneIdentifier, Vector3 regionExtent) | ||
128 | { | ||
129 | PhysicsPluginManager physicsPluginManager; | ||
130 | physicsPluginManager = new PhysicsPluginManager(); | ||
131 | physicsPluginManager.LoadPluginsFromAssemblies("Physics"); | ||
132 | |||
133 | return physicsPluginManager.GetPhysicsScene(engine, meshEngine, config, osSceneIdentifier, regionExtent); | ||
134 | } | ||
135 | } | 106 | } |
136 | } \ No newline at end of file | 107 | } \ No newline at end of file |