diff options
author | Teravus Ovares | 2008-04-23 15:32:19 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-04-23 15:32:19 +0000 |
commit | 2a3bdde0fa78c5a59c530e6d974dfd6709aa1519 (patch) | |
tree | d2857d6fc06cde42bef42a731e115caf60add086 /OpenSim/Region/Physics/Manager | |
parent | Two small changes: (diff) | |
download | opensim-SC-2a3bdde0fa78c5a59c530e6d974dfd6709aa1519.zip opensim-SC-2a3bdde0fa78c5a59c530e6d974dfd6709aa1519.tar.gz opensim-SC-2a3bdde0fa78c5a59c530e6d974dfd6709aa1519.tar.bz2 opensim-SC-2a3bdde0fa78c5a59c530e6d974dfd6709aa1519.tar.xz |
* Adds llSetStatus(STATUS_ROTATE_X | STATUS_ROTATE_Y | STATUS_ROTATE_Z,TF)
* Currently if you apply that to only one or two axis you get unpredictable and sometimes explosive results.
* Three axis works well enough to play with it anyway. More work is needed here.
* Fixed an incorrectly named method in ODE.NET
Diffstat (limited to 'OpenSim/Region/Physics/Manager')
-rw-r--r-- | OpenSim/Region/Physics/Manager/PhysicsActor.cs | 5 | ||||
-rw-r--r-- | OpenSim/Region/Physics/Manager/PhysicsVector.cs | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/Manager/PhysicsActor.cs b/OpenSim/Region/Physics/Manager/PhysicsActor.cs index b40635c..f48f129 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsActor.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsActor.cs | |||
@@ -123,6 +123,8 @@ namespace OpenSim.Region.Physics.Manager | |||
123 | 123 | ||
124 | public abstract void delink(); | 124 | public abstract void delink(); |
125 | 125 | ||
126 | public abstract void LockAngularMotion(PhysicsVector axis); | ||
127 | |||
126 | public virtual void RequestPhysicsterseUpdate() | 128 | public virtual void RequestPhysicsterseUpdate() |
127 | { | 129 | { |
128 | // Make a temporary copy of the event to avoid possibility of | 130 | // Make a temporary copy of the event to avoid possibility of |
@@ -347,6 +349,9 @@ namespace OpenSim.Region.Physics.Manager | |||
347 | { | 349 | { |
348 | } | 350 | } |
349 | 351 | ||
352 | public override void LockAngularMotion(PhysicsVector axis) | ||
353 | { | ||
354 | } | ||
350 | 355 | ||
351 | public override void AddForce(PhysicsVector force) | 356 | public override void AddForce(PhysicsVector force) |
352 | { | 357 | { |
diff --git a/OpenSim/Region/Physics/Manager/PhysicsVector.cs b/OpenSim/Region/Physics/Manager/PhysicsVector.cs index a916e5e..4ec943c 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsVector.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsVector.cs | |||
@@ -149,7 +149,7 @@ namespace OpenSim.Region.Physics.Manager | |||
149 | { | 149 | { |
150 | PhysicsVector diff = this - v; | 150 | PhysicsVector diff = this - v; |
151 | float d = diff.length(); | 151 | float d = diff.length(); |
152 | if (d < tolerance) | 152 | if (d <= tolerance) |
153 | return true; | 153 | return true; |
154 | 154 | ||
155 | return false; | 155 | return false; |