aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/Manager
diff options
context:
space:
mode:
authorTeravus Ovares2008-05-14 23:15:25 +0000
committerTeravus Ovares2008-05-14 23:15:25 +0000
commit2a988f187ec4c743d6b269fc3a8fe32d84716f65 (patch)
tree728d7e4ef601ed0630b0a7f156c63512966603c0 /OpenSim/Region/Physics/Manager
parent* Start recording as a statistic the number of times we start blocking repeti... (diff)
downloadopensim-SC_OLD-2a988f187ec4c743d6b269fc3a8fe32d84716f65.zip
opensim-SC_OLD-2a988f187ec4c743d6b269fc3a8fe32d84716f65.tar.gz
opensim-SC_OLD-2a988f187ec4c743d6b269fc3a8fe32d84716f65.tar.bz2
opensim-SC_OLD-2a988f187ec4c743d6b269fc3a8fe32d84716f65.tar.xz
* Refactored IConfigSource into Physics plug-ins and Scene. We can get rid of some of the parameters we pass to it's constructor now like, 'm_allowPhysicalPrim', 'seeIntoOtherRegions', etc.. so on
* The main purpose of this is to provide configuration options for ODE and other physics plug-ins that are advanced enough to be able to be configured.
Diffstat (limited to 'OpenSim/Region/Physics/Manager')
-rw-r--r--OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs5
-rw-r--r--OpenSim/Region/Physics/Manager/PhysicsScene.cs5
2 files changed, 6 insertions, 4 deletions
diff --git a/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs b/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs
index e4ff725..b8ca180 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs
@@ -29,6 +29,7 @@ using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.IO; 30using System.IO;
31using System.Reflection; 31using System.Reflection;
32using Nini.Config;
32using log4net; 33using log4net;
33 34
34namespace OpenSim.Region.Physics.Manager 35namespace OpenSim.Region.Physics.Manager
@@ -47,7 +48,7 @@ namespace OpenSim.Region.Physics.Manager
47 { 48 {
48 } 49 }
49 50
50 public PhysicsScene GetPhysicsScene(string physEngineName, string meshEngineName) 51 public PhysicsScene GetPhysicsScene(string physEngineName, string meshEngineName, IConfigSource config)
51 { 52 {
52 if (String.IsNullOrEmpty(physEngineName)) 53 if (String.IsNullOrEmpty(physEngineName))
53 { 54 {
@@ -75,7 +76,7 @@ namespace OpenSim.Region.Physics.Manager
75 { 76 {
76 m_log.Info("[PHYSICS]: creating " + physEngineName); 77 m_log.Info("[PHYSICS]: creating " + physEngineName);
77 PhysicsScene result = _PhysPlugins[physEngineName].GetScene(); 78 PhysicsScene result = _PhysPlugins[physEngineName].GetScene();
78 result.Initialise(meshEngine); 79 result.Initialise(meshEngine, config);
79 return result; 80 return result;
80 } 81 }
81 else 82 else
diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
index 4c509b7..de93f22 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
@@ -28,6 +28,7 @@
28using System.Reflection; 28using System.Reflection;
29using Axiom.Math; 29using Axiom.Math;
30using log4net; 30using log4net;
31using Nini.Config;
31using OpenSim.Framework; 32using OpenSim.Framework;
32 33
33namespace OpenSim.Region.Physics.Manager 34namespace OpenSim.Region.Physics.Manager
@@ -58,7 +59,7 @@ namespace OpenSim.Region.Physics.Manager
58 } 59 }
59 60
60 61
61 public abstract void Initialise(IMesher meshmerizer); 62 public abstract void Initialise(IMesher meshmerizer, IConfigSource config);
62 63
63 public abstract PhysicsActor AddAvatar(string avName, PhysicsVector position, PhysicsVector size); 64 public abstract PhysicsActor AddAvatar(string avName, PhysicsVector position, PhysicsVector size);
64 65
@@ -92,7 +93,7 @@ namespace OpenSim.Region.Physics.Manager
92 private static int m_workIndicator; 93 private static int m_workIndicator;
93 94
94 95
95 public override void Initialise(IMesher meshmerizer) 96 public override void Initialise(IMesher meshmerizer, IConfigSource config)
96 { 97 {
97 // Does nothing right now 98 // Does nothing right now
98 } 99 }