diff options
* Optimized usings (the 'LL ate my scripts' commit)
* added some licensing info
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/ScenePresence.cs | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs index 8a8f5ae..dcca848 100644 --- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs | |||
@@ -28,14 +28,13 @@ | |||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.IO; | 30 | using System.IO; |
31 | using System.Text; | 31 | using Axiom.MathLib; |
32 | using libsecondlife; | 32 | using libsecondlife; |
33 | using libsecondlife.Packets; | 33 | using libsecondlife.Packets; |
34 | using OpenSim.Physics.Manager; | 34 | using OpenSim.Framework.Console; |
35 | using OpenSim.Framework.Inventory; | ||
36 | using OpenSim.Framework.Interfaces; | 35 | using OpenSim.Framework.Interfaces; |
37 | using OpenSim.Framework.Types; | 36 | using OpenSim.Framework.Types; |
38 | using Axiom.MathLib; | 37 | using OpenSim.Physics.Manager; |
39 | 38 | ||
40 | namespace OpenSim.Region.Environment.Scenes | 39 | namespace OpenSim.Region.Environment.Scenes |
41 | { | 40 | { |
@@ -53,7 +52,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
53 | private byte movementflag = 0; | 52 | private byte movementflag = 0; |
54 | private List<NewForce> forcesList = new List<NewForce>(); | 53 | private List<NewForce> forcesList = new List<NewForce>(); |
55 | private short _updateCount = 0; | 54 | private short _updateCount = 0; |
56 | private Axiom.MathLib.Quaternion bodyRot; | 55 | private Quaternion bodyRot; |
57 | private LLObject.TextureEntry avatarAppearanceTexture = null; | 56 | private LLObject.TextureEntry avatarAppearanceTexture = null; |
58 | private byte[] visualParams; | 57 | private byte[] visualParams; |
59 | private AvatarWearable[] Wearables; | 58 | private AvatarWearable[] Wearables; |
@@ -110,7 +109,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
110 | 109 | ||
111 | m_regionInfo = reginfo; | 110 | m_regionInfo = reginfo; |
112 | m_regionHandle = reginfo.RegionHandle; | 111 | m_regionHandle = reginfo.RegionHandle; |
113 | OpenSim.Framework.Console.MainLog.Instance.Verbose("Avatar.cs "); | 112 | MainLog.Instance.Verbose("Avatar.cs "); |
114 | ControllingClient = theClient; | 113 | ControllingClient = theClient; |
115 | this.firstname = ControllingClient.FirstName; | 114 | this.firstname = ControllingClient.FirstName; |
116 | this.lastname = ControllingClient.LastName; | 115 | this.lastname = ControllingClient.LastName; |
@@ -240,7 +239,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
240 | bool update_rotation = false; | 239 | bool update_rotation = false; |
241 | bool DCFlagKeyPressed = false; | 240 | bool DCFlagKeyPressed = false; |
242 | Vector3 agent_control_v3 = new Vector3(0, 0, 0); | 241 | Vector3 agent_control_v3 = new Vector3(0, 0, 0); |
243 | Axiom.MathLib.Quaternion q = new Axiom.MathLib.Quaternion(bodyRotation.W, bodyRotation.X, bodyRotation.Y, bodyRotation.Z); | 242 | Quaternion q = new Quaternion(bodyRotation.W, bodyRotation.X, bodyRotation.Y, bodyRotation.Z); |
244 | 243 | ||
245 | this.PhysActor.Flying = ((flags & (uint)MainAvatar.ControlFlags.AGENT_CONTROL_FLY) != 0); | 244 | this.PhysActor.Flying = ((flags & (uint)MainAvatar.ControlFlags.AGENT_CONTROL_FLY) != 0); |
246 | 245 | ||
@@ -278,10 +277,10 @@ namespace OpenSim.Region.Environment.Scenes | |||
278 | 277 | ||
279 | } | 278 | } |
280 | 279 | ||
281 | protected void AddNewMovement(Axiom.MathLib.Vector3 vec, Axiom.MathLib.Quaternion rotation) | 280 | protected void AddNewMovement(Vector3 vec, Quaternion rotation) |
282 | { | 281 | { |
283 | NewForce newVelocity = new NewForce(); | 282 | NewForce newVelocity = new NewForce(); |
284 | Axiom.MathLib.Vector3 direc = rotation * vec; | 283 | Vector3 direc = rotation * vec; |
285 | direc.Normalize(); | 284 | direc.Normalize(); |
286 | 285 | ||
287 | direc = direc * ((0.03f) * 128f); | 286 | direc = direc * ((0.03f) * 128f); |