From e008c3e4a941eb3631976f77f38a82c7d8e04533 Mon Sep 17 00:00:00 2001 From: Teravus Ovares Date: Wed, 26 Dec 2007 00:57:37 +0000 Subject: * Added the ability to land automatically on prim by pressing the page down button when over them and colliding * Reverted the avatar portion of the inter-penetration physics scene explosion management, it needs more work. --- OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'OpenSim/Region/Physics/OdePlugin') diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs index b4336c3..83190c4 100644 --- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs +++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs @@ -296,9 +296,9 @@ namespace OpenSim.Region.Physics.OdePlugin if (p2.PhysicsActorType == (int)ActorTypes.Agent) { p2.CollidingObj = true; - contacts[i].depth = 0.003f; - p2.Velocity = p2.Velocity + new PhysicsVector(0, 0, 2.5f); - contacts[i].pos = new d.Vector3(contacts[i].pos.X + (p1.Size.X / 2), contacts[i].pos.Y + (p1.Size.Y / 2), contacts[i].pos.Z + (p1.Size.Z / 2)); + //contacts[i].depth = 0.003f; + //p2.Velocity = p2.Velocity + new PhysicsVector(0, 0, 2.5f); + //contacts[i].pos = new d.Vector3(contacts[i].pos.X + (p1.Size.X / 2), contacts[i].pos.Y + (p1.Size.Y / 2), contacts[i].pos.Z + (p1.Size.Z / 2)); } else @@ -308,13 +308,13 @@ namespace OpenSim.Region.Physics.OdePlugin if (p1.PhysicsActorType == (int)ActorTypes.Agent) { p1.CollidingObj = true; - contacts[i].depth = 0.003f; - p1.Velocity = p1.Velocity + new PhysicsVector(0, 0, 2.5f); - contacts[i].pos = new d.Vector3(contacts[i].pos.X + (p2.Size.X / 2), contacts[i].pos.Y + (p2.Size.Y / 2), contacts[i].pos.Z + (p2.Size.Z / 2)); + //contacts[i].depth = 0.003f; + //p1.Velocity = p1.Velocity + new PhysicsVector(0, 0, 2.5f); + //contacts[i].pos = new d.Vector3(contacts[i].pos.X + (p2.Size.X / 2), contacts[i].pos.Y + (p2.Size.Y / 2), contacts[i].pos.Z + (p2.Size.Z / 2)); } else { - contacts[i].depth = 0.0000000f; + //contacts[i].depth = 0.0000000f; } } // If you interpenetrate a prim with another prim -- cgit v1.1