From 8dd5f08b6e7d68663307b4346d19ceef711c8425 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Fri, 11 May 2012 15:53:31 +0100 Subject: revert terminal vel reduction. It helped but not efective --- OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'OpenSim/Region/Physics/UbitOdePlugin') diff --git a/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs index 43b4581..b0711d7 100644 --- a/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs +++ b/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs @@ -1006,9 +1006,9 @@ namespace OpenSim.Region.Physics.OdePlugin } } - if (velLengthSquared > 625.0f) // 25m/s apply breaks + if (velLengthSquared > 2500.0f) // 50m/s apply breaks { - breakfactor = 0.31f * m_mass; + breakfactor = 0.16f * m_mass; vec.X -= breakfactor * vel.X; vec.Y -= breakfactor * vel.Y; vec.Z -= breakfactor * vel.Z; -- cgit v1.1 From 46095c963c633ef7e690fc033d5e7213fa4ed46e Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Sat, 12 May 2012 12:17:28 +0100 Subject: ubitODE: trial workaround for avatar colisions --- OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs | 55 +++++++++++++++++++++--- 1 file changed, 49 insertions(+), 6 deletions(-) (limited to 'OpenSim/Region/Physics/UbitOdePlugin') diff --git a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs index e0de6cc..63462b1 100644 --- a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs +++ b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs @@ -537,7 +537,7 @@ namespace OpenSim.Region.Physics.OdePlugin // Essentially Steps * m_physicsiterations d.WorldSetQuickStepNumIterations(world, m_physicsiterations); - d.WorldSetContactMaxCorrectingVel(world, 50.0f); + d.WorldSetContactMaxCorrectingVel(world, 100.0f); spacesPerMeter = 1 / metersInSpace; spaceGridMaxX = (int)(WorldExtents.X * spacesPerMeter); @@ -754,14 +754,15 @@ namespace OpenSim.Region.Physics.OdePlugin } // big messy collision analises + + Vector3 normoverride = Vector3.Zero; //damm c# + float mu = 0; float bounce = 0; float cfm = 0.0001f; - float erp = 0.1f; float erpscale = 1.0f; float dscale = 1.0f; bool IgnoreNegSides = false; - ContactData contactdata1 = new ContactData(0, 0, false); ContactData contactdata2 = new ContactData(0, 0, false); @@ -770,14 +771,30 @@ namespace OpenSim.Region.Physics.OdePlugin bool dop1foot = false; bool dop2foot = false; bool ignore = false; + bool AvanormOverride = false; switch (p1.PhysicsActorType) { case (int)ActorTypes.Agent: { - bounce = 0; - mu = 0; - cfm = 0.0001f; + AvanormOverride = true; + Vector3 tmp = p2.Position - p1.Position; + normoverride = p2.Velocity - p1.Velocity; + mu = normoverride.LengthSquared(); + + if (mu > 1e-6) + { + mu = 1.0f / (float)Math.Sqrt(mu); + normoverride *= mu; + mu = Vector3.Dot(tmp, normoverride); + if (mu > 0) + normoverride *= -1; + } + else + { + tmp.Normalize(); + normoverride = -tmp; + } switch (p2.PhysicsActorType) { @@ -824,6 +841,25 @@ namespace OpenSim.Region.Physics.OdePlugin // p1.getContactData(ref contactdata1); // p2.getContactData(ref contactdata2); + AvanormOverride = true; + + Vector3 tmp = p2.Position - p1.Position; + normoverride = p2.Velocity - p1.Velocity; + mu = normoverride.LengthSquared(); + if (mu > 1e-6) + { + mu = 1.0f / (float)Math.Sqrt(mu); + normoverride *= mu; + mu = Vector3.Dot(tmp, normoverride); + if (mu > 0) + normoverride *= -1; + } + else + { + tmp.Normalize(); + normoverride = -tmp; + } + bounce = 0; mu = 0; cfm = 0.0001f; @@ -974,6 +1010,13 @@ namespace OpenSim.Region.Physics.OdePlugin if (dop2foot && (p2.Position.Z - curContact.pos.Z) > (p2.Size.Z - avCapRadius) * 0.5f) p2.IsColliding = true; + if (AvanormOverride && curContact.depth > 0.3f) + { + curContact.normal.X = normoverride.X; + curContact.normal.Y = normoverride.Y; + curContact.normal.Z = normoverride.Z; + } + Joint = CreateContacJoint(ref curContact, mu, bounce, cfm, erpscale, dscale); d.JointAttach(Joint, b1, b2); -- cgit v1.1 From 792e8db45695a6151c4e7d039b792bdfeb5c0f87 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Sat, 12 May 2012 13:44:47 +0100 Subject: ubitODE reduced again a bit the max allowed correction velocity on colisions, to reduce a bit bouncing inerent to colisions. --- OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'OpenSim/Region/Physics/UbitOdePlugin') diff --git a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs index 63462b1..7367719 100644 --- a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs +++ b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs @@ -537,7 +537,7 @@ namespace OpenSim.Region.Physics.OdePlugin // Essentially Steps * m_physicsiterations d.WorldSetQuickStepNumIterations(world, m_physicsiterations); - d.WorldSetContactMaxCorrectingVel(world, 100.0f); + d.WorldSetContactMaxCorrectingVel(world, 60.0f); spacesPerMeter = 1 / metersInSpace; spaceGridMaxX = (int)(WorldExtents.X * spacesPerMeter); -- cgit v1.1 From 4d98a291a2d1440afd8f7375d14842fd91d8083f Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Sat, 12 May 2012 14:00:08 +0100 Subject: ubitODE let vehicles responde faster to changes of some parameters like motors decay times --- .../Region/Physics/UbitOdePlugin/ODEDynamics.cs | 25 +++++++++++----------- 1 file changed, 13 insertions(+), 12 deletions(-) (limited to 'OpenSim/Region/Physics/UbitOdePlugin') diff --git a/OpenSim/Region/Physics/UbitOdePlugin/ODEDynamics.cs b/OpenSim/Region/Physics/UbitOdePlugin/ODEDynamics.cs index e88e559..56d0f1a 100644 --- a/OpenSim/Region/Physics/UbitOdePlugin/ODEDynamics.cs +++ b/OpenSim/Region/Physics/UbitOdePlugin/ODEDynamics.cs @@ -63,6 +63,9 @@ namespace OpenSim.Region.Physics.OdePlugin private OdeScene _pParentScene; // Vehicle properties + // WARNING this are working copies for internel use + // their values may not be the corresponding parameter + private Quaternion m_referenceFrame = Quaternion.Identity; // Axis modifier private Quaternion m_RollreferenceFrame = Quaternion.Identity; // what hell is this ? @@ -244,6 +247,7 @@ namespace OpenSim.Region.Physics.OdePlugin if (pValue < m_timestep) pValue = m_timestep; else if (pValue > 120) pValue = 120; m_angularMotorDecayTimescale = pValue * m_invtimestep; + m_amDecay = 1.0f - 1.0f / m_angularMotorDecayTimescale; break; case Vehicle.ANGULAR_MOTOR_TIMESCALE: if (pValue < m_timestep) pValue = m_timestep; @@ -293,6 +297,7 @@ namespace OpenSim.Region.Physics.OdePlugin if (pValue < m_timestep) pValue = m_timestep; else if (pValue > 120) pValue = 120; m_linearMotorDecayTimescale = (0.2f +pValue) * m_invtimestep; + m_lmDecay = (1.0f - 1.0f / m_linearMotorDecayTimescale); break; case Vehicle.LINEAR_MOTOR_TIMESCALE: if (pValue < m_timestep) pValue = m_timestep; @@ -320,7 +325,7 @@ namespace OpenSim.Region.Physics.OdePlugin if (len > 12.566f) m_angularMotorDirection *= (12.566f / len); - m_amEfect = 1.0f / m_angularMotorTimescale; // turn it on + m_amEfect = 1.0f ; // turn it on m_amDecay = 1.0f - 1.0f / m_angularMotorDecayTimescale; if (rootPrim.Body != IntPtr.Zero && !d.BodyIsEnabled(rootPrim.Body) @@ -338,7 +343,7 @@ namespace OpenSim.Region.Physics.OdePlugin m_linearMotorDirection *= (100.0f / len); m_lmDecay = 1.0f - 1.0f / m_linearMotorDecayTimescale; - m_lmEfect = 1.0f / m_linearMotorTimescale; // turn it on + m_lmEfect = 1.0f; // turn it on m_ffactor = 0.01f; if (rootPrim.Body != IntPtr.Zero && !d.BodyIsEnabled(rootPrim.Body) @@ -374,7 +379,7 @@ namespace OpenSim.Region.Physics.OdePlugin if (len > 12.566f) m_angularMotorDirection *= (12.566f / len); - m_amEfect = 1.0f / m_angularMotorTimescale; // turn it on + m_amEfect = 1.0f; // turn it on m_amDecay = 1.0f - 1.0f / m_angularMotorDecayTimescale; if (rootPrim.Body != IntPtr.Zero && !d.BodyIsEnabled(rootPrim.Body) @@ -393,11 +398,9 @@ namespace OpenSim.Region.Physics.OdePlugin if (len > 100.0f) m_linearMotorDirection *= (100.0f / len); - m_lmEfect = 1.0f / m_linearMotorTimescale; // turn it on + m_lmEfect = 1.0f; // turn it on m_lmDecay = 1.0f - 1.0f / m_linearMotorDecayTimescale; - - m_ffactor = 0.01f; if (rootPrim.Body != IntPtr.Zero && !d.BodyIsEnabled(rootPrim.Body) && !rootPrim.m_isSelected && !rootPrim.m_disabled) @@ -776,10 +779,10 @@ namespace OpenSim.Region.Physics.OdePlugin float ldampZ = 0; // linear motor - if (m_lmEfect > 0.001 && m_linearMotorTimescale < 1000) + if (m_lmEfect > 0.01 && m_linearMotorTimescale < 1000) { tmpV = m_linearMotorDirection - curLocalVel; // velocity error - tmpV *= m_lmEfect; // error to correct in this timestep + tmpV *= m_lmEfect / m_linearMotorTimescale; // error to correct in this timestep tmpV *= rotq; // to world if ((m_flags & VehicleFlag.LIMIT_MOTOR_UP) != 0) @@ -799,9 +802,7 @@ namespace OpenSim.Region.Physics.OdePlugin } m_lmEfect *= m_lmDecay; - - // m_ffactor = 0.01f + 1e-4f * curVel.LengthSquared(); - m_ffactor = 0; + m_ffactor = 0.01f + 1e-4f * curVel.LengthSquared(); } else { @@ -1007,7 +1008,7 @@ namespace OpenSim.Region.Physics.OdePlugin if (m_amEfect > 0.01 && m_angularMotorTimescale < 1000) { tmpV = m_angularMotorDirection - curLocalAngVel; // velocity error - tmpV *= m_amEfect; // error to correct in this timestep + tmpV *= m_amEfect / m_angularMotorTimescale; // error to correct in this timestep torque.X += tmpV.X * m_ampwr; torque.Y += tmpV.Y * m_ampwr; torque.Z += tmpV.Z; -- cgit v1.1 From 9870d7e4e787ca64011ef817ea2ab40310f4cf26 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Sun, 13 May 2012 01:28:20 +0100 Subject: ubitODE fix force in case of mlinear motor offset present --- OpenSim/Region/Physics/UbitOdePlugin/ODEDynamics.cs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'OpenSim/Region/Physics/UbitOdePlugin') diff --git a/OpenSim/Region/Physics/UbitOdePlugin/ODEDynamics.cs b/OpenSim/Region/Physics/UbitOdePlugin/ODEDynamics.cs index 56d0f1a..e27be1e 100644 --- a/OpenSim/Region/Physics/UbitOdePlugin/ODEDynamics.cs +++ b/OpenSim/Region/Physics/UbitOdePlugin/ODEDynamics.cs @@ -750,6 +750,9 @@ namespace OpenSim.Region.Physics.OdePlugin { IntPtr Body = rootPrim.Body; + d.Mass dmass; + d.BodyGetMass(Body, out dmass); + d.Quaternion rot = d.BodyGetQuaternion(Body); Quaternion objrotq = new Quaternion(rot.X, rot.Y, rot.Z, rot.W); // rotq = rotation of object Quaternion rotq = objrotq; // rotq = rotation of object @@ -791,7 +794,7 @@ namespace OpenSim.Region.Physics.OdePlugin if (m_linearMotorOffset.X != 0 || m_linearMotorOffset.Y != 0 || m_linearMotorOffset.Z != 0) { // have offset, do it now - tmpV *= rootPrim.Mass; + tmpV *= dmass.mass; d.BodyAddForceAtRelPos(Body, tmpV.X, tmpV.Y, tmpV.Z, m_linearMotorOffset.X, m_linearMotorOffset.Y, m_linearMotorOffset.Z); } else @@ -1058,13 +1061,11 @@ namespace OpenSim.Region.Physics.OdePlugin } - d.Mass dmass; - d.BodyGetMass(Body,out dmass); if (force.X != 0 || force.Y != 0 || force.Z != 0) { force *= dmass.mass; - d.BodySetForce(Body, force.X, force.Y, force.Z); + d.BodyAddForce(Body, force.X, force.Y, force.Z); } if (torque.X != 0 || torque.Y != 0 || torque.Z != 0) -- cgit v1.1