OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Changed application of constant forces to after PID force is applied. llSetForce() should behave identical to the Linden implementation now.

0.6.0-stable
Dahlia Trimble 2008-07-24 21:05:30 +00:00
parent cdd3537706
commit c67198299e
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -750,7 +750,7 @@ namespace OpenSim.Region.Physics.OdePlugin
changeshape(timestep); changeshape(timestep);
// //
if (m_taintforce || m_force != new PhysicsVector(0.0f, 0.0f, 0.0f)) if (m_taintforce)
changeAddForce(timestep); changeAddForce(timestep);
if (m_taintdisable) if (m_taintdisable)
@ -1194,6 +1194,10 @@ namespace OpenSim.Region.Physics.OdePlugin
fy *= m_mass; fy *= m_mass;
//fz *= m_mass; //fz *= m_mass;
fx += m_force.X;
fy += m_force.Y;
fz += m_force.Z;
//m_log.Info("[OBJPID]: X:" + fx.ToString() + " Y:" + fy.ToString() + " Z:" + fz.ToString()); //m_log.Info("[OBJPID]: X:" + fx.ToString() + " Y:" + fy.ToString() + " Z:" + fz.ToString());
if (fx != 0 || fy != 0 || fz != 0) if (fx != 0 || fy != 0 || fz != 0)
{ {
@ -1752,8 +1756,7 @@ namespace OpenSim.Region.Physics.OdePlugin
//m_log.Info("[PHYSICS]: dequeing forcelist"); //m_log.Info("[PHYSICS]: dequeing forcelist");
if (IsPhysical) if (IsPhysical)
{ {
//PhysicsVector iforce = new PhysicsVector(); PhysicsVector iforce = new PhysicsVector();
PhysicsVector iforce = m_force * 100.0f;
for (int i = 0; i < m_forcelist.Count; i++) for (int i = 0; i < m_forcelist.Count; i++)
{ {
iforce = iforce + (m_forcelist[i] * 100); iforce = iforce + (m_forcelist[i] * 100);
@ -1767,6 +1770,7 @@ namespace OpenSim.Region.Physics.OdePlugin
m_collisionscore = 0; m_collisionscore = 0;
m_interpenetrationcount = 0; m_interpenetrationcount = 0;
} }
m_taintforce = false; m_taintforce = false;
} }