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

fix llGetCenterOfMass ( checked with ubitODE only)

Browse Source
This commit is contained in:
UbitUmarov
2012-04-28 21:36:38 +01:00
parent e48fa38ff5
commit dd745f60c2
4 changed files with 101 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs
View File

@@ -450,7 +450,7 @@ namespace OpenSim.Region.Physics.OdePlugin
get
{
d.Vector3 dtmp;
if (IsPhysical && !childPrim && Body != IntPtr.Zero)
if (!childPrim && Body != IntPtr.Zero)
{
dtmp = d.BodyGetPosition(Body);
return new Vector3(dtmp.X, dtmp.Y, dtmp.Z);
@@ -465,12 +465,38 @@ namespace OpenSim.Region.Physics.OdePlugin
q.Z = dq.Z;
q.W = dq.W;
Vector3 vtmp = primOOBoffset * q;
Vector3 Ptot = primOOBoffset * q;
dtmp = d.GeomGetPosition(prim_geom);
return new Vector3(dtmp.X + vtmp.X, dtmp.Y + vtmp.Y, dtmp.Z + vtmp.Z);
Ptot.X += dtmp.X;
Ptot.Y += dtmp.Y;
Ptot.Z += dtmp.Z;
// if(childPrim) we only know about physical linksets
return Ptot;
/*
float tmass = _mass;
Ptot *= tmass;
float m;
foreach (OdePrim prm in childrenPrim)
{
m = prm._mass;
Ptot += prm.CenterOfMass * m;
tmass += m;
}
if (tmass == 0)
tmass = 0;
else
tmass = 1.0f / tmass;
Ptot *= tmass;
return Ptot;
*/
}
else
return Vector3.Zero;
return _position;
}
}
/*
@@ -3490,7 +3516,6 @@ namespace OpenSim.Region.Physics.OdePlugin
{
d.BodySetPosition(Body, lpos.X, lpos.Y, m_targetHoverHeight);
d.BodySetLinearVel(Body, vel.X, vel.Y, 0);
return;
}
else
{