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

* Removed Unused 'Entity' superclass

Browse Source
This commit is contained in:
lbsa71
2007-09-21 02:11:19 +00:00
parent ca611c6668
commit 3eb1a23ac1
2 changed files with 71 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
OpenSim/Region/Environment/Scenes/ScenePresence.cs
View File

@@ -38,7 +38,7 @@ using OpenSim.Region.Physics.Manager;
namespace OpenSim.Region.Environment.Scenes
{
public partial class ScenePresence : Entity
public partial class ScenePresence : EntityBase
{
public static AvatarAnimations Animations;
public static byte[] DefaultTexture;
@@ -132,11 +132,81 @@ namespace OpenSim.Region.Environment.Scenes
}
private readonly IClientAPI m_controllingClient;
protected PhysicsActor m_physicsActor;
public IClientAPI _ControllingClient
{
get { return m_controllingClient; }
}
public LLVector3 AbsolutePosition
{
get
{
if (m_physicsActor != null)
{
m_pos.X = m_physicsActor.Position.X;
m_pos.Y = m_physicsActor.Position.Y;
m_pos.Z = m_physicsActor.Position.Z;
}
return m_pos;
}
set
{
if (m_physicsActor != null)
{
try
{
lock (m_scene.SyncRoot)
{
m_physicsActor.Position = new PhysicsVector(value.X, value.Y, value.Z);
}
}
catch (Exception e)
{
Console.WriteLine(e.Message);
}
}
m_pos = value;
}
}
public LLVector3 Velocity
{
get
{
if (m_physicsActor != null)
{
m_velocity.X = m_physicsActor.Velocity.X;
m_velocity.Y = m_physicsActor.Velocity.Y;
m_velocity.Z = m_physicsActor.Velocity.Z;
}
return m_velocity;
}
set
{
if (m_physicsActor != null)
{
try
{
lock (m_scene.SyncRoot)
{
m_physicsActor.Velocity = new PhysicsVector(value.X, value.Y, value.Z);
}
}
catch (Exception e)
{
Console.WriteLine(e.Message);
}
}
m_velocity = value;
}
}
#endregion
#region Constructor(s)