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

add OSSL osGetPhysicsEngineName(). this returns a string with name and version. does no permition checks or it whould be less usefull ( only ubOde returns value)

Browse Source
This commit is contained in:
UbitUmarov
2016-07-04 08:29:26 +01:00
parent e00603f78a
commit ac72598c6b
6 changed files with 33 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/PhysicsModules/SharedBase/PhysicsScene.cs
View File

@@ -112,6 +112,8 @@ namespace OpenSim.Region.PhysicsModules.SharedBase
/// </summary>
public string EngineType { get; protected set; }
public string EngineName { get; protected set; }
// The only thing that should register for this event is the SceneGraph
// Anything else could cause problems.
public event physicsCrash OnPhysicsCrash;

7
OpenSim/Region/PhysicsModules/ubOde/ODEModule.cs
View File

@@ -29,6 +29,11 @@ namespace OpenSim.Region.PhysicsModule.ubOde
get { return "ubODE"; }
}
public string Version
{
get { return "1.0"; }
}
public Type ReplaceableInterface
{
get { return null; }
@@ -75,7 +80,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
if(m_scenes.ContainsKey(scene)) // ???
return;
ODEScene newodescene = new ODEScene(scene, m_config, Name, OSOdeLib);
ODEScene newodescene = new ODEScene(scene, m_config, Name, Version, OSOdeLib);
m_scenes[scene] = newodescene;
}

6
OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs
View File

@@ -324,13 +324,13 @@ namespace OpenSim.Region.PhysicsModule.ubOde
IConfig physicsconfig = null;
public ODEScene(Scene pscene, IConfigSource psourceconfig, string pname, bool pOSOdeLib)
public ODEScene(Scene pscene, IConfigSource psourceconfig, string pname, string pversion, bool pOSOdeLib)
{
OdeLock = new Object();
EngineType = pname;
PhysicsSceneName = EngineType + "/" + pscene.RegionInfo.RegionName;
EngineName = pname + " " + pversion;
m_config = psourceconfig;
m_OSOdeLib = pOSOdeLib;
@@ -355,7 +355,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
m_log.ErrorFormat("[ubOde] No mesher. module disabled");
return;
}
m_meshWorker = new ODEMeshWorker(this, m_log, mesher, physicsconfig);
m_frameWorkScene.PhysicsEnabled = true;
}