ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-11 20:05:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

First commit where physics work as region module.

Browse Source 
Moved all physics dlls out of Physics and into bin directly, so they can be found by the module loader.
Removed call to PhysicsPluginManager.
This commit is contained in:
Diva Canto
2015-08-31 14:09:15 -07:00
parent 134d4300f0
commit 11194209df
17 changed files with 91 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenSim/Tests/Common/Helpers/SceneHelpers.cs
View File

@@ -151,12 +151,9 @@ namespace OpenSim.Tests.Common
PhysicsPluginManager physicsPluginManager = new PhysicsPluginManager();
physicsPluginManager.LoadPluginsFromAssembly("Physics/OpenSim.Region.PhysicsModule.BasicPhysics.dll");
Vector3 regionExtent = new Vector3( regInfo.RegionSizeX, regInfo.RegionSizeY, regInfo.RegionSizeZ);
PhysicsScene physicsScene
= physicsPluginManager.GetPhysicsScene(
"basicphysics", "ZeroMesher", new IniConfigSource(), "test", regionExtent);
TestScene testScene = new TestScene(
regInfo, m_acm, physicsScene, SimDataService, m_estateDataService, configSource, null);
regInfo, m_acm, SimDataService, m_estateDataService, configSource, null);
INonSharedRegionModule godsModule = new GodsModule();
godsModule.Initialise(new IniConfigSource());

4
OpenSim/Tests/Common/Mock/TestScene.cs
View File

@@ -41,10 +41,10 @@ namespace OpenSim.Tests.Common
public class TestScene : Scene
{
public TestScene(
RegionInfo regInfo, AgentCircuitManager authen, PhysicsScene physicsScene,
RegionInfo regInfo, AgentCircuitManager authen,
ISimulationDataService simDataService, IEstateDataService estateDataService,
IConfigSource config, string simulatorVersion)
: base(regInfo, authen, physicsScene, simDataService, estateDataService,
: base(regInfo, authen, simDataService, estateDataService,
config, simulatorVersion)
{
}

2
OpenSim/Tests/Common/OpenSimTestCase.cs
View File

@@ -38,7 +38,7 @@ namespace OpenSim.Tests.Common
[SetUp]
public virtual void SetUp()
{
// TestHelpers.InMethod();
//TestHelpers.InMethod();
// Disable logging for each test so that one where logging is enabled doesn't cause all subsequent tests
// to have logging on if it failed with an exception.
TestHelpers.DisableLogging();