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

All physics plugins are now region modules. Compiles but doesn't run.

Browse Source
This commit is contained in:
Diva Canto
2015-08-31 13:02:51 -07:00
parent 49ab478d28
commit 134d4300f0
24 changed files with 1518 additions and 1313 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/PhysicsModules/Ode/AssemblyInfo.cs
View File

@@ -27,6 +27,7 @@
using System.Reflection;
using System.Runtime.InteropServices;
using Mono.Addins;
// Information about this assembly is defined by the following
// attributes.
@@ -56,3 +57,6 @@ using System.Runtime.InteropServices;
// numbers with the '*' character (the default):
[assembly : AssemblyVersion("0.8.2.*")]
[assembly: Addin("OpenSim.Region.PhysicsModule.ODE", OpenSim.VersionInfo.VersionNumber)]
[assembly: AddinDependency("OpenSim.Region.Framework", OpenSim.VersionInfo.VersionNumber)]

2
OpenSim/Region/PhysicsModules/Ode/ODECharacter.cs
View File

@@ -511,7 +511,7 @@ namespace OpenSim.Region.PhysicsModule.ODE
}
else
{
m_log.WarnFormat("[ODE CHARACTER]: Got a NaN Size for {0} in {1}", Name, _parent_scene.Name);
m_log.WarnFormat("[ODE CHARACTER]: Got a NaN Size for {0} in {1}", Name, _parent_scene.PhysicsSceneName);
}
}

2
OpenSim/Region/PhysicsModules/Ode/ODEPrim.cs
View File

@@ -3380,7 +3380,7 @@ Console.WriteLine(" JointCreateFixed");
{
m_log.WarnFormat(
"[ODE PRIM]: Could not get mesh/sculpt asset {0} for {1} at {2} in {3}",
_pbs.SculptTexture, Name, _position, _parent_scene.Name);
_pbs.SculptTexture, Name, _position, _parent_scene.PhysicsSceneName);
}
}
}

70
OpenSim/Region/PhysicsModules/Ode/OdePlugin.cs
View File

@@ -44,47 +44,47 @@ namespace OpenSim.Region.PhysicsModule.ODE
/// <summary>
/// ODE plugin
/// </summary>
public class OdePlugin : IPhysicsPlugin
{
// private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
// public class OdePlugin : IPhysicsPlugin
// {
//// private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
private OdeScene m_scene;
// private OdeScene m_scene;
public bool Init()
{
return true;
}
// public bool Init()
// {
// return true;
// }
public PhysicsScene GetScene(String sceneIdentifier)
{
if (m_scene == null)
{
// We do this so that OpenSimulator on Windows loads the correct native ODE library depending on whether
// it's running as a 32-bit process or a 64-bit one. By invoking LoadLibary here, later DLLImports
// will find it already loaded later on.
//
// This isn't necessary for other platforms (e.g. Mac OSX and Linux) since the DLL used can be
// controlled in Ode.NET.dll.config
if (Util.IsWindows())
Util.LoadArchSpecificWindowsDll("ode.dll");
// public PhysicsScene GetScene(String sceneIdentifier)
// {
// if (m_scene == null)
// {
// // We do this so that OpenSimulator on Windows loads the correct native ODE library depending on whether
// // it's running as a 32-bit process or a 64-bit one. By invoking LoadLibary here, later DLLImports
// // will find it already loaded later on.
// //
// // This isn't necessary for other platforms (e.g. Mac OSX and Linux) since the DLL used can be
// // controlled in Ode.NET.dll.config
// if (Util.IsWindows())
// Util.LoadArchSpecificWindowsDll("ode.dll");
// Initializing ODE only when a scene is created allows alternative ODE plugins to co-habit (according to
// http://opensimulator.org/mantis/view.php?id=2750).
d.InitODE();
// // Initializing ODE only when a scene is created allows alternative ODE plugins to co-habit (according to
// // http://opensimulator.org/mantis/view.php?id=2750).
// d.InitODE();
m_scene = new OdeScene(GetName(), sceneIdentifier);
}
// m_scene = new OdeScene(GetName(), sceneIdentifier);
// }
return m_scene;
}
// return m_scene;
// }
public string GetName()
{
return ("OpenDynamicsEngine");
}
// public string GetName()
// {
// return ("OpenDynamicsEngine");
// }
public void Dispose()
{
}
}
// public void Dispose()
// {
// }
// }
}

111
OpenSim/Region/PhysicsModules/Ode/OdeScene.cs
View File

@@ -38,6 +38,7 @@ using System.Runtime.InteropServices;
using System.Threading;
using log4net;
using Nini.Config;
using Mono.Addins;
using Ode.NET;
using OpenMetaverse;
#if USE_DRAWSTUFF
@@ -45,6 +46,9 @@ using Drawstuff.NET;
#endif
using OpenSim.Framework;
using OpenSim.Region.PhysicsModules.SharedBase;
using OpenSim.Region.Framework.Scenes;
using OpenSim.Region.Framework.Interfaces;
namespace OpenSim.Region.PhysicsModule.ODE
{
@@ -101,9 +105,12 @@ namespace OpenSim.Region.PhysicsModule.ODE
Rubber = 6
}
[Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "ODEPhysicsScene")]
public class OdeScene : PhysicsScene
{
private readonly ILog m_log;
private readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType.ToString());
private bool m_Enabled = false;
// private Dictionary<string, sCollisionData> m_storedCollisions = new Dictionary<string, sCollisionData>();
/// <summary>
@@ -288,7 +295,7 @@ namespace OpenSim.Region.PhysicsModule.ODE
private int framecount = 0;
//private int m_returncollisions = 10;
private readonly IntPtr contactgroup;
private IntPtr contactgroup;
internal IntPtr WaterGeom;
@@ -520,19 +527,90 @@ namespace OpenSim.Region.PhysicsModule.ODE
private ODERayCastRequestManager m_rayCastManager;
#region INonSharedRegionModule
public string Name
{
get { return "OpenDynamicsEngine"; }
}
public Type ReplaceableInterface
{
get { return null; }
}
public void Initialise(IConfigSource source)
{
// TODO: Move this out of Startup
IConfig config = source.Configs["Startup"];
if (config != null)
{
string physics = config.GetString("physics", string.Empty);
if (physics == Name)
{
m_Enabled = true;
m_config = source;
// We do this so that OpenSimulator on Windows loads the correct native ODE library depending on whether
// it's running as a 32-bit process or a 64-bit one. By invoking LoadLibary here, later DLLImports
// will find it already loaded later on.
//
// This isn't necessary for other platforms (e.g. Mac OSX and Linux) since the DLL used can be
// controlled in Ode.NET.dll.config
if (Util.IsWindows())
Util.LoadArchSpecificWindowsDll("ode.dll");
// Initializing ODE only when a scene is created allows alternative ODE plugins to co-habit (according to
// http://opensimulator.org/mantis/view.php?id=2750).
d.InitODE();
}
}
}
public void Close()
{
}
public void AddRegion(Scene scene)
{
if (!m_Enabled)
return;
EngineType = Name;
PhysicsSceneName = EngineType + "/" + scene.RegionInfo.RegionName;
scene.RegisterModuleInterface<PhysicsScene>(this);
Vector3 extent = new Vector3(scene.RegionInfo.RegionSizeX, scene.RegionInfo.RegionSizeY, scene.RegionInfo.RegionSizeZ);
Initialise();
InitialiseFromConfig(m_config);
}
public void RemoveRegion(Scene scene)
{
if (!m_Enabled)
return;
}
public void RegionLoaded(Scene scene)
{
if (!m_Enabled)
return;
mesher = scene.RequestModuleInterface<IMesher>();
if (mesher == null)
m_log.WarnFormat("[ODE SCENE]: No mesher in {0}. Things will not work well.", PhysicsSceneName);
}
#endregion
/// <summary>
/// Initiailizes the scene
/// Sets many properties that ODE requires to be stable
/// These settings need to be tweaked 'exactly' right or weird stuff happens.
/// </summary>
/// <param value="name">Name of the scene. Useful in debug messages.</param>
public OdeScene(string engineType, string name)
private void Initialise()
{
m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType.ToString() + "." + name);
Name = name;
EngineType = engineType;
nearCallback = near;
triCallback = TriCallback;
triArrayCallback = TriArrayCallback;
@@ -572,12 +650,11 @@ namespace OpenSim.Region.PhysicsModule.ODE
}
#endif
// Initialize the mesh plugin
public override void Initialise(IMesher meshmerizer, IConfigSource config)
// Initialize from configs
private void InitialiseFromConfig(IConfigSource config)
{
InitializeExtraStats();
mesher = meshmerizer;
m_config = config;
// Defaults
@@ -1818,7 +1895,7 @@ namespace OpenSim.Region.PhysicsModule.ODE
}
catch (AccessViolationException)
{
m_log.ErrorFormat("[ODE SCENE]: Unable to space collide {0}", Name);
m_log.ErrorFormat("[ODE SCENE]: Unable to space collide {0}", PhysicsSceneName);
}
//float terrainheight = GetTerrainHeightAtXY(chr.Position.X, chr.Position.Y);
@@ -3082,7 +3159,7 @@ namespace OpenSim.Region.PhysicsModule.ODE
{
m_log.ErrorFormat(
"[ODE SCENE]: Removing physics character {0} {1} from physics scene {2} due to defect found when moving",
actor.Name, actor.LocalID, Name);
actor.Name, actor.LocalID, PhysicsSceneName);
RemoveCharacter(actor);
actor.DestroyOdeStructures();
@@ -3198,7 +3275,7 @@ namespace OpenSim.Region.PhysicsModule.ODE
{
m_log.ErrorFormat(
"[ODE SCENE]: Removing physics character {0} {1} from physics scene {2} due to defect found when updating position and velocity",
actor.Name, actor.LocalID, Name);
actor.Name, actor.LocalID, PhysicsSceneName);
RemoveCharacter(actor);
actor.DestroyOdeStructures();
@@ -3795,7 +3872,7 @@ namespace OpenSim.Region.PhysicsModule.ODE
private void SetTerrain(float[] heightMap, Vector3 pOffset)
{
int startTime = Util.EnvironmentTickCount();
m_log.DebugFormat("[ODE SCENE]: Setting terrain for {0} with offset {1}", Name, pOffset);
m_log.DebugFormat("[ODE SCENE]: Setting terrain for {0} with offset {1}", PhysicsSceneName, pOffset);
// this._heightmap[i] = (double)heightMap[i];
// dbm (danx0r) -- creating a buffer zone of one extra sample all around
@@ -3920,7 +3997,7 @@ namespace OpenSim.Region.PhysicsModule.ODE
}
m_log.DebugFormat(
"[ODE SCENE]: Setting terrain for {0} took {1}ms", Name, Util.EnvironmentTickCountSubtract(startTime));
"[ODE SCENE]: Setting terrain for {0} took {1}ms", PhysicsSceneName, Util.EnvironmentTickCountSubtract(startTime));
}
public override void DeleteTerrain()

8
OpenSim/Region/PhysicsModules/Ode/Tests/ODETestClass.cs
View File

@@ -43,7 +43,7 @@ namespace OpenSim.Region.PhysicsModule.ODE.Tests
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private OpenSim.Region.PhysicsModule.ODE.OdePlugin cbt;
//private OpenSim.Region.PhysicsModule.ODE.OdePlugin cbt;
private PhysicsScene ps;
private IMeshingPlugin imp;
@@ -55,11 +55,11 @@ namespace OpenSim.Region.PhysicsModule.ODE.Tests
config.Set("DecodedSculptMapPath","j2kDecodeCache");
// Loading ODEPlugin
cbt = new OdePlugin();
//cbt = new OdePlugin();
// Getting Physics Scene
ps = cbt.GetScene("test");
//ps = cbt.GetScene("test");
// Initializing Physics Scene.
ps.Initialise(imp.GetMesher(TopConfig),null);
//ps.Initialise(imp.GetMesher(TopConfig), null, Vector3.Zero);
float[] _heightmap = new float[(int)Constants.RegionSize * (int)Constants.RegionSize];
for (int i = 0; i < ((int)Constants.RegionSize * (int)Constants.RegionSize); i++)
{