diff options
Diffstat (limited to 'OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs')
-rw-r--r-- | OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs b/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs index 8ccfda5..d14edfd 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs | |||
@@ -32,6 +32,7 @@ using System.Reflection; | |||
32 | using Nini.Config; | 32 | using Nini.Config; |
33 | using log4net; | 33 | using log4net; |
34 | using OpenSim.Framework; | 34 | using OpenSim.Framework; |
35 | using OpenMetaverse; | ||
35 | 36 | ||
36 | namespace OpenSim.Region.Physics.Manager | 37 | namespace OpenSim.Region.Physics.Manager |
37 | { | 38 | { |
@@ -59,6 +60,14 @@ namespace OpenSim.Region.Physics.Manager | |||
59 | m_log.Info("[PHYSICS]: Added meshing engine: " + plugHard.GetName()); | 60 | m_log.Info("[PHYSICS]: Added meshing engine: " + plugHard.GetName()); |
60 | } | 61 | } |
61 | 62 | ||
63 | // Legacy method for simulators before extent was passed | ||
64 | public PhysicsScene GetPhysicsScene(string physEngineName, string meshEngineName, | ||
65 | IConfigSource config, string regionName) | ||
66 | { | ||
67 | Vector3 extent = new Vector3(Constants.RegionSize, Constants.RegionSize, Constants.RegionHeight); | ||
68 | return GetPhysicsScene(physEngineName, meshEngineName, config, regionName, extent); | ||
69 | } | ||
70 | |||
62 | /// <summary> | 71 | /// <summary> |
63 | /// Get a physics scene for the given physics engine and mesher. | 72 | /// Get a physics scene for the given physics engine and mesher. |
64 | /// </summary> | 73 | /// </summary> |
@@ -66,7 +75,8 @@ namespace OpenSim.Region.Physics.Manager | |||
66 | /// <param name="meshEngineName"></param> | 75 | /// <param name="meshEngineName"></param> |
67 | /// <param name="config"></param> | 76 | /// <param name="config"></param> |
68 | /// <returns></returns> | 77 | /// <returns></returns> |
69 | public PhysicsScene GetPhysicsScene(string physEngineName, string meshEngineName, IConfigSource config, string regionName) | 78 | public PhysicsScene GetPhysicsScene(string physEngineName, string meshEngineName, |
79 | IConfigSource config, string regionName, Vector3 regionExtent) | ||
70 | { | 80 | { |
71 | if (String.IsNullOrEmpty(physEngineName)) | 81 | if (String.IsNullOrEmpty(physEngineName)) |
72 | { | 82 | { |
@@ -94,7 +104,7 @@ namespace OpenSim.Region.Physics.Manager | |||
94 | { | 104 | { |
95 | m_log.Info("[PHYSICS]: creating " + physEngineName); | 105 | m_log.Info("[PHYSICS]: creating " + physEngineName); |
96 | PhysicsScene result = _PhysPlugins[physEngineName].GetScene(regionName); | 106 | PhysicsScene result = _PhysPlugins[physEngineName].GetScene(regionName); |
97 | result.Initialise(meshEngine, config); | 107 | result.Initialise(meshEngine, config, regionExtent); |
98 | return result; | 108 | return result; |
99 | } | 109 | } |
100 | else | 110 | else |