From c89d0e26b2c098cd2c5679fb73987a742a66ce38 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Wed, 31 Dec 2014 12:48:26 -0800
Subject: BulletSim: add the beginnings of hull creation unit testing. Change
 how physics engine is created in unit tests to resolve a lib reference
 problem. Add ShapeInfoInfo class to collect info about the created physical
 shape    for debugging and unit test testing.

---
 .../Physics/BulletSPlugin/Tests/BulletSimTestsUtil.cs | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

(limited to 'OpenSim/Region/Physics/BulletSPlugin/Tests/BulletSimTestsUtil.cs')

diff --git a/OpenSim/Region/Physics/BulletSPlugin/Tests/BulletSimTestsUtil.cs b/OpenSim/Region/Physics/BulletSPlugin/Tests/BulletSimTestsUtil.cs
index 28207a4..775bca2 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/Tests/BulletSimTestsUtil.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/Tests/BulletSimTestsUtil.cs
@@ -28,15 +28,16 @@
 using System;
 using System.IO;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
 
 using Nini.Config;
 
 using OpenSim.Framework;
-using OpenSim.Region.Physics.BulletSPlugin;
+using OpenSim.Region.Physics.Manager;
 using OpenSim.Region.Physics.Meshing;
 
+using OpenMetaverse;
+
 namespace OpenSim.Region.Physics.BulletSPlugin.Tests
 {
 // Utility functions for building up and tearing down the sample physics environments
@@ -77,17 +78,21 @@ public static class BulletSimTestsUtil
             bulletSimConfig.Set("VehicleLoggingEnabled","True");
         }
 
-        BSPlugin bsPlugin = new BSPlugin();
+        PhysicsPluginManager physicsPluginManager;
+        physicsPluginManager = new PhysicsPluginManager();
+        physicsPluginManager.LoadPluginsFromAssemblies("Physics");
+
+        Vector3 regionExtent = new Vector3(Constants.RegionSize, Constants.RegionSize, Constants.RegionHeight);
+       
+        PhysicsScene pScene = physicsPluginManager.GetPhysicsScene(
+                        "BulletSim", "Meshmerizer", openSimINI, "BSTestRegion", regionExtent);
 
-        BSScene bsScene = (BSScene)bsPlugin.GetScene("BSTestRegion");
+        BSScene bsScene = pScene as BSScene;
 
         // Since the asset requestor is not initialized, any mesh or sculptie will be a cube.
         // In the future, add a fake asset fetcher to get meshes and sculpts.
         // bsScene.RequestAssetMethod = ???;
 
-        Meshing.Meshmerizer mesher = new Meshmerizer(openSimINI);
-        bsScene.Initialise(mesher, openSimINI);
-
         return bsScene;
     }
 
-- 
cgit v1.1