From efd90b56b761219af6425b1c7a2cdd3b6ffb4de2 Mon Sep 17 00:00:00 2001 From: lbsa71 Date: Thu, 27 Dec 2007 21:41:48 +0000 Subject: * Optimized usings * shortened references * Removed redundant 'this' * Normalized EOF --- OpenSim/Region/Physics/Manager/AssemblyInfo.cs | 2 +- OpenSim/Region/Physics/Manager/IMesher.cs | 9 +- OpenSim/Region/Physics/Manager/PhysicsActor.cs | 101 ++++++++++++--------- .../Region/Physics/Manager/PhysicsPluginManager.cs | 8 +- OpenSim/Region/Physics/Manager/PhysicsScene.cs | 15 +-- OpenSim/Region/Physics/Manager/PhysicsVector.cs | 15 ++- OpenSim/Region/Physics/Manager/ZeroMesher.cs | 9 +- 7 files changed, 82 insertions(+), 77 deletions(-) (limited to 'OpenSim/Region/Physics/Manager') diff --git a/OpenSim/Region/Physics/Manager/AssemblyInfo.cs b/OpenSim/Region/Physics/Manager/AssemblyInfo.cs index 3d95d6d..983a2b9 100644 --- a/OpenSim/Region/Physics/Manager/AssemblyInfo.cs +++ b/OpenSim/Region/Physics/Manager/AssemblyInfo.cs @@ -55,4 +55,4 @@ using System.Runtime.InteropServices; // You can specify all values by your own or you can build default build and revision // numbers with the '*' character (the default): -[assembly : AssemblyVersion("1.0.*")] +[assembly : AssemblyVersion("1.0.*")] \ No newline at end of file diff --git a/OpenSim/Region/Physics/Manager/IMesher.cs b/OpenSim/Region/Physics/Manager/IMesher.cs index 1648a98..80b3320 100644 --- a/OpenSim/Region/Physics/Manager/IMesher.cs +++ b/OpenSim/Region/Physics/Manager/IMesher.cs @@ -28,8 +28,6 @@ using System; using System.Collections.Generic; -using System.Text; - using OpenSim.Framework; namespace OpenSim.Region.Physics.Manager @@ -39,7 +37,8 @@ namespace OpenSim.Region.Physics.Manager IMesh CreateMesh(String primName, PrimitiveBaseShape primShape, PhysicsVector size); } - public interface IVertex { + public interface IVertex + { } public interface IMesh @@ -48,7 +47,5 @@ namespace OpenSim.Region.Physics.Manager int[] getIndexListAsInt(); int[] getIndexListAsIntLocked(); float[] getVertexListAsFloatLocked(); - - } -} +} \ No newline at end of file diff --git a/OpenSim/Region/Physics/Manager/PhysicsActor.cs b/OpenSim/Region/Physics/Manager/PhysicsActor.cs index 5894ab0..d393b62 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsActor.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsActor.cs @@ -25,10 +25,10 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * */ -using Axiom.Math; -using OpenSim.Framework; using System; using System.Collections.Generic; +using Axiom.Math; +using OpenSim.Framework; namespace OpenSim.Region.Physics.Manager { @@ -37,14 +37,16 @@ namespace OpenSim.Region.Physics.Manager public delegate void VelocityUpdate(PhysicsVector velocity); public delegate void OrientationUpdate(Quaternion orientation); + public enum ActorTypes : int { Unknown = 0, Agent = 1, - Prim = 2, + Prim = 2, Ground = 3 } - public class CollisionEventUpdate : EventArgs + + public class CollisionEventUpdate : EventArgs { // Raising the event on the object, so don't need to provide location.. further up the tree knows that info. @@ -53,52 +55,53 @@ namespace OpenSim.Region.Physics.Manager public bool m_startOrEnd; //public uint m_LocalID; public List m_objCollisionList; + public CollisionEventUpdate(uint localID, int colliderType, bool startOrEnd, List objCollisionList) { m_colliderType = colliderType; m_startOrEnd = startOrEnd; m_objCollisionList = objCollisionList; - } - public CollisionEventUpdate(bool startOrEnd){ - m_colliderType = (int)ActorTypes.Unknown; + + public CollisionEventUpdate(bool startOrEnd) + { + m_colliderType = (int) ActorTypes.Unknown; m_startOrEnd = startOrEnd; m_objCollisionList = null; } - public CollisionEventUpdate() { - m_colliderType = (int)ActorTypes.Unknown; + + public CollisionEventUpdate() + { + m_colliderType = (int) ActorTypes.Unknown; m_startOrEnd = false; m_objCollisionList = null; } - public int collidertype{ - get { - return m_colliderType; - } - set { - m_colliderType = value; - } + + public int collidertype + { + get { return m_colliderType; } + set { m_colliderType = value; } } - public bool startOrEnd { - get { - return m_startOrEnd; - } - set { - m_startOrEnd = value; - } + + public bool startOrEnd + { + get { return m_startOrEnd; } + set { m_startOrEnd = value; } } - public void addCollider(uint localID) { + + public void addCollider(uint localID) + { m_objCollisionList.Add(localID); } } - - - public abstract class PhysicsActor - { + { public delegate void RequestTerseUpdate(); + public delegate void CollisionUpdate(EventArgs e); + public delegate void OutOfBounds(PhysicsVector pos); #pragma warning disable 67 @@ -117,10 +120,8 @@ namespace OpenSim.Region.Physics.Manager public abstract PhysicsVector Size { get; set; } - public abstract PrimitiveBaseShape Shape - { - set; - } + public abstract PrimitiveBaseShape Shape { set; } + public virtual void RequestPhysicsterseUpdate() { // Make a temporary copy of the event to avoid possibility of @@ -131,8 +132,8 @@ namespace OpenSim.Region.Physics.Manager { OnRequestTerseUpdate(); } - } + public virtual void RaiseOutOfBounds(PhysicsVector pos) { // Make a temporary copy of the event to avoid possibility of @@ -143,8 +144,8 @@ namespace OpenSim.Region.Physics.Manager { OnOutOfBounds(pos); } - } + public virtual void SendCollisionUpdate(EventArgs e) { CollisionUpdate handler = OnCollisionUpdate; @@ -159,7 +160,7 @@ namespace OpenSim.Region.Physics.Manager public abstract float Mass { get; } - public abstract PhysicsVector Force { get;} + public abstract PhysicsVector Force { get; } public abstract PhysicsVector GeometricCenter { get; } @@ -172,7 +173,7 @@ namespace OpenSim.Region.Physics.Manager public abstract Quaternion Orientation { get; set; } public abstract int PhysicsActorType { get; set; } - public abstract bool IsPhysical {get; set;} + public abstract bool IsPhysical { get; set; } public abstract bool Flying { get; set; } public abstract bool SetAlwaysRun { get; set; } @@ -198,48 +199,54 @@ namespace OpenSim.Region.Physics.Manager get { return PhysicsVector.Zero; } set { return; } } + public override bool SetAlwaysRun { get { return false; } set { return; } } + public override bool CollidingGround { - get {return false;} - set {return;} + get { return false; } + set { return; } } - public override bool CollidingObj + + public override bool CollidingObj { get { return false; } set { return; } } + public override PhysicsVector Size { get { return PhysicsVector.Zero; } set { return; } } + public override float Mass { get { return 0f; } } + public override PhysicsVector Force { get { return PhysicsVector.Zero; } } + public override PhysicsVector CenterOfMass { get { return PhysicsVector.Zero; } } + public override PhysicsVector GeometricCenter { get { return PhysicsVector.Zero; } } + public override PrimitiveBaseShape Shape { - set - { - return; - } + set { return; } } public override PhysicsVector Velocity @@ -270,6 +277,7 @@ namespace OpenSim.Region.Physics.Manager get { return false; } set { return; } } + public override bool ThrottleUpdates { get { return false; } @@ -281,9 +289,10 @@ namespace OpenSim.Region.Physics.Manager get { return false; } set { return; } } + public override int PhysicsActorType { - get { return (int)ActorTypes.Unknown; } + get { return (int) ActorTypes.Unknown; } set { return; } } @@ -297,14 +306,16 @@ namespace OpenSim.Region.Physics.Manager { return; } + public override PhysicsVector RotationalVelocity { get { return PhysicsVector.Zero; } set { return; } } + public override void SetMomentum(PhysicsVector momentum) { return; } } -} +} \ No newline at end of file diff --git a/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs b/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs index badcc04..a4ac54f 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs @@ -30,7 +30,6 @@ using System.Collections.Generic; using System.IO; using System.Reflection; using OpenSim.Framework.Console; -using Nini.Config; namespace OpenSim.Region.Physics.Manager { @@ -91,7 +90,7 @@ namespace OpenSim.Region.Physics.Manager plugHard = new ZeroMesherPlugin(); _MeshPlugins.Add(plugHard.GetName(), plugHard); MainLog.Instance.Verbose("PHYSICS", "Added meshing engine: " + plugHard.GetName()); - + // And now walk all assemblies (DLLs effectively) and see if they are home // of a plugin that is of interest for us string path = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Physics"); @@ -129,7 +128,7 @@ namespace OpenSim.Region.Physics.Manager if (meshTypeInterface != null) { IMeshingPlugin plug = - (IMeshingPlugin)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString())); + (IMeshingPlugin) Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString())); _MeshPlugins.Add(plug.GetName(), plug); MainLog.Instance.Verbose("PHYSICS", "Added meshing engine: " + plug.GetName()); } @@ -155,6 +154,7 @@ namespace OpenSim.Region.Physics.Manager MainLog.Instance.Verbose("PHYSICS", message); } } + //--- } @@ -171,4 +171,4 @@ namespace OpenSim.Region.Physics.Manager string GetName(); IMesher GetMesher(); } -} +} \ No newline at end of file diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs index c63a66d..37481f1 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs @@ -28,7 +28,6 @@ using Axiom.Math; using OpenSim.Framework; using OpenSim.Framework.Console; -using OpenSim.Region.Physics.Manager; namespace OpenSim.Region.Physics.Manager { @@ -45,6 +44,7 @@ namespace OpenSim.Region.Physics.Manager { get { return new NullPhysicsScene(); } } + public virtual void TriggerPhysicsBasedRestart() { physicsCrash handler = OnPhysicsCrash; @@ -52,9 +52,8 @@ namespace OpenSim.Region.Physics.Manager { OnPhysicsCrash(); } - } - + public abstract void Initialise(IMesher meshmerizer); @@ -68,6 +67,7 @@ namespace OpenSim.Region.Physics.Manager PhysicsVector size, Quaternion rotation); //To be removed public abstract PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, PhysicsVector position, PhysicsVector size, Quaternion rotation, bool isPhysical); + public abstract void AddPhysicsActorTaint(PhysicsActor prim); public abstract float Simulate(float timeStep); @@ -111,21 +111,24 @@ namespace OpenSim.Region.Physics.Manager return PhysicsActor.Null; } */ + public override PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, PhysicsVector position, PhysicsVector size, Quaternion rotation) //To be removed { - return this.AddPrimShape(primName, pbs, position, size, rotation, false); + return AddPrimShape(primName, pbs, position, size, rotation, false); } + public override PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, PhysicsVector position, PhysicsVector size, Quaternion rotation, bool isPhysical) { MainLog.Instance.Verbose("PHYSICS", "NullPhysicsScene : AddPrim({0},{1})", position, size); return PhysicsActor.Null; } + public override void AddPhysicsActorTaint(PhysicsActor prim) { - } + public override float Simulate(float timeStep) { m_workIndicator = (m_workIndicator + 1)%10; @@ -154,4 +157,4 @@ namespace OpenSim.Region.Physics.Manager } } } -} +} \ No newline at end of file diff --git a/OpenSim/Region/Physics/Manager/PhysicsVector.cs b/OpenSim/Region/Physics/Manager/PhysicsVector.cs index be82fca..1f5d0dc 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsVector.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsVector.cs @@ -28,7 +28,6 @@ using System; - namespace OpenSim.Region.Physics.Manager { public class PhysicsVector @@ -68,27 +67,27 @@ namespace OpenSim.Region.Physics.Manager public static PhysicsVector cross(PhysicsVector a, PhysicsVector b) { - return new PhysicsVector(a.Y * b.Z - a.Z * b.Y, a.Z * b.X - a.X * b.Z, a.X * b.Y - a.Y * b.X); + return new PhysicsVector(a.Y*b.Z - a.Z*b.Y, a.Z*b.X - a.X*b.Z, a.X*b.Y - a.Y*b.X); } public float length() { - return (float)Math.Sqrt(X*X + Y*Y + Z*Z); + return (float) Math.Sqrt(X*X + Y*Y + Z*Z); } - public static PhysicsVector operator / (PhysicsVector v, float f) + public static PhysicsVector operator /(PhysicsVector v, float f) { - return new PhysicsVector(v.X / f, v.Y / f, v.Z / f); + return new PhysicsVector(v.X/f, v.Y/f, v.Z/f); } public static PhysicsVector operator *(PhysicsVector v, float f) { - return new PhysicsVector(v.X * f, v.Y * f, v.Z * f); + return new PhysicsVector(v.X*f, v.Y*f, v.Z*f); } public static PhysicsVector operator *(float f, PhysicsVector v) { - return v * f; + return v*f; } public virtual bool IsIdentical(PhysicsVector v, float tolerance) @@ -101,4 +100,4 @@ namespace OpenSim.Region.Physics.Manager return false; } } -} +} \ No newline at end of file diff --git a/OpenSim/Region/Physics/Manager/ZeroMesher.cs b/OpenSim/Region/Physics/Manager/ZeroMesher.cs index a88656e..7dae4ac 100644 --- a/OpenSim/Region/Physics/Manager/ZeroMesher.cs +++ b/OpenSim/Region/Physics/Manager/ZeroMesher.cs @@ -27,11 +27,8 @@ */ using System; -using System.Collections.Generic; -using System.Text; using OpenSim.Framework; - /* * This is the zero mesher. * Whatever you want him to mesh, he can't, telling you that by responding with a null pointer. @@ -62,13 +59,11 @@ namespace OpenSim.Region.Physics.Manager } } - public class ZeroMesher: IMesher + public class ZeroMesher : IMesher { - public IMesh CreateMesh(String primName, PrimitiveBaseShape primShape, PhysicsVector size) { return null; } } - -} +} \ No newline at end of file -- cgit v1.1