From 2a3bdde0fa78c5a59c530e6d974dfd6709aa1519 Mon Sep 17 00:00:00 2001 From: Teravus Ovares Date: Wed, 23 Apr 2008 15:32:19 +0000 Subject: * 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 --- OpenSim/Region/Physics/Manager/PhysicsActor.cs | 5 +++++ OpenSim/Region/Physics/Manager/PhysicsVector.cs | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'OpenSim/Region/Physics/Manager') 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 public abstract void delink(); + public abstract void LockAngularMotion(PhysicsVector axis); + public virtual void RequestPhysicsterseUpdate() { // Make a temporary copy of the event to avoid possibility of @@ -347,6 +349,9 @@ namespace OpenSim.Region.Physics.Manager { } + public override void LockAngularMotion(PhysicsVector axis) + { + } public override void AddForce(PhysicsVector force) { 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 { PhysicsVector diff = this - v; float d = diff.length(); - if (d < tolerance) + if (d <= tolerance) return true; return false; -- cgit v1.1