commit
03e7bc1526
|
@ -81,6 +81,9 @@ namespace OpenSim.Data.SQLite
|
||||||
/// <param name="dbconnect">connect string</param>
|
/// <param name="dbconnect">connect string</param>
|
||||||
override public void Initialise(string dbconnect)
|
override public void Initialise(string dbconnect)
|
||||||
{
|
{
|
||||||
|
if (Util.IsWindows())
|
||||||
|
Util.LoadArchSpecificWindowsDll("sqlite3.dll");
|
||||||
|
|
||||||
if (dbconnect == string.Empty)
|
if (dbconnect == string.Empty)
|
||||||
{
|
{
|
||||||
dbconnect = "URI=file:Asset.db,version=3";
|
dbconnect = "URI=file:Asset.db,version=3";
|
||||||
|
|
|
@ -65,6 +65,9 @@ namespace OpenSim.Data.SQLite
|
||||||
|
|
||||||
if (!m_initialized)
|
if (!m_initialized)
|
||||||
{
|
{
|
||||||
|
if (Util.IsWindows())
|
||||||
|
Util.LoadArchSpecificWindowsDll("sqlite3.dll");
|
||||||
|
|
||||||
m_Connection = new SqliteConnection(connectionString);
|
m_Connection = new SqliteConnection(connectionString);
|
||||||
m_Connection.Open();
|
m_Connection.Open();
|
||||||
|
|
||||||
|
|
|
@ -69,6 +69,9 @@ namespace OpenSim.Data.SQLite
|
||||||
|
|
||||||
public void Initialise(string connectionString)
|
public void Initialise(string connectionString)
|
||||||
{
|
{
|
||||||
|
if (Util.IsWindows())
|
||||||
|
Util.LoadArchSpecificWindowsDll("sqlite3.dll");
|
||||||
|
|
||||||
m_connectionString = connectionString;
|
m_connectionString = connectionString;
|
||||||
|
|
||||||
m_log.Info("[ESTATE DB]: Sqlite - connecting: "+m_connectionString);
|
m_log.Info("[ESTATE DB]: Sqlite - connecting: "+m_connectionString);
|
||||||
|
|
|
@ -48,6 +48,8 @@ namespace OpenSim.Data.SQLite
|
||||||
|
|
||||||
protected SQLiteFramework(string connectionString)
|
protected SQLiteFramework(string connectionString)
|
||||||
{
|
{
|
||||||
|
if (Util.IsWindows())
|
||||||
|
Util.LoadArchSpecificWindowsDll("sqlite3.dll");
|
||||||
}
|
}
|
||||||
|
|
||||||
//////////////////////////////////////////////////////////////
|
//////////////////////////////////////////////////////////////
|
||||||
|
|
|
@ -77,6 +77,9 @@ namespace OpenSim.Data.SQLite
|
||||||
{
|
{
|
||||||
m_Initialized = true;
|
m_Initialized = true;
|
||||||
|
|
||||||
|
if (Util.IsWindows())
|
||||||
|
Util.LoadArchSpecificWindowsDll("sqlite3.dll");
|
||||||
|
|
||||||
if (dbconnect == string.Empty)
|
if (dbconnect == string.Empty)
|
||||||
{
|
{
|
||||||
dbconnect = "URI=file:inventoryStore.db,version=3";
|
dbconnect = "URI=file:inventoryStore.db,version=3";
|
||||||
|
|
|
@ -110,6 +110,9 @@ namespace OpenSim.Data.SQLite
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
if (Util.IsWindows())
|
||||||
|
Util.LoadArchSpecificWindowsDll("sqlite3.dll");
|
||||||
|
|
||||||
m_connectionString = connectionString;
|
m_connectionString = connectionString;
|
||||||
|
|
||||||
ds = new DataSet("Region");
|
ds = new DataSet("Region");
|
||||||
|
|
|
@ -52,6 +52,9 @@ namespace OpenSim.Data.SQLite
|
||||||
|
|
||||||
public SQLiteXInventoryData(string conn, string realm)
|
public SQLiteXInventoryData(string conn, string realm)
|
||||||
{
|
{
|
||||||
|
if (Util.IsWindows())
|
||||||
|
Util.LoadArchSpecificWindowsDll("sqlite3.dll");
|
||||||
|
|
||||||
m_Folders = new SQLiteGenericTableHandler<XInventoryFolder>(
|
m_Folders = new SQLiteGenericTableHandler<XInventoryFolder>(
|
||||||
conn, "inventoryfolders", "XInventoryStore");
|
conn, "inventoryfolders", "XInventoryStore");
|
||||||
m_Items = new SqliteItemHandler(
|
m_Items = new SqliteItemHandler(
|
||||||
|
|
|
@ -392,6 +392,36 @@ namespace OpenSim.Framework
|
||||||
|| platformId == PlatformID.WinCE);
|
|| platformId == PlatformID.WinCE);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static bool LoadArchSpecificWindowsDll(string libraryName)
|
||||||
|
{
|
||||||
|
// We do this so that OpenSimulator on Windows loads the correct native 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 config files.
|
||||||
|
string nativeLibraryPath;
|
||||||
|
|
||||||
|
if (Util.Is64BitProcess())
|
||||||
|
nativeLibraryPath = "lib64/" + libraryName;
|
||||||
|
else
|
||||||
|
nativeLibraryPath = "lib32/" + libraryName;
|
||||||
|
|
||||||
|
m_log.DebugFormat("[UTIL]: Loading native Windows library at {0}", nativeLibraryPath);
|
||||||
|
|
||||||
|
if (Util.LoadLibrary(nativeLibraryPath) == IntPtr.Zero)
|
||||||
|
{
|
||||||
|
m_log.ErrorFormat(
|
||||||
|
"[UTIL]: Couldn't find native Windows library at {0}", nativeLibraryPath);
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public static bool IsEnvironmentSupported(ref string reason)
|
public static bool IsEnvironmentSupported(ref string reason)
|
||||||
{
|
{
|
||||||
// Must have .NET 2.0 (Generics / libsl)
|
// Must have .NET 2.0 (Generics / libsl)
|
||||||
|
|
|
@ -890,16 +890,16 @@ namespace OpenSim.Region.Framework.Scenes
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
ForEachRootScenePresence(delegate(ScenePresence agent)
|
ForEachRootScenePresence(delegate(ScenePresence agent)
|
||||||
{
|
{
|
||||||
//agent.ControllingClient.new
|
//agent.ControllingClient.new
|
||||||
//this.CommsManager.InterRegion.InformRegionOfChildAgent(otherRegion.RegionHandle, agent.ControllingClient.RequestClientInfo());
|
//this.CommsManager.InterRegion.InformRegionOfChildAgent(otherRegion.RegionHandle, agent.ControllingClient.RequestClientInfo());
|
||||||
|
|
||||||
List<ulong> old = new List<ulong>();
|
List<ulong> old = new List<ulong>();
|
||||||
old.Add(otherRegion.RegionHandle);
|
old.Add(otherRegion.RegionHandle);
|
||||||
agent.DropOldNeighbours(old);
|
agent.DropOldNeighbours(old);
|
||||||
if (m_teleportModule != null)
|
if (m_teleportModule != null && agent.PresenceType != PresenceType.Npc)
|
||||||
m_teleportModule.EnableChildAgent(agent, otherRegion);
|
m_teleportModule.EnableChildAgent(agent, otherRegion);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
catch (NullReferenceException)
|
catch (NullReferenceException)
|
||||||
{
|
{
|
||||||
|
@ -907,7 +907,6 @@ namespace OpenSim.Region.Framework.Scenes
|
||||||
// This shouldn't happen too often anymore.
|
// This shouldn't happen too often anymore.
|
||||||
m_log.Error("[SCENE]: Couldn't inform client of regionup because we got a null reference exception");
|
m_log.Error("[SCENE]: Couldn't inform client of regionup because we got a null reference exception");
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -1035,10 +1034,10 @@ namespace OpenSim.Region.Framework.Scenes
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
ForEachRootScenePresence(delegate(ScenePresence agent)
|
ForEachRootScenePresence(delegate(ScenePresence agent)
|
||||||
{
|
{
|
||||||
if (m_teleportModule != null)
|
if (m_teleportModule != null && agent.PresenceType != PresenceType.Npc)
|
||||||
m_teleportModule.EnableChildAgent(agent, r);
|
m_teleportModule.EnableChildAgent(agent, r);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
catch (NullReferenceException)
|
catch (NullReferenceException)
|
||||||
{
|
{
|
||||||
|
|
|
@ -51,6 +51,9 @@ public class BSPlugin : IPhysicsPlugin
|
||||||
{
|
{
|
||||||
if (_mScene == null)
|
if (_mScene == null)
|
||||||
{
|
{
|
||||||
|
if (Util.IsWindows())
|
||||||
|
Util.LoadArchSpecificWindowsDll("BulletSim.dll");
|
||||||
|
|
||||||
_mScene = new BSScene(sceneIdentifier);
|
_mScene = new BSScene(sceneIdentifier);
|
||||||
}
|
}
|
||||||
return (_mScene);
|
return (_mScene);
|
||||||
|
|
|
@ -66,20 +66,7 @@ namespace OpenSim.Region.Physics.OdePlugin
|
||||||
// This isn't necessary for other platforms (e.g. Mac OSX and Linux) since the DLL used can be
|
// 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
|
// controlled in Ode.NET.dll.config
|
||||||
if (Util.IsWindows())
|
if (Util.IsWindows())
|
||||||
{
|
Util.LoadArchSpecificWindowsDll("ode.dll");
|
||||||
string nativeLibraryPath;
|
|
||||||
|
|
||||||
if (Util.Is64BitProcess())
|
|
||||||
nativeLibraryPath = "lib64/ode.dll";
|
|
||||||
else
|
|
||||||
nativeLibraryPath = "lib32/ode.dll";
|
|
||||||
|
|
||||||
m_log.DebugFormat("[ODE PLUGIN]: Loading native Windows ODE library at {0}", nativeLibraryPath);
|
|
||||||
|
|
||||||
if (Util.LoadLibrary(nativeLibraryPath) == IntPtr.Zero)
|
|
||||||
m_log.ErrorFormat(
|
|
||||||
"[ODE PLUGIN]: Couldn't find native Windows ODE library at {0}", nativeLibraryPath);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Initializing ODE only when a scene is created allows alternative ODE plugins to co-habit (according to
|
// 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).
|
// http://opensimulator.org/mantis/view.php?id=2750).
|
||||||
|
|
|
@ -1,58 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright (c) Contributors, http://opensimulator.org/
|
|
||||||
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted provided that the following conditions are met:
|
|
||||||
* * Redistributions of source code must retain the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer.
|
|
||||||
* * Redistributions in binary form must reproduce the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer in the
|
|
||||||
* documentation and/or other materials provided with the distribution.
|
|
||||||
* * Neither the name of the OpenSimulator Project nor the
|
|
||||||
* names of its contributors may be used to endorse or promote products
|
|
||||||
* derived from this software without specific prior written permission.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
|
|
||||||
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
|
||||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
|
||||||
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
|
|
||||||
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
|
||||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
|
||||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
|
||||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
||||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
|
||||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
using System.Reflection;
|
|
||||||
using System.Runtime.InteropServices;
|
|
||||||
|
|
||||||
// Information about this assembly is defined by the following
|
|
||||||
// attributes.
|
|
||||||
//
|
|
||||||
// change them to the information which is associated with the assembly
|
|
||||||
// you compile.
|
|
||||||
|
|
||||||
[assembly : AssemblyTitle("RealPhysXplugin")]
|
|
||||||
[assembly : AssemblyDescription("")]
|
|
||||||
[assembly : AssemblyConfiguration("")]
|
|
||||||
[assembly : AssemblyCompany("http://opensimulator.org")]
|
|
||||||
[assembly : AssemblyProduct("RealPhysXplugin")]
|
|
||||||
[assembly : AssemblyCopyright("Copyright (c) OpenSimulator.org Developers 2007-2009")]
|
|
||||||
[assembly : AssemblyTrademark("")]
|
|
||||||
[assembly : AssemblyCulture("")]
|
|
||||||
|
|
||||||
// This sets the default COM visibility of types in the assembly to invisible.
|
|
||||||
// If you need to expose a type to COM, use [ComVisible(true)] on that type.
|
|
||||||
|
|
||||||
[assembly : ComVisible(false)]
|
|
||||||
|
|
||||||
// The assembly version has following format :
|
|
||||||
//
|
|
||||||
// Major.Minor.Build.Revision
|
|
||||||
//
|
|
||||||
// You can specify all values by your own or you can build default build and revision
|
|
||||||
// numbers with the '*' character (the default):
|
|
||||||
|
|
||||||
[assembly : AssemblyVersion("0.6.5.*")]
|
|
|
@ -1,349 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright (c) Contributors, http://opensimulator.org/
|
|
||||||
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted provided that the following conditions are met:
|
|
||||||
* * Redistributions of source code must retain the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer.
|
|
||||||
* * Redistributions in binary form must reproduce the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer in the
|
|
||||||
* documentation and/or other materials provided with the distribution.
|
|
||||||
* * Neither the name of the OpenSimulator Project nor the
|
|
||||||
* names of its contributors may be used to endorse or promote products
|
|
||||||
* derived from this software without specific prior written permission.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
|
|
||||||
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
|
||||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
|
||||||
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
|
|
||||||
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
|
||||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
|
||||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
|
||||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
||||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
|
||||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using Nini.Config;
|
|
||||||
using OpenSim.Framework;
|
|
||||||
using OpenSim.Region.Physics.Manager;
|
|
||||||
using PhysXWrapper;
|
|
||||||
using Quaternion=OpenMetaverse.Quaternion;
|
|
||||||
using System.Reflection;
|
|
||||||
using log4net;
|
|
||||||
using OpenMetaverse;
|
|
||||||
|
|
||||||
namespace OpenSim.Region.Physics.PhysXPlugin
|
|
||||||
{
|
|
||||||
public class PhysXCharacter : PhysicsActor
|
|
||||||
{
|
|
||||||
private Vector3 _position;
|
|
||||||
private Vector3 _velocity;
|
|
||||||
private Vector3 m_rotationalVelocity = Vector3.Zero;
|
|
||||||
private Vector3 _acceleration;
|
|
||||||
private NxCharacter _character;
|
|
||||||
private bool flying;
|
|
||||||
private bool iscolliding = false;
|
|
||||||
private float gravityAccel;
|
|
||||||
|
|
||||||
public PhysXCharacter(NxCharacter character)
|
|
||||||
{
|
|
||||||
_character = character;
|
|
||||||
}
|
|
||||||
|
|
||||||
public override int PhysicsActorType
|
|
||||||
{
|
|
||||||
get { return (int) ActorTypes.Agent; }
|
|
||||||
set { return; }
|
|
||||||
}
|
|
||||||
|
|
||||||
public override bool SetAlwaysRun
|
|
||||||
{
|
|
||||||
get { return false; }
|
|
||||||
set { return; }
|
|
||||||
}
|
|
||||||
|
|
||||||
public override uint LocalID
|
|
||||||
{
|
|
||||||
set { return; }
|
|
||||||
}
|
|
||||||
|
|
||||||
public override bool Grabbed
|
|
||||||
{
|
|
||||||
set { return; }
|
|
||||||
}
|
|
||||||
|
|
||||||
public override bool Selected
|
|
||||||
{
|
|
||||||
set { return; }
|
|
||||||
}
|
|
||||||
|
|
||||||
public override float Buoyancy
|
|
||||||
{
|
|
||||||
get { return 0f; }
|
|
||||||
set { return; }
|
|
||||||
}
|
|
||||||
|
|
||||||
public override bool FloatOnWater
|
|
||||||
{
|
|
||||||
set { return; }
|
|
||||||
}
|
|
||||||
|
|
||||||
public override bool IsPhysical
|
|
||||||
{
|
|
||||||
get { return false; }
|
|
||||||
set { return; }
|
|
||||||
}
|
|
||||||
|
|
||||||
public override bool ThrottleUpdates
|
|
||||||
{
|
|
||||||
get { return false; }
|
|
||||||
set { return; }
|
|
||||||
}
|
|
||||||
|
|
||||||
public override bool Flying
|
|
||||||
{
|
|
||||||
get { return flying; }
|
|
||||||
set { flying = value; }
|
|
||||||
}
|
|
||||||
|
|
||||||
public override bool IsColliding
|
|
||||||
{
|
|
||||||
get { return iscolliding; }
|
|
||||||
set { iscolliding = value; }
|
|
||||||
}
|
|
||||||
|
|
||||||
public override bool CollidingGround
|
|
||||||
{
|
|
||||||
get { return false; }
|
|
||||||
set { return; }
|
|
||||||
}
|
|
||||||
|
|
||||||
public override bool CollidingObj
|
|
||||||
{
|
|
||||||
get { return false; }
|
|
||||||
set { return; }
|
|
||||||
}
|
|
||||||
|
|
||||||
public override Vector3 RotationalVelocity
|
|
||||||
{
|
|
||||||
get { return m_rotationalVelocity; }
|
|
||||||
set { m_rotationalVelocity = value; }
|
|
||||||
}
|
|
||||||
|
|
||||||
public override bool Stopped
|
|
||||||
{
|
|
||||||
get { return false; }
|
|
||||||
}
|
|
||||||
|
|
||||||
public override Vector3 Position
|
|
||||||
{
|
|
||||||
get { return _position; }
|
|
||||||
set
|
|
||||||
{
|
|
||||||
_position = value;
|
|
||||||
Vec3 ps = new Vec3();
|
|
||||||
ps.X = value.X;
|
|
||||||
ps.Y = value.Y;
|
|
||||||
ps.Z = value.Z;
|
|
||||||
_character.Position = ps;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public override Vector3 Size
|
|
||||||
{
|
|
||||||
get { return Vector3.Zero; }
|
|
||||||
set { }
|
|
||||||
}
|
|
||||||
|
|
||||||
public override float Mass
|
|
||||||
{
|
|
||||||
get { return 0f; }
|
|
||||||
}
|
|
||||||
|
|
||||||
public override Vector3 Force
|
|
||||||
{
|
|
||||||
get { return Vector3.Zero; }
|
|
||||||
set { return; }
|
|
||||||
}
|
|
||||||
|
|
||||||
public override int VehicleType
|
|
||||||
{
|
|
||||||
get { return 0; }
|
|
||||||
set { return; }
|
|
||||||
}
|
|
||||||
|
|
||||||
public override void VehicleFloatParam(int param, float value)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
public override void VehicleVectorParam(int param, Vector3 value)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
public override void VehicleRotationParam(int param, Quaternion rotation)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
public override void VehicleFlags(int param, bool remove)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
public override void SetVolumeDetect(int param)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
public override Vector3 CenterOfMass
|
|
||||||
{
|
|
||||||
get { return Vector3.Zero; }
|
|
||||||
}
|
|
||||||
|
|
||||||
public override Vector3 GeometricCenter
|
|
||||||
{
|
|
||||||
get { return Vector3.Zero; }
|
|
||||||
}
|
|
||||||
|
|
||||||
public override Vector3 Velocity
|
|
||||||
{
|
|
||||||
get { return _velocity; }
|
|
||||||
set { _velocity = value; }
|
|
||||||
}
|
|
||||||
|
|
||||||
public override float CollisionScore
|
|
||||||
{
|
|
||||||
get { return 0f; }
|
|
||||||
set { }
|
|
||||||
}
|
|
||||||
|
|
||||||
public override bool Kinematic
|
|
||||||
{
|
|
||||||
get { return false; }
|
|
||||||
set { }
|
|
||||||
}
|
|
||||||
|
|
||||||
public override Quaternion Orientation
|
|
||||||
{
|
|
||||||
get { return Quaternion.Identity; }
|
|
||||||
set { }
|
|
||||||
}
|
|
||||||
|
|
||||||
public override Vector3 Acceleration
|
|
||||||
{
|
|
||||||
get { return _acceleration; }
|
|
||||||
set { _acceleration = value; }
|
|
||||||
}
|
|
||||||
|
|
||||||
public override void AddForce(Vector3 force, bool pushforce)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
public override Vector3 Torque
|
|
||||||
{
|
|
||||||
get { return Vector3.Zero; }
|
|
||||||
set { return; }
|
|
||||||
}
|
|
||||||
|
|
||||||
public override void AddAngularForce(Vector3 force, bool pushforce)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
public override void link(PhysicsActor obj)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
public override void delink()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
public override void LockAngularMotion(Vector3 axis)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
public override void SetMomentum(Vector3 momentum)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
public void Move(float timeStep)
|
|
||||||
{
|
|
||||||
Vec3 vec = new Vec3();
|
|
||||||
vec.X = _velocity.X*timeStep;
|
|
||||||
vec.Y = _velocity.Y*timeStep;
|
|
||||||
if (flying)
|
|
||||||
{
|
|
||||||
vec.Z = (_velocity.Z)*timeStep;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
gravityAccel += -9.8f;
|
|
||||||
vec.Z = (gravityAccel + _velocity.Z)*timeStep;
|
|
||||||
}
|
|
||||||
int res = _character.Move(vec);
|
|
||||||
if (res == 1)
|
|
||||||
{
|
|
||||||
gravityAccel = 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public override PrimitiveBaseShape Shape
|
|
||||||
{
|
|
||||||
set { return; }
|
|
||||||
}
|
|
||||||
|
|
||||||
public void UpdatePosition()
|
|
||||||
{
|
|
||||||
Vec3 vec = _character.Position;
|
|
||||||
_position.X = vec.X;
|
|
||||||
_position.Y = vec.Y;
|
|
||||||
_position.Z = vec.Z;
|
|
||||||
}
|
|
||||||
|
|
||||||
public override void CrossingFailure()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
public override Vector3 PIDTarget { set { return; } }
|
|
||||||
public override bool PIDActive { set { return; } }
|
|
||||||
public override float PIDTau { set { return; } }
|
|
||||||
|
|
||||||
public override float PIDHoverHeight { set { return; } }
|
|
||||||
public override bool PIDHoverActive { set { return; } }
|
|
||||||
public override PIDHoverType PIDHoverType { set { return; } }
|
|
||||||
public override float PIDHoverTau { set { return; } }
|
|
||||||
|
|
||||||
public override Quaternion APIDTarget
|
|
||||||
{
|
|
||||||
set { return; }
|
|
||||||
}
|
|
||||||
|
|
||||||
public override bool APIDActive
|
|
||||||
{
|
|
||||||
set { return; }
|
|
||||||
}
|
|
||||||
|
|
||||||
public override float APIDStrength
|
|
||||||
{
|
|
||||||
set { return; }
|
|
||||||
}
|
|
||||||
|
|
||||||
public override float APIDDamping
|
|
||||||
{
|
|
||||||
set { return; }
|
|
||||||
}
|
|
||||||
|
|
||||||
public override void SubscribeEvents(int ms)
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
public override void UnSubscribeEvents()
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
public override bool SubscribedEvents()
|
|
||||||
{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,341 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright (c) Contributors, http://opensimulator.org/
|
|
||||||
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted provided that the following conditions are met:
|
|
||||||
* * Redistributions of source code must retain the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer.
|
|
||||||
* * Redistributions in binary form must reproduce the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer in the
|
|
||||||
* documentation and/or other materials provided with the distribution.
|
|
||||||
* * Neither the name of the OpenSimulator Project nor the
|
|
||||||
* names of its contributors may be used to endorse or promote products
|
|
||||||
* derived from this software without specific prior written permission.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
|
|
||||||
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
|
||||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
|
||||||
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
|
|
||||||
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
|
||||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
|
||||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
|
||||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
||||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
|
||||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using Nini.Config;
|
|
||||||
using OpenSim.Framework;
|
|
||||||
using OpenSim.Region.Physics.Manager;
|
|
||||||
using PhysXWrapper;
|
|
||||||
using Quaternion=OpenMetaverse.Quaternion;
|
|
||||||
using System.Reflection;
|
|
||||||
using log4net;
|
|
||||||
using OpenMetaverse;
|
|
||||||
|
|
||||||
namespace OpenSim.Region.Physics.PhysXPlugin
|
|
||||||
{
|
|
||||||
public class PhysXPrim : PhysicsActor
|
|
||||||
{
|
|
||||||
private Vector3 _velocity;
|
|
||||||
private Vector3 _acceleration;
|
|
||||||
private Vector3 m_rotationalVelocity;
|
|
||||||
private NxActor _prim;
|
|
||||||
|
|
||||||
public PhysXPrim(NxActor prim)
|
|
||||||
{
|
|
||||||
_velocity = Vector3.Zero;
|
|
||||||
_acceleration = Vector3.Zero;
|
|
||||||
_prim = prim;
|
|
||||||
}
|
|
||||||
|
|
||||||
public override int PhysicsActorType
|
|
||||||
{
|
|
||||||
get { return (int) ActorTypes.Prim; }
|
|
||||||
set { return; }
|
|
||||||
}
|
|
||||||
|
|
||||||
public override bool IsPhysical
|
|
||||||
{
|
|
||||||
get { return false; }
|
|
||||||
set { return; }
|
|
||||||
}
|
|
||||||
|
|
||||||
public override bool SetAlwaysRun
|
|
||||||
{
|
|
||||||
get { return false; }
|
|
||||||
set { return; }
|
|
||||||
}
|
|
||||||
|
|
||||||
public override uint LocalID
|
|
||||||
{
|
|
||||||
set { return; }
|
|
||||||
}
|
|
||||||
|
|
||||||
public override bool Grabbed
|
|
||||||
{
|
|
||||||
set { return; }
|
|
||||||
}
|
|
||||||
|
|
||||||
public override bool Selected
|
|
||||||
{
|
|
||||||
set { return; }
|
|
||||||
}
|
|
||||||
|
|
||||||
public override float Buoyancy
|
|
||||||
{
|
|
||||||
get { return 0f; }
|
|
||||||
set { return; }
|
|
||||||
}
|
|
||||||
|
|
||||||
public override bool FloatOnWater
|
|
||||||
{
|
|
||||||
set { return; }
|
|
||||||
}
|
|
||||||
|
|
||||||
public override bool ThrottleUpdates
|
|
||||||
{
|
|
||||||
get { return false; }
|
|
||||||
set { return; }
|
|
||||||
}
|
|
||||||
|
|
||||||
public override Vector3 RotationalVelocity
|
|
||||||
{
|
|
||||||
get { return m_rotationalVelocity; }
|
|
||||||
set { m_rotationalVelocity = value; }
|
|
||||||
}
|
|
||||||
|
|
||||||
public override bool Flying
|
|
||||||
{
|
|
||||||
get { return false; //no flying prims for you
|
|
||||||
}
|
|
||||||
set { }
|
|
||||||
}
|
|
||||||
|
|
||||||
public override bool IsColliding
|
|
||||||
{
|
|
||||||
get { return false; }
|
|
||||||
set { }
|
|
||||||
}
|
|
||||||
|
|
||||||
public override bool CollidingGround
|
|
||||||
{
|
|
||||||
get { return false; }
|
|
||||||
set { return; }
|
|
||||||
}
|
|
||||||
|
|
||||||
public override bool CollidingObj
|
|
||||||
{
|
|
||||||
get { return false; }
|
|
||||||
set { return; }
|
|
||||||
}
|
|
||||||
|
|
||||||
public override bool Stopped
|
|
||||||
{
|
|
||||||
get { return false; }
|
|
||||||
}
|
|
||||||
|
|
||||||
public override Vector3 Position
|
|
||||||
{
|
|
||||||
get
|
|
||||||
{
|
|
||||||
Vector3 pos = Vector3.Zero;
|
|
||||||
Vec3 vec = _prim.Position;
|
|
||||||
pos.X = vec.X;
|
|
||||||
pos.Y = vec.Y;
|
|
||||||
pos.Z = vec.Z;
|
|
||||||
return pos;
|
|
||||||
}
|
|
||||||
set
|
|
||||||
{
|
|
||||||
Vector3 vec = value;
|
|
||||||
Vec3 pos = new Vec3();
|
|
||||||
pos.X = vec.X;
|
|
||||||
pos.Y = vec.Y;
|
|
||||||
pos.Z = vec.Z;
|
|
||||||
_prim.Position = pos;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public override PrimitiveBaseShape Shape
|
|
||||||
{
|
|
||||||
set { return; }
|
|
||||||
}
|
|
||||||
|
|
||||||
public override Vector3 Velocity
|
|
||||||
{
|
|
||||||
get { return _velocity; }
|
|
||||||
set { _velocity = value; }
|
|
||||||
}
|
|
||||||
|
|
||||||
public override Vector3 Torque
|
|
||||||
{
|
|
||||||
get { return Vector3.Zero; }
|
|
||||||
set { return; }
|
|
||||||
}
|
|
||||||
|
|
||||||
public override float CollisionScore
|
|
||||||
{
|
|
||||||
get { return 0f; }
|
|
||||||
set { }
|
|
||||||
}
|
|
||||||
|
|
||||||
public override bool Kinematic
|
|
||||||
{
|
|
||||||
get { return _prim.Kinematic; }
|
|
||||||
set { _prim.Kinematic = value; }
|
|
||||||
}
|
|
||||||
|
|
||||||
public override Quaternion Orientation
|
|
||||||
{
|
|
||||||
get
|
|
||||||
{
|
|
||||||
Quaternion res;
|
|
||||||
PhysXWrapper.Quaternion quat = _prim.GetOrientation();
|
|
||||||
res.W = quat.W;
|
|
||||||
res.X = quat.X;
|
|
||||||
res.Y = quat.Y;
|
|
||||||
res.Z = quat.Z;
|
|
||||||
return res;
|
|
||||||
}
|
|
||||||
set { }
|
|
||||||
}
|
|
||||||
|
|
||||||
public override Vector3 Acceleration
|
|
||||||
{
|
|
||||||
get { return _acceleration; }
|
|
||||||
set { _acceleration = value; }
|
|
||||||
}
|
|
||||||
|
|
||||||
public override void AddForce(Vector3 force, bool pushforce)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
public override void AddAngularForce(Vector3 force, bool pushforce)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
public override void SetMomentum(Vector3 momentum)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
public override Vector3 Size
|
|
||||||
{
|
|
||||||
get { return Vector3.Zero; }
|
|
||||||
set { }
|
|
||||||
}
|
|
||||||
|
|
||||||
public override void link(PhysicsActor obj)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
public override void delink()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
public override void LockAngularMotion(Vector3 axis)
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
public override float Mass
|
|
||||||
{
|
|
||||||
get { return 0f; }
|
|
||||||
}
|
|
||||||
|
|
||||||
public override Vector3 Force
|
|
||||||
{
|
|
||||||
get { return Vector3.Zero; }
|
|
||||||
set { return; }
|
|
||||||
}
|
|
||||||
|
|
||||||
public override int VehicleType
|
|
||||||
{
|
|
||||||
get { return 0; }
|
|
||||||
set { return; }
|
|
||||||
}
|
|
||||||
|
|
||||||
public override void VehicleFloatParam(int param, float value)
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
public override void VehicleVectorParam(int param, Vector3 value)
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
public override void VehicleRotationParam(int param, Quaternion rotation)
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
public override void VehicleFlags(int param, bool remove) { }
|
|
||||||
|
|
||||||
public override void SetVolumeDetect(int param)
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
public override Vector3 CenterOfMass
|
|
||||||
{
|
|
||||||
get { return Vector3.Zero; }
|
|
||||||
}
|
|
||||||
|
|
||||||
public override Vector3 GeometricCenter
|
|
||||||
{
|
|
||||||
get { return Vector3.Zero; }
|
|
||||||
}
|
|
||||||
|
|
||||||
public override void CrossingFailure()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
public override Vector3 PIDTarget { set { return; } }
|
|
||||||
public override bool PIDActive { set { return; } }
|
|
||||||
public override float PIDTau { set { return; } }
|
|
||||||
|
|
||||||
public override float PIDHoverHeight { set { return; } }
|
|
||||||
public override bool PIDHoverActive { set { return; } }
|
|
||||||
public override PIDHoverType PIDHoverType { set { return; } }
|
|
||||||
public override float PIDHoverTau { set { return; } }
|
|
||||||
|
|
||||||
public override Quaternion APIDTarget
|
|
||||||
{
|
|
||||||
set { return; }
|
|
||||||
}
|
|
||||||
|
|
||||||
public override bool APIDActive
|
|
||||||
{
|
|
||||||
set { return; }
|
|
||||||
}
|
|
||||||
|
|
||||||
public override float APIDStrength
|
|
||||||
{
|
|
||||||
set { return; }
|
|
||||||
}
|
|
||||||
|
|
||||||
public override float APIDDamping
|
|
||||||
{
|
|
||||||
set { return; }
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
public override void SubscribeEvents(int ms)
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
public override void UnSubscribeEvents()
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
public override bool SubscribedEvents()
|
|
||||||
{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,177 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright (c) Contributors, http://opensimulator.org/
|
|
||||||
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted provided that the following conditions are met:
|
|
||||||
* * Redistributions of source code must retain the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer.
|
|
||||||
* * Redistributions in binary form must reproduce the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer in the
|
|
||||||
* documentation and/or other materials provided with the distribution.
|
|
||||||
* * Neither the name of the OpenSimulator Project nor the
|
|
||||||
* names of its contributors may be used to endorse or promote products
|
|
||||||
* derived from this software without specific prior written permission.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
|
|
||||||
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
|
||||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
|
||||||
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
|
|
||||||
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
|
||||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
|
||||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
|
||||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
||||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
|
||||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using Nini.Config;
|
|
||||||
using OpenSim.Framework;
|
|
||||||
using OpenSim.Region.Physics.Manager;
|
|
||||||
using PhysXWrapper;
|
|
||||||
using Quaternion=OpenMetaverse.Quaternion;
|
|
||||||
using System.Reflection;
|
|
||||||
using log4net;
|
|
||||||
using OpenMetaverse;
|
|
||||||
|
|
||||||
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;
|
|
||||||
private NxPhysicsSDK mySdk;
|
|
||||||
private NxScene scene;
|
|
||||||
|
|
||||||
// protected internal string sceneIdentifier;
|
|
||||||
public PhysXScene(string _sceneIdentifier)
|
|
||||||
{
|
|
||||||
//sceneIdentifier = _sceneIdentifier;
|
|
||||||
|
|
||||||
mySdk = NxPhysicsSDK.CreateSDK();
|
|
||||||
m_log.Info("Sdk created - now creating scene");
|
|
||||||
scene = mySdk.CreateScene();
|
|
||||||
}
|
|
||||||
|
|
||||||
public override void Initialise(IMesher meshmerizer, IConfigSource config)
|
|
||||||
{
|
|
||||||
// Does nothing right now
|
|
||||||
}
|
|
||||||
public override void Dispose()
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
public override void SetWaterLevel(float baseheight)
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
public override PhysicsActor AddAvatar(string avName, Vector3 position, Vector3 size, bool isFlying)
|
|
||||||
{
|
|
||||||
Vec3 pos = new Vec3();
|
|
||||||
pos.X = position.X;
|
|
||||||
pos.Y = position.Y;
|
|
||||||
pos.Z = position.Z;
|
|
||||||
PhysXCharacter act = new PhysXCharacter(scene.AddCharacter(pos));
|
|
||||||
act.Flying = isFlying;
|
|
||||||
act.Position = position;
|
|
||||||
_characters.Add(act);
|
|
||||||
return act;
|
|
||||||
}
|
|
||||||
|
|
||||||
public override void RemovePrim(PhysicsActor prim)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
public override void RemoveAvatar(PhysicsActor actor)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
private PhysicsActor AddPrim(Vector3 position, Vector3 size, Quaternion rotation)
|
|
||||||
{
|
|
||||||
Vec3 pos = new Vec3();
|
|
||||||
pos.X = position.X;
|
|
||||||
pos.Y = position.Y;
|
|
||||||
pos.Z = position.Z;
|
|
||||||
Vec3 siz = new Vec3();
|
|
||||||
siz.X = size.X;
|
|
||||||
siz.Y = size.Y;
|
|
||||||
siz.Z = size.Z;
|
|
||||||
PhysXPrim act = new PhysXPrim(scene.AddNewBox(pos, siz));
|
|
||||||
_prims.Add(act);
|
|
||||||
return act;
|
|
||||||
}
|
|
||||||
|
|
||||||
public override PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position,
|
|
||||||
Vector3 size, Quaternion rotation, bool isPhysical, uint localid)
|
|
||||||
{
|
|
||||||
return AddPrim(position, size, rotation);
|
|
||||||
}
|
|
||||||
|
|
||||||
public override void AddPhysicsActorTaint(PhysicsActor prim)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
public override float Simulate(float timeStep)
|
|
||||||
{
|
|
||||||
float fps = 0f;
|
|
||||||
try
|
|
||||||
{
|
|
||||||
foreach (PhysXCharacter actor in _characters)
|
|
||||||
{
|
|
||||||
actor.Move(timeStep);
|
|
||||||
}
|
|
||||||
scene.Simulate(timeStep);
|
|
||||||
scene.FetchResults();
|
|
||||||
scene.UpdateControllers();
|
|
||||||
|
|
||||||
foreach (PhysXCharacter actor in _characters)
|
|
||||||
{
|
|
||||||
actor.UpdatePosition();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
catch (Exception e)
|
|
||||||
{
|
|
||||||
m_log.Error(e.Message);
|
|
||||||
}
|
|
||||||
return fps;
|
|
||||||
}
|
|
||||||
|
|
||||||
public override void GetResults()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
public override bool IsThreaded
|
|
||||||
{
|
|
||||||
// for now we won't be multithreaded
|
|
||||||
get { return (false); }
|
|
||||||
}
|
|
||||||
|
|
||||||
public override void SetTerrain(float[] heightMap)
|
|
||||||
{
|
|
||||||
if (_heightMap != null)
|
|
||||||
{
|
|
||||||
m_log.Debug("PhysX - deleting old terrain");
|
|
||||||
scene.DeleteTerrain();
|
|
||||||
}
|
|
||||||
_heightMap = heightMap;
|
|
||||||
scene.AddTerrain(heightMap);
|
|
||||||
}
|
|
||||||
|
|
||||||
public override void DeleteTerrain()
|
|
||||||
{
|
|
||||||
scene.DeleteTerrain();
|
|
||||||
}
|
|
||||||
|
|
||||||
public override Dictionary<uint, float> GetTopColliders()
|
|
||||||
{
|
|
||||||
Dictionary<uint, float> returncolliders = new Dictionary<uint, float>();
|
|
||||||
return returncolliders;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
25
prebuild.xml
25
prebuild.xml
|
@ -521,31 +521,6 @@
|
||||||
</Files>
|
</Files>
|
||||||
</Project>
|
</Project>
|
||||||
|
|
||||||
<Project frameworkVersion="v3_5" name="OpenSim.Region.Physics.PhysXPlugin" path="OpenSim/Region/Physics/PhysXPlugin" type="Library">
|
|
||||||
<Configuration name="Debug">
|
|
||||||
<Options>
|
|
||||||
<OutputPath>../../../../bin/Physics/</OutputPath>
|
|
||||||
</Options>
|
|
||||||
</Configuration>
|
|
||||||
<Configuration name="Release">
|
|
||||||
<Options>
|
|
||||||
<OutputPath>../../../../bin/Physics/</OutputPath>
|
|
||||||
</Options>
|
|
||||||
</Configuration>
|
|
||||||
|
|
||||||
<ReferencePath>../../../../bin/</ReferencePath>
|
|
||||||
<Reference name="System"/>
|
|
||||||
<Reference name="OpenMetaverseTypes" path="../../../../bin/"/>
|
|
||||||
<Reference name="Nini" path="../../../../bin/"/>
|
|
||||||
<Reference name="PhysX_Wrapper_Dotnet" path="../../../../bin/"/>
|
|
||||||
<Reference name="OpenSim.Framework"/>
|
|
||||||
<Reference name="OpenSim.Region.Physics.Manager"/>
|
|
||||||
<Reference name="log4net" path="../../../../bin/"/>
|
|
||||||
<Files>
|
|
||||||
<Match pattern="*.cs" recurse="true"/>
|
|
||||||
</Files>
|
|
||||||
</Project>
|
|
||||||
|
|
||||||
<Project frameworkVersion="v3_5" name="OpenSim.Region.Physics.OdePlugin" path="OpenSim/Region/Physics/OdePlugin" type="Library">
|
<Project frameworkVersion="v3_5" name="OpenSim.Region.Physics.OdePlugin" path="OpenSim/Region/Physics/OdePlugin" type="Library">
|
||||||
<Configuration name="Debug">
|
<Configuration name="Debug">
|
||||||
<Options>
|
<Options>
|
||||||
|
|
Loading…
Reference in New Issue