diff options
author | Teravus Ovares | 2007-11-20 04:38:08 +0000 |
---|---|---|
committer | Teravus Ovares | 2007-11-20 04:38:08 +0000 |
commit | 5a71d03b7ac1de0b599f651c62bf1e33a3d1745d (patch) | |
tree | dd85b6f7d5fb5069fd281a70dd79e6daf267a1bd /OpenSim/Region/Physics/Manager | |
parent | POS physics. tweaking stair-climbing which broke with my last change (diff) | |
download | opensim-SC-5a71d03b7ac1de0b599f651c62bf1e33a3d1745d.zip opensim-SC-5a71d03b7ac1de0b599f651c62bf1e33a3d1745d.tar.gz opensim-SC-5a71d03b7ac1de0b599f651c62bf1e33a3d1745d.tar.bz2 opensim-SC-5a71d03b7ac1de0b599f651c62bf1e33a3d1745d.tar.xz |
*Huge* structural changes in ODE/OdePrim to get all of the calls in threadlocked code. ODEPrim was almost completely re-written.
Copy/Space test needed.
Diffstat (limited to 'OpenSim/Region/Physics/Manager')
-rw-r--r-- | OpenSim/Region/Physics/Manager/PhysicsScene.cs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs index 6f19e72..651992c 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs | |||
@@ -51,6 +51,7 @@ namespace OpenSim.Region.Physics.Manager | |||
51 | PhysicsVector size, Quaternion rotation); //To be removed | 51 | PhysicsVector size, Quaternion rotation); //To be removed |
52 | public abstract PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, PhysicsVector position, | 52 | public abstract PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, PhysicsVector position, |
53 | PhysicsVector size, Quaternion rotation, bool isPhysical); | 53 | PhysicsVector size, Quaternion rotation, bool isPhysical); |
54 | public abstract void AddPhysicsActorTaint(PhysicsActor prim); | ||
54 | 55 | ||
55 | public abstract void Simulate(float timeStep); | 56 | public abstract void Simulate(float timeStep); |
56 | 57 | ||
@@ -104,7 +105,10 @@ namespace OpenSim.Region.Physics.Manager | |||
104 | MainLog.Instance.Verbose("NullPhysicsScene : AddPrim({0},{1})", position, size); | 105 | MainLog.Instance.Verbose("NullPhysicsScene : AddPrim({0},{1})", position, size); |
105 | return PhysicsActor.Null; | 106 | return PhysicsActor.Null; |
106 | } | 107 | } |
108 | public override void AddPhysicsActorTaint(PhysicsActor prim) | ||
109 | { | ||
107 | 110 | ||
111 | } | ||
108 | public override void Simulate(float timeStep) | 112 | public override void Simulate(float timeStep) |
109 | { | 113 | { |
110 | m_workIndicator = (m_workIndicator + 1)%10; | 114 | m_workIndicator = (m_workIndicator + 1)%10; |