aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/PhysicsModules/ubOde/ODEApi.cs (renamed from OpenSim/Region/PhysicsModules/UbitOde/OdeApi.cs)41
-rw-r--r--OpenSim/Region/PhysicsModules/ubOde/ODECharacter.cs (renamed from OpenSim/Region/PhysicsModules/UbitOde/ODECharacter.cs)2
-rw-r--r--OpenSim/Region/PhysicsModules/ubOde/ODEDynamics.cs (renamed from OpenSim/Region/PhysicsModules/UbitOde/ODEDynamics.cs)4
-rw-r--r--OpenSim/Region/PhysicsModules/ubOde/ODEMeshWorker.cs (renamed from OpenSim/Region/PhysicsModules/UbitOde/ODEMeshWorker.cs)2
-rw-r--r--OpenSim/Region/PhysicsModules/ubOde/ODEModule.cs (renamed from OpenSim/Region/PhysicsModules/UbitOde/ODEModule.cs)20
-rw-r--r--OpenSim/Region/PhysicsModules/ubOde/ODEPrim.cs (renamed from OpenSim/Region/PhysicsModules/UbitOde/ODEPrim.cs)7
-rw-r--r--OpenSim/Region/PhysicsModules/ubOde/ODERayCastRequestManager.cs (renamed from OpenSim/Region/PhysicsModules/UbitOde/ODERayCastRequestManager.cs)2
-rw-r--r--OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs (renamed from OpenSim/Region/PhysicsModules/UbitOde/OdeScene.cs)49
-rw-r--r--OpenSim/Region/PhysicsModules/ubOde/ODESitAvatar.cs (renamed from OpenSim/Region/PhysicsModules/UbitOde/ODESitAvatar.cs)4
-rw-r--r--OpenSim/Region/PhysicsModules/ubOde/Properties/AssemblyInfo.cs (renamed from OpenSim/Region/PhysicsModules/UbitOde/Properties/AssemblyInfo.cs)0
-rw-r--r--OpenSim/Region/PhysicsModules/ubOdeMeshing/HelperTypes.cs (renamed from OpenSim/Region/PhysicsModules/UbitMeshing/HelperTypes.cs)2
-rw-r--r--OpenSim/Region/PhysicsModules/ubOdeMeshing/Mesh.cs (renamed from OpenSim/Region/PhysicsModules/UbitMeshing/Mesh.cs)2
-rw-r--r--OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs (renamed from OpenSim/Region/PhysicsModules/UbitMeshing/Meshmerizer.cs)6
-rw-r--r--OpenSim/Region/PhysicsModules/ubOdeMeshing/PrimMesher.cs (renamed from OpenSim/Region/PhysicsModules/UbitMeshing/PrimMesher.cs)0
-rw-r--r--OpenSim/Region/PhysicsModules/ubOdeMeshing/Properties/AssemblyInfo.cs (renamed from OpenSim/Region/PhysicsModules/UbitMeshing/Properties/AssemblyInfo.cs)0
-rw-r--r--OpenSim/Region/PhysicsModules/ubOdeMeshing/SculptMap.cs (renamed from OpenSim/Region/PhysicsModules/UbitMeshing/SculptMap.cs)0
-rw-r--r--OpenSim/Region/PhysicsModules/ubOdeMeshing/SculptMesh.cs (renamed from OpenSim/Region/PhysicsModules/UbitMeshing/SculptMesh.cs)0
17 files changed, 71 insertions, 70 deletions
diff --git a/OpenSim/Region/PhysicsModules/UbitOde/OdeApi.cs b/OpenSim/Region/PhysicsModules/ubOde/ODEApi.cs
index 10d7d50..2ebd964 100644
--- a/OpenSim/Region/PhysicsModules/UbitOde/OdeApi.cs
+++ b/OpenSim/Region/PhysicsModules/ubOde/ODEApi.cs
@@ -37,8 +37,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
37 * 37 *
38 * changes by opensim team; 38 * changes by opensim team;
39 * changes by Aurora team http://www.aurora-sim.org/ 39 * changes by Aurora team http://www.aurora-sim.org/
40 40 * changes by Ubit Umarov
41 * Revision/fixs by Ubit Umarov
42 */ 41 */
43 42
44using System; 43using System;
@@ -115,7 +114,7 @@ namespace OdeAPI
115 HashSpaceClass, 114 HashSpaceClass,
116 QuadTreeSpaceClass, 115 QuadTreeSpaceClass,
117 LastSpaceClass = QuadTreeSpaceClass, 116 LastSpaceClass = QuadTreeSpaceClass,
118 UbitTerrainClass, 117 ubtTerrainClass,
119 FirstUserClass, 118 FirstUserClass,
120 LastUserClass = FirstUserClass + MaxUserClasses - 1, 119 LastUserClass = FirstUserClass + MaxUserClasses - 1,
121 NumClasses, 120 NumClasses,
@@ -208,7 +207,7 @@ namespace OdeAPI
208 public delegate dReal HeightfieldGetHeight(IntPtr p_user_data, int x, int z); 207 public delegate dReal HeightfieldGetHeight(IntPtr p_user_data, int x, int z);
209 208
210 [UnmanagedFunctionPointer(CallingConvention.Cdecl)] 209 [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
211 public delegate dReal UbitTerrainGetHeight(IntPtr p_user_data, int x, int z); 210 public delegate dReal ubTerrainGetHeight(IntPtr p_user_data, int x, int z);
212 211
213 [UnmanagedFunctionPointer(CallingConvention.Cdecl)] 212 [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
214 public delegate void NearCallback(IntPtr data, IntPtr geom1, IntPtr geom2); 213 public delegate void NearCallback(IntPtr data, IntPtr geom1, IntPtr geom2);
@@ -735,12 +734,12 @@ namespace OdeAPI
735 return CreateiHeightfield(space, data, bPlaceable); 734 return CreateiHeightfield(space, data, bPlaceable);
736 } 735 }
737 736
738 [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dCreateUbitTerrain"), SuppressUnmanagedCodeSecurity] 737 [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dCreateubTerrain"), SuppressUnmanagedCodeSecurity]
739 public static extern IntPtr CreateiUbitTerrain(IntPtr space, IntPtr data, int bPlaceable); 738 public static extern IntPtr CreateiubTerrain(IntPtr space, IntPtr data, int bPlaceable);
740 public static IntPtr CreateUbitTerrain(IntPtr space, IntPtr data, int bPlaceable) 739 public static IntPtr CreateubTerrain(IntPtr space, IntPtr data, int bPlaceable)
741 { 740 {
742 NTotalGeoms++; 741 NTotalGeoms++;
743 return CreateiUbitTerrain(space, data, bPlaceable); 742 return CreateiubTerrain(space, data, bPlaceable);
744 } 743 }
745 744
746 745
@@ -1022,29 +1021,29 @@ namespace OdeAPI
1022 1021
1023 1022
1024 [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomUbitTerrainDataBuild"), SuppressUnmanagedCodeSecurity] 1023 [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomUbitTerrainDataBuild"), SuppressUnmanagedCodeSecurity]
1025 public static extern void GeomUbitTerrainDataBuild(IntPtr d, float[] pHeightData, int bCopyHeightData, 1024 public static extern void GeomubTerrainDataBuild(IntPtr d, float[] pHeightData, int bCopyHeightData,
1026 dReal sampleSize, int widthSamples, int depthSamples, 1025 dReal sampleSize, int widthSamples, int depthSamples,
1027 dReal offset, dReal thickness, int bWrap); 1026 dReal offset, dReal thickness, int bWrap);
1028 1027
1029 [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomUbitTerrainDataBuild"), SuppressUnmanagedCodeSecurity] 1028 [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomubTerrainDataBuild"), SuppressUnmanagedCodeSecurity]
1030 public static extern void GeomUbitTerrainDataBuild(IntPtr d, IntPtr pHeightData, int bCopyHeightData, 1029 public static extern void GeomubTerrainDataBuild(IntPtr d, IntPtr pHeightData, int bCopyHeightData,
1031 dReal sampleSize, int widthSamples, int depthSamples, 1030 dReal sampleSize, int widthSamples, int depthSamples,
1032 dReal thickness, int bWrap); 1031 dReal thickness, int bWrap);
1033 1032
1034 [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomUbitTerrainDataCreate"), SuppressUnmanagedCodeSecurity] 1033 [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomubTerrainDataCreate"), SuppressUnmanagedCodeSecurity]
1035 public static extern IntPtr GeomUbitTerrainDataCreate(); 1034 public static extern IntPtr GeomubTerrainDataCreate();
1036 1035
1037 [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomUbitTerrainDataDestroy"), SuppressUnmanagedCodeSecurity] 1036 [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomubTerrainDataDestroy"), SuppressUnmanagedCodeSecurity]
1038 public static extern void GeomUbitTerrainDataDestroy(IntPtr d); 1037 public static extern void GeomubTerrainDataDestroy(IntPtr d);
1039 1038
1040 [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomUbitTerrainDataSetBounds"), SuppressUnmanagedCodeSecurity] 1039 [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomubTerrainDataSetBounds"), SuppressUnmanagedCodeSecurity]
1041 public static extern void GeomUbitTerrainDataSetBounds(IntPtr d, dReal minHeight, dReal maxHeight); 1040 public static extern void GeomubTerrainDataSetBounds(IntPtr d, dReal minHeight, dReal maxHeight);
1042 1041
1043 [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomUbitTerrainGetHeightfieldData"), SuppressUnmanagedCodeSecurity] 1042 [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomubTerrainGetHeightfieldData"), SuppressUnmanagedCodeSecurity]
1044 public static extern IntPtr GeomUbitTerrainGetHeightfieldData(IntPtr g); 1043 public static extern IntPtr GeomubTerrainGetHeightfieldData(IntPtr g);
1045 1044
1046 [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomUbitTerrainSetHeightfieldData"), SuppressUnmanagedCodeSecurity] 1045 [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomubTerrainSetHeightfieldData"), SuppressUnmanagedCodeSecurity]
1047 public static extern void GeomUbitTerrainSetHeightfieldData(IntPtr g, IntPtr d); 1046 public static extern void GeomubTerrainSetHeightfieldData(IntPtr g, IntPtr d);
1048 1047
1049 1048
1050 [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomIsEnabled"), SuppressUnmanagedCodeSecurity] 1049 [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomIsEnabled"), SuppressUnmanagedCodeSecurity]
diff --git a/OpenSim/Region/PhysicsModules/UbitOde/ODECharacter.cs b/OpenSim/Region/PhysicsModules/ubOde/ODECharacter.cs
index 5622e48..cc37ef5 100644
--- a/OpenSim/Region/PhysicsModules/UbitOde/ODECharacter.cs
+++ b/OpenSim/Region/PhysicsModules/ubOde/ODECharacter.cs
@@ -37,7 +37,7 @@ using OpenSim.Framework;
37using OpenSim.Region.PhysicsModules.SharedBase; 37using OpenSim.Region.PhysicsModules.SharedBase;
38using log4net; 38using log4net;
39 39
40namespace OpenSim.Region.PhysicsModule.UbitOde 40namespace OpenSim.Region.PhysicsModule.ubOde
41{ 41{
42 /// <summary> 42 /// <summary>
43 /// Various properties that ODE uses for AMotors but isn't exposed in ODE.NET so we must define them ourselves. 43 /// Various properties that ODE uses for AMotors but isn't exposed in ODE.NET so we must define them ourselves.
diff --git a/OpenSim/Region/PhysicsModules/UbitOde/ODEDynamics.cs b/OpenSim/Region/PhysicsModules/ubOde/ODEDynamics.cs
index abe6f37..c3b4dd8 100644
--- a/OpenSim/Region/PhysicsModules/UbitOde/ODEDynamics.cs
+++ b/OpenSim/Region/PhysicsModules/ubOde/ODEDynamics.cs
@@ -50,7 +50,7 @@ using OdeAPI;
50using OpenSim.Framework; 50using OpenSim.Framework;
51using OpenSim.Region.PhysicsModules.SharedBase; 51using OpenSim.Region.PhysicsModules.SharedBase;
52 52
53namespace OpenSim.Region.PhysicsModule.UbitOde 53namespace OpenSim.Region.PhysicsModule.ubOde
54{ 54{
55 public class ODEDynamics 55 public class ODEDynamics
56 { 56 {
@@ -688,7 +688,7 @@ namespace OpenSim.Region.PhysicsModule.UbitOde
688 private const float halfpi = 0.5f * (float)Math.PI; 688 private const float halfpi = 0.5f * (float)Math.PI;
689 private const float twopi = 2.0f * pi; 689 private const float twopi = 2.0f * pi;
690 690
691 public static Vector3 ubitRot2Euler(Quaternion rot) 691 public static Vector3 ubRot2Euler(Quaternion rot)
692 { 692 {
693 // returns roll in X 693 // returns roll in X
694 // pitch in Y 694 // pitch in Y
diff --git a/OpenSim/Region/PhysicsModules/UbitOde/ODEMeshWorker.cs b/OpenSim/Region/PhysicsModules/ubOde/ODEMeshWorker.cs
index 330b191..40b5ef7 100644
--- a/OpenSim/Region/PhysicsModules/UbitOde/ODEMeshWorker.cs
+++ b/OpenSim/Region/PhysicsModules/ubOde/ODEMeshWorker.cs
@@ -16,7 +16,7 @@ using log4net;
16using Nini.Config; 16using Nini.Config;
17using OpenMetaverse; 17using OpenMetaverse;
18 18
19namespace OpenSim.Region.PhysicsModule.UbitOde 19namespace OpenSim.Region.PhysicsModule.ubOde
20{ 20{
21 public enum MeshState : byte 21 public enum MeshState : byte
22 { 22 {
diff --git a/OpenSim/Region/PhysicsModules/UbitOde/ODEModule.cs b/OpenSim/Region/PhysicsModules/ubOde/ODEModule.cs
index 8be7c7c..44bf17f 100644
--- a/OpenSim/Region/PhysicsModules/UbitOde/ODEModule.cs
+++ b/OpenSim/Region/PhysicsModules/ubOde/ODEModule.cs
@@ -8,23 +8,23 @@ using OpenSim.Framework;
8using OpenSim.Region.Framework.Scenes; 8using OpenSim.Region.Framework.Scenes;
9using OpenSim.Region.Framework.Interfaces; 9using OpenSim.Region.Framework.Interfaces;
10 10
11namespace OpenSim.Region.PhysicsModule.UbitOde 11namespace OpenSim.Region.PhysicsModule.ubOde
12{ 12{
13 [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "UBITODEPhysicsScene")] 13 [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "ubODEPhysicsScene")]
14 class UbitOdeModule : INonSharedRegionModule 14 class ubOdeModule : INonSharedRegionModule
15 { 15 {
16 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 16 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
17 17
18 private bool m_Enabled = false; 18 private bool m_Enabled = false;
19 private IConfigSource m_config; 19 private IConfigSource m_config;
20 private ODEScene m_scene; 20 private ODEScene m_scene;
21 private bool OdeUbitLib; 21 private bool ubOdeLib;
22 22
23 #region INonSharedRegionModule 23 #region INonSharedRegionModule
24 24
25 public string Name 25 public string Name
26 { 26 {
27 get { return "UbitODE"; } 27 get { return "ubODE"; }
28 } 28 }
29 29
30 public Type ReplaceableInterface 30 public Type ReplaceableInterface
@@ -65,15 +65,15 @@ namespace OpenSim.Region.PhysicsModule.UbitOde
65 string ode_config = d.GetConfiguration(); 65 string ode_config = d.GetConfiguration();
66 if (ode_config != null && ode_config != "") 66 if (ode_config != null && ode_config != "")
67 { 67 {
68 m_log.InfoFormat("[UbitODE] ode library configuration: {0}", ode_config); 68 m_log.InfoFormat("[ubODE] ode library configuration: {0}", ode_config);
69 69 // ubODE still not avaiable
70 if (ode_config.Contains("ODE_Ubit")) 70 if (ode_config.Contains("ubODE"))
71 { 71 {
72 OdeUbitLib = true; 72 ubOdeLib = true;
73 } 73 }
74 } 74 }
75 75
76 m_scene = new ODEScene(scene, m_config, Name, OdeUbitLib); 76 m_scene = new ODEScene(scene, m_config, Name, ubOdeLib);
77 } 77 }
78 78
79 public void RemoveRegion(Scene scene) 79 public void RemoveRegion(Scene scene)
diff --git a/OpenSim/Region/PhysicsModules/UbitOde/ODEPrim.cs b/OpenSim/Region/PhysicsModules/ubOde/ODEPrim.cs
index 8e8e069..91aca26 100644
--- a/OpenSim/Region/PhysicsModules/UbitOde/ODEPrim.cs
+++ b/OpenSim/Region/PhysicsModules/ubOde/ODEPrim.cs
@@ -25,11 +25,6 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28/* Revision 2011/12/13 by Ubit Umarov
29 *
30 *
31 */
32
33/* 28/*
34 * Revised August 26 2009 by Kitto Flora. ODEDynamics.cs replaces 29 * Revised August 26 2009 by Kitto Flora. ODEDynamics.cs replaces
35 * ODEVehicleSettings.cs. It and ODEPrim.cs are re-organised: 30 * ODEVehicleSettings.cs. It and ODEPrim.cs are re-organised:
@@ -57,7 +52,7 @@ using OdeAPI;
57using OpenSim.Framework; 52using OpenSim.Framework;
58using OpenSim.Region.PhysicsModules.SharedBase; 53using OpenSim.Region.PhysicsModules.SharedBase;
59 54
60namespace OpenSim.Region.PhysicsModule.UbitOde 55namespace OpenSim.Region.PhysicsModule.ubOde
61{ 56{
62 public class OdePrim : PhysicsActor 57 public class OdePrim : PhysicsActor
63 { 58 {
diff --git a/OpenSim/Region/PhysicsModules/UbitOde/ODERayCastRequestManager.cs b/OpenSim/Region/PhysicsModules/ubOde/ODERayCastRequestManager.cs
index 6b3672a..ef1e57c 100644
--- a/OpenSim/Region/PhysicsModules/UbitOde/ODERayCastRequestManager.cs
+++ b/OpenSim/Region/PhysicsModules/ubOde/ODERayCastRequestManager.cs
@@ -36,7 +36,7 @@ using OdeAPI;
36using log4net; 36using log4net;
37using OpenMetaverse; 37using OpenMetaverse;
38 38
39namespace OpenSim.Region.PhysicsModule.UbitOde 39namespace OpenSim.Region.PhysicsModule.ubOde
40{ 40{
41 /// <summary> 41 /// <summary>
42 /// Processes raycast requests as ODE is in a state to be able to do them. 42 /// Processes raycast requests as ODE is in a state to be able to do them.
diff --git a/OpenSim/Region/PhysicsModules/UbitOde/OdeScene.cs b/OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs
index bd0e372..a2dd885 100644
--- a/OpenSim/Region/PhysicsModules/UbitOde/OdeScene.cs
+++ b/OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs
@@ -45,7 +45,7 @@ using OpenSim.Region.Framework.Interfaces;
45using OpenSim.Region.PhysicsModules.SharedBase; 45using OpenSim.Region.PhysicsModules.SharedBase;
46using OpenMetaverse; 46using OpenMetaverse;
47 47
48namespace OpenSim.Region.PhysicsModule.UbitOde 48namespace OpenSim.Region.PhysicsModule.ubOde
49{ 49{
50 // colision flags of things others can colide with 50 // colision flags of things others can colide with
51 // rays, sensors, probes removed since can't be colided with 51 // rays, sensors, probes removed since can't be colided with
@@ -169,7 +169,7 @@ namespace OpenSim.Region.PhysicsModule.UbitOde
169 { 169 {
170 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 170 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
171 171
172 public bool m_odeUbitLib = false; 172 public bool m_ubOdeLib = false;
173 public bool m_suportCombine = false; // mega suport not tested 173 public bool m_suportCombine = false; // mega suport not tested
174 public Scene m_frameWorkScene = null; 174 public Scene m_frameWorkScene = null;
175 175
@@ -213,7 +213,7 @@ namespace OpenSim.Region.PhysicsModule.UbitOde
213 213
214// private int m_meshExpireCntr; 214// private int m_meshExpireCntr;
215 215
216 private float avDensity = 3f; 216 private float avDensity = 80f;
217 private float avMovementDivisorWalk = 1.3f; 217 private float avMovementDivisorWalk = 1.3f;
218 private float avMovementDivisorRun = 0.8f; 218 private float avMovementDivisorRun = 0.8f;
219 private float minimumGroundFlightOffset = 3f; 219 private float minimumGroundFlightOffset = 3f;
@@ -327,7 +327,7 @@ namespace OpenSim.Region.PhysicsModule.UbitOde
327 327
328 IConfig physicsconfig = null; 328 IConfig physicsconfig = null;
329 329
330 public ODEScene(Scene pscene, IConfigSource psourceconfig, string pname, bool podeUbitLib) 330 public ODEScene(Scene pscene, IConfigSource psourceconfig, string pname, bool pubOdeLib)
331 { 331 {
332 OdeLock = new Object(); 332 OdeLock = new Object();
333 333
@@ -335,7 +335,7 @@ namespace OpenSim.Region.PhysicsModule.UbitOde
335 PhysicsSceneName = EngineType + "/" + pscene.RegionInfo.RegionName; 335 PhysicsSceneName = EngineType + "/" + pscene.RegionInfo.RegionName;
336 336
337 m_config = psourceconfig; 337 m_config = psourceconfig;
338 m_odeUbitLib = podeUbitLib; 338 m_ubOdeLib = pubOdeLib;
339 m_frameWorkScene = pscene; 339 m_frameWorkScene = pscene;
340 340
341 m_frameWorkScene.RegisterModuleInterface<PhysicsScene>(this); 341 m_frameWorkScene.RegisterModuleInterface<PhysicsScene>(this);
@@ -354,7 +354,7 @@ namespace OpenSim.Region.PhysicsModule.UbitOde
354 mesher = m_frameWorkScene.RequestModuleInterface<IMesher>(); 354 mesher = m_frameWorkScene.RequestModuleInterface<IMesher>();
355 if (mesher == null) 355 if (mesher == null)
356 { 356 {
357 m_log.WarnFormat("[UbitODE] No mesher. module disabled"); 357 m_log.WarnFormat("[ubOde] No mesher. module disabled");
358 return; 358 return;
359 } 359 }
360 360
@@ -492,6 +492,8 @@ namespace OpenSim.Region.PhysicsModule.UbitOde
492 492
493 minimumGroundFlightOffset = physicsconfig.GetFloat("minimum_ground_flight_offset", minimumGroundFlightOffset); 493 minimumGroundFlightOffset = physicsconfig.GetFloat("minimum_ground_flight_offset", minimumGroundFlightOffset);
494 maximumMassObject = physicsconfig.GetFloat("maximum_mass_object", maximumMassObject); 494 maximumMassObject = physicsconfig.GetFloat("maximum_mass_object", maximumMassObject);
495
496 avDensity *= 3f / 80f; // scale other engines density option to this
495 } 497 }
496 } 498 }
497 499
@@ -1927,7 +1929,7 @@ namespace OpenSim.Region.PhysicsModule.UbitOde
1927 int regsizeY = (int)m_regionHeight + 3; // map size see setterrain number of samples 1929 int regsizeY = (int)m_regionHeight + 3; // map size see setterrain number of samples
1928 int regsize = regsizeX; 1930 int regsize = regsizeX;
1929 1931
1930 if (m_odeUbitLib) 1932 if (m_ubOdeLib)
1931 { 1933 {
1932 if (x < regsizeX - 1) 1934 if (x < regsizeX - 1)
1933 { 1935 {
@@ -2071,7 +2073,7 @@ namespace OpenSim.Region.PhysicsModule.UbitOde
2071 int ystep = regsizeX; 2073 int ystep = regsizeX;
2072 bool firstTri = false; 2074 bool firstTri = false;
2073 2075
2074 if (m_odeUbitLib) 2076 if (m_ubOdeLib)
2075 { 2077 {
2076 if (x < regsizeX - 1) 2078 if (x < regsizeX - 1)
2077 { 2079 {
@@ -2183,8 +2185,8 @@ namespace OpenSim.Region.PhysicsModule.UbitOde
2183 2185
2184 public void SetTerrain(float[] heightMap, Vector3 pOffset) 2186 public void SetTerrain(float[] heightMap, Vector3 pOffset)
2185 { 2187 {
2186 if (m_odeUbitLib) 2188 if (m_ubOdeLib)
2187 UbitSetTerrain(heightMap, pOffset); 2189 ubSetTerrain(heightMap, pOffset);
2188 else 2190 else
2189 OriSetTerrain(heightMap, pOffset); 2191 OriSetTerrain(heightMap, pOffset);
2190 } 2192 }
@@ -2315,7 +2317,7 @@ namespace OpenSim.Region.PhysicsModule.UbitOde
2315 } 2317 }
2316 } 2318 }
2317 2319
2318 public void UbitSetTerrain(float[] heightMap, Vector3 pOffset) 2320 public void ubSetTerrain(float[] heightMap, Vector3 pOffset)
2319 { 2321 {
2320 // assumes 1m size grid and constante size square regions 2322 // assumes 1m size grid and constante size square regions
2321 // needs to know about sims around in future 2323 // needs to know about sims around in future
@@ -2389,7 +2391,7 @@ namespace OpenSim.Region.PhysicsModule.UbitOde
2389 } 2391 }
2390 } 2392 }
2391 } 2393 }
2392 IntPtr HeightmapData = d.GeomUbitTerrainDataCreate(); 2394 IntPtr HeightmapData = d.GeomubTerrainDataCreate();
2393 2395
2394 const int wrap = 0; 2396 const int wrap = 0;
2395 float thickness = hfmin; 2397 float thickness = hfmin;
@@ -2398,12 +2400,12 @@ namespace OpenSim.Region.PhysicsModule.UbitOde
2398 2400
2399 GCHandle _heightmaphandler = GCHandle.Alloc(_heightmap, GCHandleType.Pinned); 2401 GCHandle _heightmaphandler = GCHandle.Alloc(_heightmap, GCHandleType.Pinned);
2400 2402
2401 d.GeomUbitTerrainDataBuild(HeightmapData, _heightmaphandler.AddrOfPinnedObject(), 0, 1.0f, 2403 d.GeomubTerrainDataBuild(HeightmapData, _heightmaphandler.AddrOfPinnedObject(), 0, 1.0f,
2402 (int)heightmapWidthSamples, (int)heightmapHeightSamples, 2404 (int)heightmapWidthSamples, (int)heightmapHeightSamples,
2403 thickness, wrap); 2405 thickness, wrap);
2404 2406
2405// d.GeomUbitTerrainDataSetBounds(HeightmapData, hfmin - 1, hfmax + 1); 2407// d.GeomubTerrainDataSetBounds(HeightmapData, hfmin - 1, hfmax + 1);
2406 GroundGeom = d.CreateUbitTerrain(GroundSpace, HeightmapData, 1); 2408 GroundGeom = d.CreateubTerrain(GroundSpace, HeightmapData, 1);
2407 if (GroundGeom != IntPtr.Zero) 2409 if (GroundGeom != IntPtr.Zero)
2408 { 2410 {
2409 d.GeomSetCategoryBits(GroundGeom, (uint)(CollisionCategories.Land)); 2411 d.GeomSetCategoryBits(GroundGeom, (uint)(CollisionCategories.Land));
@@ -2446,13 +2448,18 @@ namespace OpenSim.Region.PhysicsModule.UbitOde
2446 2448
2447 public override void Dispose() 2449 public override void Dispose()
2448 { 2450 {
2449 if (m_meshWorker != null) 2451 if (m_rayCastManager == null) // if this is null we already did dispose
2450 m_meshWorker.Stop(); 2452 return;
2451
2452 lock (OdeLock) 2453 lock (OdeLock)
2453 { 2454 {
2454 m_rayCastManager.Dispose(); 2455 if (m_meshWorker != null)
2455 m_rayCastManager = null; 2456 m_meshWorker.Stop();
2457
2458 if (m_rayCastManager != null)
2459 {
2460 m_rayCastManager.Dispose();
2461 m_rayCastManager = null;
2462 }
2456 2463
2457 lock (_prims) 2464 lock (_prims)
2458 { 2465 {
@@ -2476,7 +2483,7 @@ namespace OpenSim.Region.PhysicsModule.UbitOde
2476 foreach (OdeCharacter ch in chtorem) 2483 foreach (OdeCharacter ch in chtorem)
2477 ch.DoAChange(changes.Remove, null); 2484 ch.DoAChange(changes.Remove, null);
2478 2485
2479 2486
2480 foreach (IntPtr GroundGeom in RegionTerrain.Values) 2487 foreach (IntPtr GroundGeom in RegionTerrain.Values)
2481 { 2488 {
2482 if (GroundGeom != IntPtr.Zero) 2489 if (GroundGeom != IntPtr.Zero)
diff --git a/OpenSim/Region/PhysicsModules/UbitOde/ODESitAvatar.cs b/OpenSim/Region/PhysicsModules/ubOde/ODESitAvatar.cs
index ef828de..214205d 100644
--- a/OpenSim/Region/PhysicsModules/UbitOde/ODESitAvatar.cs
+++ b/OpenSim/Region/PhysicsModules/ubOde/ODESitAvatar.cs
@@ -24,7 +24,7 @@
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27// Ubit 2012 27// Ubit Umarov 2012
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Reflection; 30using System.Reflection;
@@ -36,7 +36,7 @@ using OdeAPI;
36using log4net; 36using log4net;
37using OpenMetaverse; 37using OpenMetaverse;
38 38
39namespace OpenSim.Region.PhysicsModule.UbitOde 39namespace OpenSim.Region.PhysicsModule.ubOde
40{ 40{
41 /// <summary> 41 /// <summary>
42 /// </summary> 42 /// </summary>
diff --git a/OpenSim/Region/PhysicsModules/UbitOde/Properties/AssemblyInfo.cs b/OpenSim/Region/PhysicsModules/ubOde/Properties/AssemblyInfo.cs
index 01c8470..01c8470 100644
--- a/OpenSim/Region/PhysicsModules/UbitOde/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/PhysicsModules/ubOde/Properties/AssemblyInfo.cs
diff --git a/OpenSim/Region/PhysicsModules/UbitMeshing/HelperTypes.cs b/OpenSim/Region/PhysicsModules/ubOdeMeshing/HelperTypes.cs
index fb38cdb..ea37301 100644
--- a/OpenSim/Region/PhysicsModules/UbitMeshing/HelperTypes.cs
+++ b/OpenSim/Region/PhysicsModules/ubOdeMeshing/HelperTypes.cs
@@ -31,7 +31,7 @@ using System.Diagnostics;
31using System.Globalization; 31using System.Globalization;
32using OpenMetaverse; 32using OpenMetaverse;
33using OpenSim.Region.PhysicsModules.SharedBase; 33using OpenSim.Region.PhysicsModules.SharedBase;
34using OpenSim.Region.PhysicsModule.UbitMeshing; 34using OpenSim.Region.PhysicsModule.ubODEMeshing;
35 35
36public class Vertex : IComparable<Vertex> 36public class Vertex : IComparable<Vertex>
37{ 37{
diff --git a/OpenSim/Region/PhysicsModules/UbitMeshing/Mesh.cs b/OpenSim/Region/PhysicsModules/ubOdeMeshing/Mesh.cs
index e3bfe77..da8f623 100644
--- a/OpenSim/Region/PhysicsModules/UbitMeshing/Mesh.cs
+++ b/OpenSim/Region/PhysicsModules/ubOdeMeshing/Mesh.cs
@@ -35,7 +35,7 @@ using OpenMetaverse;
35using System.Runtime.Serialization; 35using System.Runtime.Serialization;
36using System.Runtime.Serialization.Formatters.Binary; 36using System.Runtime.Serialization.Formatters.Binary;
37 37
38namespace OpenSim.Region.PhysicsModule.UbitMeshing 38namespace OpenSim.Region.PhysicsModule.ubODEMeshing
39{ 39{
40 public class MeshBuildingData 40 public class MeshBuildingData
41 { 41 {
diff --git a/OpenSim/Region/PhysicsModules/UbitMeshing/Meshmerizer.cs b/OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs
index 58a93a1..be76f8f 100644
--- a/OpenSim/Region/PhysicsModules/UbitMeshing/Meshmerizer.cs
+++ b/OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs
@@ -49,9 +49,9 @@ using System.Runtime.Serialization.Formatters.Binary;
49 49
50using Mono.Addins; 50using Mono.Addins;
51 51
52namespace OpenSim.Region.PhysicsModule.UbitMeshing 52namespace OpenSim.Region.PhysicsModule.ubODEMeshing
53{ 53{
54 [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "UbitMeshmerizer")] 54 [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "ubODEMeshmerizer")]
55 public class UbitMeshmerizer : IMesher, INonSharedRegionModule 55 public class UbitMeshmerizer : IMesher, INonSharedRegionModule
56 { 56 {
57 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 57 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -82,7 +82,7 @@ namespace OpenSim.Region.PhysicsModule.UbitMeshing
82 #region INonSharedRegionModule 82 #region INonSharedRegionModule
83 public string Name 83 public string Name
84 { 84 {
85 get { return "UbitMeshmerizer"; } 85 get { return "ubODEMeshmerizer"; }
86 } 86 }
87 87
88 public Type ReplaceableInterface 88 public Type ReplaceableInterface
diff --git a/OpenSim/Region/PhysicsModules/UbitMeshing/PrimMesher.cs b/OpenSim/Region/PhysicsModules/ubOdeMeshing/PrimMesher.cs
index 8eb136b..8eb136b 100644
--- a/OpenSim/Region/PhysicsModules/UbitMeshing/PrimMesher.cs
+++ b/OpenSim/Region/PhysicsModules/ubOdeMeshing/PrimMesher.cs
diff --git a/OpenSim/Region/PhysicsModules/UbitMeshing/Properties/AssemblyInfo.cs b/OpenSim/Region/PhysicsModules/ubOdeMeshing/Properties/AssemblyInfo.cs
index 6881e26..6881e26 100644
--- a/OpenSim/Region/PhysicsModules/UbitMeshing/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/PhysicsModules/ubOdeMeshing/Properties/AssemblyInfo.cs
diff --git a/OpenSim/Region/PhysicsModules/UbitMeshing/SculptMap.cs b/OpenSim/Region/PhysicsModules/ubOdeMeshing/SculptMap.cs
index 1c75db6..1c75db6 100644
--- a/OpenSim/Region/PhysicsModules/UbitMeshing/SculptMap.cs
+++ b/OpenSim/Region/PhysicsModules/ubOdeMeshing/SculptMap.cs
diff --git a/OpenSim/Region/PhysicsModules/UbitMeshing/SculptMesh.cs b/OpenSim/Region/PhysicsModules/ubOdeMeshing/SculptMesh.cs
index bc1375b..bc1375b 100644
--- a/OpenSim/Region/PhysicsModules/UbitMeshing/SculptMesh.cs
+++ b/OpenSim/Region/PhysicsModules/ubOdeMeshing/SculptMesh.cs