diff options
Diffstat (limited to 'OpenSim/Region/Physics/Manager/PhysicsScene.cs')
-rw-r--r-- | OpenSim/Region/Physics/Manager/PhysicsScene.cs | 15 |
1 files changed, 9 insertions, 6 deletions
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 @@ | |||
28 | using Axiom.Math; | 28 | using Axiom.Math; |
29 | using OpenSim.Framework; | 29 | using OpenSim.Framework; |
30 | using OpenSim.Framework.Console; | 30 | using OpenSim.Framework.Console; |
31 | using OpenSim.Region.Physics.Manager; | ||
32 | 31 | ||
33 | namespace OpenSim.Region.Physics.Manager | 32 | namespace OpenSim.Region.Physics.Manager |
34 | { | 33 | { |
@@ -45,6 +44,7 @@ namespace OpenSim.Region.Physics.Manager | |||
45 | { | 44 | { |
46 | get { return new NullPhysicsScene(); } | 45 | get { return new NullPhysicsScene(); } |
47 | } | 46 | } |
47 | |||
48 | public virtual void TriggerPhysicsBasedRestart() | 48 | public virtual void TriggerPhysicsBasedRestart() |
49 | { | 49 | { |
50 | physicsCrash handler = OnPhysicsCrash; | 50 | physicsCrash handler = OnPhysicsCrash; |
@@ -52,9 +52,8 @@ namespace OpenSim.Region.Physics.Manager | |||
52 | { | 52 | { |
53 | OnPhysicsCrash(); | 53 | OnPhysicsCrash(); |
54 | } | 54 | } |
55 | |||
56 | } | 55 | } |
57 | 56 | ||
58 | 57 | ||
59 | public abstract void Initialise(IMesher meshmerizer); | 58 | public abstract void Initialise(IMesher meshmerizer); |
60 | 59 | ||
@@ -68,6 +67,7 @@ namespace OpenSim.Region.Physics.Manager | |||
68 | PhysicsVector size, Quaternion rotation); //To be removed | 67 | PhysicsVector size, Quaternion rotation); //To be removed |
69 | public abstract PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, PhysicsVector position, | 68 | public abstract PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, PhysicsVector position, |
70 | PhysicsVector size, Quaternion rotation, bool isPhysical); | 69 | PhysicsVector size, Quaternion rotation, bool isPhysical); |
70 | |||
71 | public abstract void AddPhysicsActorTaint(PhysicsActor prim); | 71 | public abstract void AddPhysicsActorTaint(PhysicsActor prim); |
72 | 72 | ||
73 | public abstract float Simulate(float timeStep); | 73 | public abstract float Simulate(float timeStep); |
@@ -111,21 +111,24 @@ namespace OpenSim.Region.Physics.Manager | |||
111 | return PhysicsActor.Null; | 111 | return PhysicsActor.Null; |
112 | } | 112 | } |
113 | */ | 113 | */ |
114 | |||
114 | public override PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, PhysicsVector position, | 115 | public override PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, PhysicsVector position, |
115 | PhysicsVector size, Quaternion rotation) //To be removed | 116 | PhysicsVector size, Quaternion rotation) //To be removed |
116 | { | 117 | { |
117 | return this.AddPrimShape(primName, pbs, position, size, rotation, false); | 118 | return AddPrimShape(primName, pbs, position, size, rotation, false); |
118 | } | 119 | } |
120 | |||
119 | public override PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, PhysicsVector position, | 121 | public override PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, PhysicsVector position, |
120 | PhysicsVector size, Quaternion rotation, bool isPhysical) | 122 | PhysicsVector size, Quaternion rotation, bool isPhysical) |
121 | { | 123 | { |
122 | MainLog.Instance.Verbose("PHYSICS", "NullPhysicsScene : AddPrim({0},{1})", position, size); | 124 | MainLog.Instance.Verbose("PHYSICS", "NullPhysicsScene : AddPrim({0},{1})", position, size); |
123 | return PhysicsActor.Null; | 125 | return PhysicsActor.Null; |
124 | } | 126 | } |
127 | |||
125 | public override void AddPhysicsActorTaint(PhysicsActor prim) | 128 | public override void AddPhysicsActorTaint(PhysicsActor prim) |
126 | { | 129 | { |
127 | |||
128 | } | 130 | } |
131 | |||
129 | public override float Simulate(float timeStep) | 132 | public override float Simulate(float timeStep) |
130 | { | 133 | { |
131 | m_workIndicator = (m_workIndicator + 1)%10; | 134 | m_workIndicator = (m_workIndicator + 1)%10; |
@@ -154,4 +157,4 @@ namespace OpenSim.Region.Physics.Manager | |||
154 | } | 157 | } |
155 | } | 158 | } |
156 | } | 159 | } |
157 | } | 160 | } \ No newline at end of file |