ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-11 11:57:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

* Added some limits to the maximum force applied per second by llMoveToTarget. Currently, it's 350 times the mass in newtons applied per second, maximum.

Browse Source
This commit is contained in:
Teravus Ovares
2009-03-07 00:27:56 +00:00
parent b637a11b58
commit 3a93bb992f
2 changed files with 27 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
View File

@@ -1500,6 +1500,8 @@ namespace OpenSim.Region.Physics.OdePlugin
if (m_usePID)
{
//if (!d.BodyIsEnabled(Body))
//d.BodySetForce(Body, 0f, 0f, 0f);
// If we're using the PID controller, then we have no gravity
fz = (-1 * _parent_scene.gravityz) * m_mass;
@@ -1510,7 +1512,8 @@ namespace OpenSim.Region.Physics.OdePlugin
if ((m_PIDTau < 1))
{
PID_G = PID_G / m_PIDTau;
//PID_G = PID_G / m_PIDTau;
m_PIDTau = 1;
}
if ((PID_G - m_PIDTau) <= 0)
@@ -1668,6 +1671,20 @@ namespace OpenSim.Region.Physics.OdePlugin
d.BodySetForce(Body, 0, 0, 0);
enableBodySoft();
}
// 35x10 = 350n times the mass per second applied maximum.
float nmax = 35f * m_mass;
float nmin = -35f * m_mass;
if (fx > nmax)
fx = nmax;
if (fx < nmin)
fx = nmin;
if (fy > nmax)
fy = nmax;
if (fy < nmin)
fy = nmin;
d.BodyAddForce(Body, fx, fy, fz);
}
}