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

* Fixes a few instances of llSetStatus with Axis lock gone wrong. 

* Sums up the masses of the objects within a physical linkset
0.6.1-post-fixes
Teravus Ovares 2008-12-09 16:27:07 +00:00
parent 557567dcf8
commit cb73cf1a92
1 changed files with 46 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -627,6 +627,40 @@ namespace OpenSim.Region.Physics.OdePlugin
} }
returnMass = m_density*volume; returnMass = m_density*volume;
if (returnMass <= 0) returnMass = 0.0001f;//ckrinke: Mass must be greater then zero. if (returnMass <= 0) returnMass = 0.0001f;//ckrinke: Mass must be greater then zero.
// Recursively calculate mass
bool HasChildPrim = false;
lock (childrenPrim)
{
if (childrenPrim.Count > 0)
{
HasChildPrim = true;
}
}
if (HasChildPrim)
{
OdePrim[] childPrimArr = new OdePrim[0];
lock (childrenPrim)
childPrimArr = childrenPrim.ToArray();
for (int i = 0; i < childPrimArr.Length; i++)
{
if (childPrimArr[i] != null && !childPrimArr[i].m_taintremove)
returnMass += childPrimArr[i].CalculateMass();
// failsafe, this shouldn't happen but with OpenSim, you never know :)
if (i > 256)
break;
}
}
return returnMass; return returnMass;
} }
@ -843,7 +877,7 @@ namespace OpenSim.Region.Physics.OdePlugin
} }
} }
// Store this for later in case we get turned into a separate body // Store this for later in case we get turned into a separate body
m_angularlock = new PhysicsVector(m_taintAngularLock.X,m_angularlock.Y,m_angularlock.Z); m_angularlock = new PhysicsVector(m_taintAngularLock.X, m_taintAngularLock.Y, m_taintAngularLock.Z);
} }
private void changelink(float timestep) private void changelink(float timestep)
@ -1160,6 +1194,7 @@ namespace OpenSim.Region.Physics.OdePlugin
if (Body != IntPtr.Zero) if (Body != IntPtr.Zero)
{ {
d.BodySetLinearVel(Body, 0f, 0f, 0f); d.BodySetLinearVel(Body, 0f, 0f, 0f);
d.BodySetForce(Body, 0, 0, 0);
enableBodySoft(); enableBodySoft();
} }
} }
@ -1394,7 +1429,7 @@ namespace OpenSim.Region.Physics.OdePlugin
if (m_usePID) if (m_usePID)
{ {
// If we're using the PID controller, then we have no gravity // If we're using the PID controller, then we have no gravity
fz = (-1 * _parent_scene.gravityz) * this.Mass; fz = (-1 * _parent_scene.gravityz) * m_mass;
// no lock; for now it's only called from within Simulate() // no lock; for now it's only called from within Simulate()
@ -1470,7 +1505,12 @@ namespace OpenSim.Region.Physics.OdePlugin
//m_taintdisable = true; //m_taintdisable = true;
//base.RaiseOutOfBounds(Position); //base.RaiseOutOfBounds(Position);
//d.BodySetLinearVel(Body, fx, fy, 0f); //d.BodySetLinearVel(Body, fx, fy, 0f);
enableBodySoft(); if (!d.BodyIsEnabled(Body))
{
d.BodySetLinearVel(Body, 0f, 0f, 0f);
d.BodySetForce(Body, 0, 0, 0);
enableBodySoft();
}
d.BodyAddForce(Body, fx, fy, fz); d.BodyAddForce(Body, fx, fy, fz);
} }
} }
@ -2234,6 +2274,7 @@ namespace OpenSim.Region.Physics.OdePlugin
axis.X = (axis.X > 0) ? 1f : 0f; axis.X = (axis.X > 0) ? 1f : 0f;
axis.Y = (axis.Y > 0) ? 1f : 0f; axis.Y = (axis.Y > 0) ? 1f : 0f;
axis.Z = (axis.Z > 0) ? 1f : 0f; axis.Z = (axis.Z > 0) ? 1f : 0f;
m_log.DebugFormat("[axislock]: <{0},{1},{2}>", axis.X, axis.Y, axis.Z);
m_taintAngularLock = new PhysicsVector(axis.X, axis.Y, axis.Z); ; m_taintAngularLock = new PhysicsVector(axis.X, axis.Y, axis.Z); ;
} }
@ -2456,6 +2497,7 @@ namespace OpenSim.Region.Physics.OdePlugin
axisnum = (axisnum - (axis.X + axis.Y + axis.Z)); axisnum = (axisnum - (axis.X + axis.Y + axis.Z));
if (axisnum <= 0) if (axisnum <= 0)
return; return;
int dAMotorEuler = 1; int dAMotorEuler = 1;
@ -2502,7 +2544,7 @@ namespace OpenSim.Region.Physics.OdePlugin
d.JointSetAMotorParam(Amotor, (int)dParam.HiStop2, 0.000000000001f); d.JointSetAMotorParam(Amotor, (int)dParam.HiStop2, 0.000000000001f);
d.JointSetAMotorParam(Amotor, (int)dParam.FudgeFactor, 0f); d.JointSetAMotorParam(Amotor, (int)dParam.FudgeFactor, 0f);
d.JointSetAMotorParam(Amotor, (int)dParam.FMax, m_tensor); d.JointSetAMotorParam(Amotor, (int)dParam.FMax, m_tensor * 5);//
} }
public override void SubscribeEvents(int ms) public override void SubscribeEvents(int ms)