ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 00:46:02 +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

40
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
View File

@@ -1865,7 +1865,7 @@ namespace OpenSim.Region.Framework.Scenes
{
if ((!isPhantom || isPhysical || _VolumeDetectActive) && !ParentGroup.IsAttachment
&& !(Shape.PathCurve == (byte)Extrusion.Flexible))
AddToPhysics(isPhysical, isPhantom, building, true);
AddToPhysics(isPhysical, isPhantom, building, isPhysical);
else
PhysActor = null; // just to be sure
}
@@ -2308,7 +2308,7 @@ namespace OpenSim.Region.Framework.Scenes
*/
}
public float GetMass()
public float GetMass()
{
PhysicsActor pa = PhysActor;
@@ -2318,6 +2318,40 @@ namespace OpenSim.Region.Framework.Scenes
return 0;
}
public Vector3 GetCenterOfMass()
{
if (ParentGroup.RootPart == this)
{
if (ParentGroup.IsDeleted)
return AbsolutePosition;
return ParentGroup.GetCenterOfMass();
}
PhysicsActor pa = PhysActor;
if (pa != null)
{
Vector3 tmp = pa.CenterOfMass;
return tmp;
}
else
return AbsolutePosition;
}
public Vector3 GetPartCenterOfMass()
{
PhysicsActor pa = PhysActor;
if (pa != null)
{
Vector3 tmp = pa.CenterOfMass;
return tmp;
}
else
return AbsolutePosition;
}
public Vector3 GetForce()
{
return Force;
@@ -4802,7 +4836,7 @@ namespace OpenSim.Region.Framework.Scenes
{
Velocity = velocity;
AngularVelocity = rotationalVelocity;
pa.Velocity = velocity;
// pa.Velocity = velocity;
pa.RotationalVelocity = rotationalVelocity;
// if not vehicle and root part apply force and torque