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

Mantis#3218. Thank you kindly, TLaukkan (Tommil) for a patch that:

Browse Source 
* Added log4net dependency to physxplugin in prebuild.xml.
* Added missing m_log fields to classes.
* Replaced Console.WriteLine with appropriate m_log.Xxxx
* Tested that nant test target runs succesfully.
* Tested that local opensim sandbox starts up without errors.
This commit is contained in:
Charles Krinke
2009-02-22 20:52:55 +00:00
parent 913654f2c9
commit 8f55b9d735
117 changed files with 580 additions and 409 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs
View File

@@ -32,6 +32,8 @@ using OpenSim.Framework;
using OpenSim.Region.Physics.Manager;
using PhysXWrapper;
using Quaternion=OpenMetaverse.Quaternion;
using System.Reflection;
using log4net;
namespace OpenSim.Region.Physics.PhysXPlugin
{
@@ -40,6 +42,7 @@ namespace OpenSim.Region.Physics.PhysXPlugin
/// </summary>
public class PhysXPlugin : IPhysicsPlugin
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private PhysXScene _mScene;
public PhysXPlugin()
@@ -72,6 +75,7 @@ namespace OpenSim.Region.Physics.PhysXPlugin
public class PhysXScene : PhysicsScene
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private List<PhysXCharacter> _characters = new List<PhysXCharacter>();
private List<PhysXPrim> _prims = new List<PhysXPrim>();
private float[] _heightMap = null;
@@ -84,7 +88,7 @@ namespace OpenSim.Region.Physics.PhysXPlugin
//sceneIdentifier = _sceneIdentifier;
mySdk = NxPhysicsSDK.CreateSDK();
Console.WriteLine("Sdk created - now creating scene");
m_log.Info("Sdk created - now creating scene");
scene = mySdk.CreateScene();
}
@@ -174,7 +178,7 @@ namespace OpenSim.Region.Physics.PhysXPlugin
}
catch (Exception e)
{
Console.WriteLine(e.Message);
m_log.Error(e.Message);
}
return fps;
}
@@ -193,7 +197,7 @@ namespace OpenSim.Region.Physics.PhysXPlugin
{
if (_heightMap != null)
{
Console.WriteLine("PhysX - deleting old terrain");
m_log.Debug("PhysX - deleting old terrain");
scene.DeleteTerrain();
}
_heightMap = heightMap;