ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-13 05:05:43 +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

54
OpenSim/Region/PhysicsModules/BulletS/BSPlugin.cs
View File

@@ -40,37 +40,37 @@ namespace OpenSim.Region.PhysicsModule.BulletS
/// The unmanaged library is compiled and linked statically with Bullet
/// to create BulletSim.dll and libBulletSim.so (for both 32 and 64 bit).
/// </summary>
public class BSPlugin : IPhysicsPlugin
{
//private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
//public class BSPlugin : IPhysicsPlugin
//{
// //private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
private BSScene _mScene;
// private BSScene _mScene;
public BSPlugin()
{
}
// public BSPlugin()
// {
// }
public bool Init()
{
return true;
}
// public bool Init()
// {
// return true;
// }
public PhysicsScene GetScene(String sceneIdentifier)
{
if (_mScene == null)
{
_mScene = new BSScene(GetName(), sceneIdentifier);
}
return (_mScene);
}
// public PhysicsScene GetScene(String sceneIdentifier)
// {
// if (_mScene == null)
// {
// _mScene = new BSScene(GetName(), sceneIdentifier);
// }
// return (_mScene);
// }
public string GetName()
{
return ("BulletSim");
}
// public string GetName()
// {
// return ("BulletSim");
// }
public void Dispose()
{
}
}
// public void Dispose()
// {
// }
//}
}

2329
OpenSim/Region/PhysicsModules/BulletS/BSScene.cs
View File

File diff suppressed because it is too large Load Diff

4
OpenSim/Region/PhysicsModules/BulletS/BSShapes.cs
View File

@@ -299,7 +299,7 @@ public abstract class BSShape
{
xprim.PrimAssetState = BSPhysObject.PrimAssetCondition.FailedAssetFetch;
physicsScene.Logger.ErrorFormat("{0} Physical object requires asset but no asset provider. Name={1}",
LogHeader, physicsScene.Name);
LogHeader, physicsScene.PhysicsSceneName);
}
}
else
@@ -336,7 +336,7 @@ public abstract class BSShape
if (pScene != null)
{
buff.Append("/rgn=");
buff.Append(pScene.Name);
buff.Append(pScene.PhysicsSceneName);
}
return buff.ToString();
}

1
OpenSim/Region/PhysicsModules/BulletS/BSTerrainHeightmap.cs
View File

@@ -30,7 +30,6 @@ using System.Text;
using OpenSim.Framework;
using OpenSim.Region.Framework;
using OpenSim.Region.CoreModules;
using OpenSim.Region.PhysicsModules.SharedBase;
using Nini.Config;

1
OpenSim/Region/PhysicsModules/BulletS/BSTerrainManager.cs
View File

@@ -30,7 +30,6 @@ using System.Text;
using OpenSim.Framework;
using OpenSim.Region.Framework;
using OpenSim.Region.CoreModules;
using OpenSim.Region.PhysicsModules.SharedBase;
using Nini.Config;

1
OpenSim/Region/PhysicsModules/BulletS/BSTerrainMesh.cs
View File

@@ -30,7 +30,6 @@ using System.Text;
using OpenSim.Framework;
using OpenSim.Region.Framework;
using OpenSim.Region.CoreModules;
using OpenSim.Region.PhysicsModules.SharedBase;
using Nini.Config;

3
OpenSim/Region/PhysicsModules/BulletS/Properties/AssemblyInfo.cs
View File

@@ -1,6 +1,7 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using Mono.Addins;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
@@ -31,3 +32,5 @@ using System.Runtime.InteropServices;
//
[assembly: AssemblyVersion("0.8.2.*")]
[assembly: Addin("OpenSim.Region.PhysicsModule.BulletS", OpenSim.VersionInfo.VersionNumber)]
[assembly: AddinDependency("OpenSim.Region.Framework", OpenSim.VersionInfo.VersionNumber)]