diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index 3d41666..474ffdd 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -683,12 +683,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
683 | } | 683 | } |
684 | } | 684 | } |
685 | 685 | ||
686 | public Vector3 RotationalVelocity | ||
687 | { | ||
688 | get { return AngularVelocity; } | ||
689 | set { AngularVelocity = value; } | ||
690 | } | ||
691 | |||
692 | /// <summary></summary> | 686 | /// <summary></summary> |
693 | public Vector3 AngularVelocity | 687 | public Vector3 AngularVelocity |
694 | { | 688 | { |
@@ -1552,9 +1546,9 @@ if (m_shape != null) { | |||
1552 | m_parentGroup.Scene.PhysicsScene.RequestJointDeletion(Name); // FIXME: what if the name changed? | 1546 | m_parentGroup.Scene.PhysicsScene.RequestJointDeletion(Name); // FIXME: what if the name changed? |
1553 | 1547 | ||
1554 | // make sure client isn't interpolating the joint proxy object | 1548 | // make sure client isn't interpolating the joint proxy object |
1555 | Velocity = new Vector3(0, 0, 0); | 1549 | Velocity = Vector3.Zero; |
1556 | RotationalVelocity = new Vector3(0, 0, 0); | 1550 | AngularVelocity = Vector3.Zero; |
1557 | Acceleration = new Vector3(0, 0, 0); | 1551 | Acceleration = Vector3.Zero; |
1558 | } | 1552 | } |
1559 | } | 1553 | } |
1560 | } | 1554 | } |
@@ -2384,7 +2378,7 @@ if (m_shape != null) { | |||
2384 | 2378 | ||
2385 | byte[] color = new byte[] {m_color.R, m_color.G, m_color.B, m_color.A}; | 2379 | byte[] color = new byte[] {m_color.R, m_color.G, m_color.B, m_color.A}; |
2386 | remoteClient.SendPrimitiveToClient(new SendPrimitiveData(m_regionHandle, m_parentGroup.GetTimeDilation(), LocalId, m_shape, | 2380 | remoteClient.SendPrimitiveToClient(new SendPrimitiveData(m_regionHandle, m_parentGroup.GetTimeDilation(), LocalId, m_shape, |
2387 | lPos, Velocity, Acceleration, RotationOffset, RotationalVelocity, clientFlags, m_uuid, _ownerID, | 2381 | lPos, Velocity, Acceleration, RotationOffset, AngularVelocity, clientFlags, m_uuid, _ownerID, |
2388 | m_text, color, _parentID, m_particleSystem, m_clickAction, (byte)m_material, m_TextureAnimation, IsAttachment, | 2382 | m_text, color, _parentID, m_particleSystem, m_clickAction, (byte)m_material, m_TextureAnimation, IsAttachment, |
2389 | AttachmentPoint,FromItemID, Sound, SoundGain, SoundFlags, SoundRadius, ParentGroup.GetUpdatePriority(remoteClient))); | 2383 | AttachmentPoint,FromItemID, Sound, SoundGain, SoundFlags, SoundRadius, ParentGroup.GetUpdatePriority(remoteClient))); |
2390 | } | 2384 | } |
@@ -2405,7 +2399,7 @@ if (m_shape != null) { | |||
2405 | if (!RotationOffset.ApproxEquals(m_lastRotation, ROTATION_TOLERANCE) || | 2399 | if (!RotationOffset.ApproxEquals(m_lastRotation, ROTATION_TOLERANCE) || |
2406 | !Acceleration.Equals(m_lastAcceleration) || | 2400 | !Acceleration.Equals(m_lastAcceleration) || |
2407 | !Velocity.ApproxEquals(m_lastVelocity, VELOCITY_TOLERANCE) || | 2401 | !Velocity.ApproxEquals(m_lastVelocity, VELOCITY_TOLERANCE) || |
2408 | !RotationalVelocity.ApproxEquals(m_lastAngularVelocity, VELOCITY_TOLERANCE) || | 2402 | !AngularVelocity.ApproxEquals(m_lastAngularVelocity, VELOCITY_TOLERANCE) || |
2409 | !OffsetPosition.ApproxEquals(m_lastPosition, POSITION_TOLERANCE) || | 2403 | !OffsetPosition.ApproxEquals(m_lastPosition, POSITION_TOLERANCE) || |
2410 | Environment.TickCount - m_lastTerseSent > TIME_MS_TOLERANCE) | 2404 | Environment.TickCount - m_lastTerseSent > TIME_MS_TOLERANCE) |
2411 | { | 2405 | { |
@@ -2425,7 +2419,7 @@ if (m_shape != null) { | |||
2425 | m_lastRotation = RotationOffset; | 2419 | m_lastRotation = RotationOffset; |
2426 | m_lastVelocity = Velocity; | 2420 | m_lastVelocity = Velocity; |
2427 | m_lastAcceleration = Acceleration; | 2421 | m_lastAcceleration = Acceleration; |
2428 | m_lastAngularVelocity = RotationalVelocity; | 2422 | m_lastAngularVelocity = AngularVelocity; |
2429 | m_lastTerseSent = Environment.TickCount; | 2423 | m_lastTerseSent = Environment.TickCount; |
2430 | } | 2424 | } |
2431 | } | 2425 | } |
@@ -3787,7 +3781,7 @@ if (m_shape != null) { | |||
3787 | remoteClient.SendPrimTerseUpdate(new SendPrimitiveTerseData(m_regionHandle, | 3781 | remoteClient.SendPrimTerseUpdate(new SendPrimitiveTerseData(m_regionHandle, |
3788 | m_parentGroup.GetTimeDilation(), LocalId, lPos, | 3782 | m_parentGroup.GetTimeDilation(), LocalId, lPos, |
3789 | RotationOffset, Velocity, Acceleration, | 3783 | RotationOffset, Velocity, Acceleration, |
3790 | RotationalVelocity, state, FromItemID, | 3784 | AngularVelocity, state, FromItemID, |
3791 | OwnerID, (int)AttachmentPoint, null, ParentGroup.GetUpdatePriority(remoteClient))); | 3785 | OwnerID, (int)AttachmentPoint, null, ParentGroup.GetUpdatePriority(remoteClient))); |
3792 | } | 3786 | } |
3793 | 3787 | ||