aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorSean Dague2008-05-07 18:40:18 +0000
committerSean Dague2008-05-07 18:40:18 +0000
commit5ff3c03c122b9a1df4080aeaad5ece1574d2aea3 (patch)
treed92c8b2b98d31f95eada910b561e8a0da9accc43
parent* Theoretically, everything is in place for scripted take controls... Theo... (diff)
downloadopensim-SC_OLD-5ff3c03c122b9a1df4080aeaad5ece1574d2aea3.zip
opensim-SC_OLD-5ff3c03c122b9a1df4080aeaad5ece1574d2aea3.tar.gz
opensim-SC_OLD-5ff3c03c122b9a1df4080aeaad5ece1574d2aea3.tar.bz2
opensim-SC_OLD-5ff3c03c122b9a1df4080aeaad5ece1574d2aea3.tar.xz
get all the right bits to SendPrimitiveToClient so we can actually
set vel, acc, and rvel in the packet (though this isn't done yet).
-rw-r--r--OpenSim/Framework/IClientAPI.cs19
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs19
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectPart.cs10
-rw-r--r--OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs10
4 files changed, 33 insertions, 25 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index d71a778..7dbddff 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -768,14 +768,17 @@ namespace OpenSim.Framework
768 void AttachObject(uint localID, LLQuaternion rotation, byte attachPoint); 768 void AttachObject(uint localID, LLQuaternion rotation, byte attachPoint);
769 void SetChildAgentThrottle(byte[] throttle); 769 void SetChildAgentThrottle(byte[] throttle);
770 770
771 void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, 771 void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape,
772 LLVector3 pos, uint flags, LLUUID objectID, LLUUID ownerID, string text, byte[] color, 772 LLVector3 pos, LLVector3 vel, LLVector3 acc, LLQuaternion rotation, LLVector3 rvel,
773 uint parentID, byte[] particleSystem, LLQuaternion rotation, byte clickAction, byte[] textureanimation, 773 uint flags,
774 bool attachment, uint AttachmentPoint, LLUUID AssetId); 774 LLUUID objectID, LLUUID ownerID, string text, byte[] color, uint parentID, byte[] particleSystem,
775 775 byte clickAction, byte[] textureanim, bool attachment, uint AttachPoint, LLUUID AssetId);
776 void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, 776
777 LLVector3 pos, uint flags, LLUUID objectID, LLUUID ownerID, string text, byte[] color, 777
778 uint parentID, byte[] particleSystem, LLQuaternion rotation, byte clickAction); 778 void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape,
779 LLVector3 pos, LLVector3 vel, LLVector3 acc, LLQuaternion rotation, LLVector3 rvel,
780 uint flags, LLUUID objectID, LLUUID ownerID, string text, byte[] color,
781 uint parentID, byte[] particleSystem, byte clickAction);
779 782
780 void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, LLVector3 position, 783 void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, LLVector3 position,
781 LLQuaternion rotation, LLVector3 velocity, LLVector3 rotationalvelocity, byte state, LLUUID AssetId); 784 LLQuaternion rotation, LLVector3 velocity, LLVector3 rotationalvelocity, byte state, LLUUID AssetId);
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index f152d5e..6fe5cc9 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -2054,22 +2054,25 @@ namespace OpenSim.Region.ClientStack.LindenUDP
2054 } 2054 }
2055 2055
2056 public void SendPrimitiveToClient( 2056 public void SendPrimitiveToClient(
2057 ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, LLVector3 pos, 2057 ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape,
2058 uint flags, 2058 LLVector3 pos, LLVector3 vel, LLVector3 acc, LLQuaternion rotation, LLVector3 rvel,
2059 LLUUID objectID, LLUUID ownerID, string text, byte[] color, uint parentID, byte[] particleSystem, 2059 uint flags, LLUUID objectID, LLUUID ownerID, string text, byte[] color,
2060 LLQuaternion rotation, byte clickAction) 2060 uint parentID, byte[] particleSystem, byte clickAction)
2061 { 2061 {
2062 byte[] textureanim = new byte[0]; 2062 byte[] textureanim = new byte[0];
2063 2063
2064 SendPrimitiveToClient(regionHandle, timeDilation, localID, primShape, pos, flags, 2064 SendPrimitiveToClient(regionHandle, timeDilation, localID, primShape, pos, vel,
2065 acc, rotation, rvel, flags,
2065 objectID, ownerID, text, color, parentID, particleSystem, 2066 objectID, ownerID, text, color, parentID, particleSystem,
2066 rotation, clickAction, textureanim, false,(uint)0, LLUUID.Zero); 2067 clickAction, textureanim, false,(uint)0, LLUUID.Zero);
2067 } 2068 }
2069
2068 public void SendPrimitiveToClient( 2070 public void SendPrimitiveToClient(
2069 ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, LLVector3 pos, 2071 ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape,
2072 LLVector3 pos, LLVector3 vel, LLVector3 acc, LLQuaternion rotation, LLVector3 rvel,
2070 uint flags, 2073 uint flags,
2071 LLUUID objectID, LLUUID ownerID, string text, byte[] color, uint parentID, byte[] particleSystem, 2074 LLUUID objectID, LLUUID ownerID, string text, byte[] color, uint parentID, byte[] particleSystem,
2072 LLQuaternion rotation, byte clickAction, byte[] textureanim, bool attachment, uint AttachPoint, LLUUID AssetId) 2075 byte clickAction, byte[] textureanim, bool attachment, uint AttachPoint, LLUUID AssetId)
2073 { 2076 {
2074 ObjectUpdatePacket outPacket = (ObjectUpdatePacket)PacketPool.Instance.GetPacket(PacketType.ObjectUpdate); 2077 ObjectUpdatePacket outPacket = (ObjectUpdatePacket)PacketPool.Instance.GetPacket(PacketType.ObjectUpdate);
2075 // TODO: don't create new blocks if recycling an old packet 2078 // TODO: don't create new blocks if recycling an old packet
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index 56821c6..adcd646 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -2331,10 +2331,8 @@ namespace OpenSim.Region.Environment.Scenes
2331 /// <param name="clientFlags"></param> 2331 /// <param name="clientFlags"></param>
2332 public void SendFullUpdateToClient(IClientAPI remoteClient, LLVector3 lPos, uint clientFlags) 2332 public void SendFullUpdateToClient(IClientAPI remoteClient, LLVector3 lPos, uint clientFlags)
2333 { 2333 {
2334 LLQuaternion lRot;
2335 lRot = RotationOffset;
2336 clientFlags &= ~(uint) LLObject.ObjectFlags.CreateSelected; 2334 clientFlags &= ~(uint) LLObject.ObjectFlags.CreateSelected;
2337 2335
2338 if (remoteClient.AgentId == OwnerID) 2336 if (remoteClient.AgentId == OwnerID)
2339 { 2337 {
2340 if ((uint) (Flags & LLObject.ObjectFlags.CreateSelected) != 0) 2338 if ((uint) (Flags & LLObject.ObjectFlags.CreateSelected) != 0)
@@ -2346,9 +2344,11 @@ namespace OpenSim.Region.Environment.Scenes
2346 2344
2347 2345
2348 byte[] color = new byte[] {m_color.R, m_color.G, m_color.B, m_color.A}; 2346 byte[] color = new byte[] {m_color.R, m_color.G, m_color.B, m_color.A};
2349 remoteClient.SendPrimitiveToClient(m_regionHandle, (ushort)(m_parentGroup.GetTimeDilation() * (float)ushort.MaxValue), LocalId, m_shape, lPos, clientFlags, m_uuid, 2347 remoteClient.SendPrimitiveToClient(
2348 m_regionHandle, (ushort)(m_parentGroup.GetTimeDilation() * (float)ushort.MaxValue), LocalId, m_shape,
2349 lPos, Velocity, Acceleration, RotationOffset, RotationalVelocity, clientFlags, m_uuid,
2350 OwnerID, 2350 OwnerID,
2351 m_text, color, ParentID, m_particleSystem, lRot, m_clickAction, m_TextureAnimation, m_IsAttachment, m_attachmentPoint,fromAssetID); 2351 m_text, color, ParentID, m_particleSystem, m_clickAction, m_TextureAnimation, m_IsAttachment, m_attachmentPoint,fromAssetID);
2352 } 2352 }
2353 2353
2354 /// Terse updates 2354 /// Terse updates
diff --git a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
index e6e47cb..010e65b 100644
--- a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
+++ b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
@@ -394,17 +394,19 @@ namespace OpenSim.Region.Examples.SimpleModule
394 } 394 }
395 395
396 public virtual void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, 396 public virtual void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID,
397 PrimitiveBaseShape primShape, LLVector3 pos, uint flags, 397 PrimitiveBaseShape primShape, LLVector3 pos, LLVector3 vel,
398 LLVector3 acc, LLQuaternion rotation, LLVector3 rvel, uint flags,
398 LLUUID objectID, LLUUID ownerID, string text, byte[] color, 399 LLUUID objectID, LLUUID ownerID, string text, byte[] color,
399 uint parentID, 400 uint parentID,
400 byte[] particleSystem, LLQuaternion rotation, byte clickAction) 401 byte[] particleSystem, byte clickAction)
401 { 402 {
402 } 403 }
403 public virtual void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, 404 public virtual void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID,
404 PrimitiveBaseShape primShape, LLVector3 pos, uint flags, 405 PrimitiveBaseShape primShape, LLVector3 pos, LLVector3 vel,
406 LLVector3 acc, LLQuaternion rotation, LLVector3 rvel, uint flags,
405 LLUUID objectID, LLUUID ownerID, string text, byte[] color, 407 LLUUID objectID, LLUUID ownerID, string text, byte[] color,
406 uint parentID, 408 uint parentID,
407 byte[] particleSystem, LLQuaternion rotation, byte clickAction, byte[] textureanimation, 409 byte[] particleSystem, byte clickAction, byte[] textureanimation,
408 bool attachment, uint AttachmentPoint, LLUUID AssetId) 410 bool attachment, uint AttachmentPoint, LLUUID AssetId)
409 { 411 {
410 } 412 }