diff options
author | John Hurliman | 2009-10-15 16:35:27 -0700 |
---|---|---|
committer | John Hurliman | 2009-10-15 16:35:27 -0700 |
commit | 4b75353cbf50de3cae4c48ec90b55f30c1612c92 (patch) | |
tree | 2b5bf30d2a0c8558437f757e28081cb60a8b5dfc /OpenSim/Client | |
parent | Replaced the update lists with a priority queue implementation in LLClientView (diff) | |
download | opensim-SC_OLD-4b75353cbf50de3cae4c48ec90b55f30c1612c92.zip opensim-SC_OLD-4b75353cbf50de3cae4c48ec90b55f30c1612c92.tar.gz opensim-SC_OLD-4b75353cbf50de3cae4c48ec90b55f30c1612c92.tar.bz2 opensim-SC_OLD-4b75353cbf50de3cae4c48ec90b55f30c1612c92.tar.xz |
Object update prioritization by Jim Greensky of Intel Labs, part one. This implements a simple distance prioritizer based on initial agent positions. Re-prioritizing and more advanced priority algorithms will follow soon
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Client/MXP/ClientStack/MXPClientView.cs | 31 | ||||
-rw-r--r-- | OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs | 13 |
2 files changed, 17 insertions, 27 deletions
diff --git a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs index bc02bc4..ea29c41 100644 --- a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs +++ b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs | |||
@@ -996,19 +996,19 @@ namespace OpenSim.Client.MXP.ClientStack | |||
996 | // Need to translate to MXP somehow | 996 | // Need to translate to MXP somehow |
997 | } | 997 | } |
998 | 998 | ||
999 | public void SendAvatarData(ulong regionHandle, string firstName, string lastName, string grouptitle, UUID avatarID, uint avatarLocalID, Vector3 position, byte[] textureEntry, uint parentID, Quaternion rotation) | 999 | public void SendAvatarData(SendAvatarData data) |
1000 | { | 1000 | { |
1001 | //ScenePresence presence=((Scene)this.Scene).GetScenePresence(avatarID); | 1001 | //ScenePresence presence=((Scene)this.Scene).GetScenePresence(avatarID); |
1002 | UUID ownerID = avatarID; | 1002 | UUID ownerID = data.avatarID; |
1003 | MXPSendAvatarData(firstName + " " + lastName, ownerID, UUID.Zero, avatarID, avatarLocalID, position, rotation); | 1003 | MXPSendAvatarData(data.firstName + " " + data.lastName, ownerID, UUID.Zero, data.avatarID, data.avatarLocalID, data.Pos, data.rotation); |
1004 | } | 1004 | } |
1005 | 1005 | ||
1006 | public void SendAvatarTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, Vector3 position, Vector3 velocity, Quaternion rotation, UUID uuid) | 1006 | public void SendAvatarTerseUpdate(SendAvatarTerseData data) |
1007 | { | 1007 | { |
1008 | MovementEventMessage me = new MovementEventMessage(); | 1008 | MovementEventMessage me = new MovementEventMessage(); |
1009 | me.ObjectIndex = localID; | 1009 | me.ObjectIndex = data.localID; |
1010 | me.Location =ToOmVector(position); | 1010 | me.Location = ToOmVector(data.position); |
1011 | me.Orientation = ToOmQuaternion(rotation); | 1011 | me.Orientation = ToOmQuaternion(data.rotation); |
1012 | 1012 | ||
1013 | Session.Send(me); | 1013 | Session.Send(me); |
1014 | } | 1014 | } |
@@ -1028,22 +1028,17 @@ namespace OpenSim.Client.MXP.ClientStack | |||
1028 | // Need to translate to MXP somehow | 1028 | // Need to translate to MXP somehow |
1029 | } | 1029 | } |
1030 | 1030 | ||
1031 | public void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, Vector3 pos, Vector3 vel, Vector3 acc, Quaternion rotation, Vector3 rvel, uint flags, UUID objectID, UUID ownerID, string text, byte[] color, uint parentID, byte[] particleSystem, byte clickAction, byte material, byte[] textureanim, bool attachment, uint AttachPoint, UUID AssetId, UUID SoundId, double SoundVolume, byte SoundFlags, double SoundRadius) | 1031 | public void SendPrimitiveToClient(SendPrimitiveData data) |
1032 | { | 1032 | { |
1033 | MXPSendPrimitive(localID, ownerID, acc, rvel, primShape, pos, objectID, vel, rotation, flags,text,color,parentID,particleSystem,clickAction,material,textureanim); | 1033 | MXPSendPrimitive(data.localID, data.ownerID, data.acc, data.rvel, data.primShape, data.pos, data.objectID, data.vel, data.rotation, data.flags, data.text, data.color, data.parentID, data.particleSystem, data.clickAction, data.material, data.textureanim); |
1034 | } | 1034 | } |
1035 | 1035 | ||
1036 | public void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, Vector3 pos, Vector3 vel, Vector3 acc, Quaternion rotation, Vector3 rvel, uint flags, UUID objectID, UUID ownerID, string text, byte[] color, uint parentID, byte[] particleSystem, byte clickAction, byte material) | 1036 | public void SendPrimTerseUpdate(SendPrimitiveTerseData data) |
1037 | { | ||
1038 | MXPSendPrimitive(localID, ownerID, acc, rvel, primShape, pos, objectID, vel, rotation, flags, text, color, parentID, particleSystem, clickAction, material, new byte[0]); | ||
1039 | } | ||
1040 | |||
1041 | public void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, Vector3 position, Quaternion rotation, Vector3 velocity, Vector3 rotationalvelocity, byte state, UUID AssetId, UUID owner, int attachPoint) | ||
1042 | { | 1037 | { |
1043 | MovementEventMessage me = new MovementEventMessage(); | 1038 | MovementEventMessage me = new MovementEventMessage(); |
1044 | me.ObjectIndex = localID; | 1039 | me.ObjectIndex = data.localID; |
1045 | me.Location = ToOmVector(position); | 1040 | me.Location = ToOmVector(data.position); |
1046 | me.Orientation = ToOmQuaternion(rotation); | 1041 | me.Orientation = ToOmQuaternion(data.rotation); |
1047 | Session.Send(me); | 1042 | Session.Send(me); |
1048 | } | 1043 | } |
1049 | 1044 | ||
diff --git a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs index e3abcf5..3a48a03 100644 --- a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs +++ b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs | |||
@@ -560,12 +560,12 @@ namespace OpenSim.Client.VWoHTTP.ClientStack | |||
560 | throw new System.NotImplementedException(); | 560 | throw new System.NotImplementedException(); |
561 | } | 561 | } |
562 | 562 | ||
563 | public void SendAvatarData(ulong regionHandle, string firstName, string lastName, string grouptitle, UUID avatarID, uint avatarLocalID, Vector3 Pos, byte[] textureEntry, uint parentID, Quaternion rotation) | 563 | public void SendAvatarData(SendAvatarData data) |
564 | { | 564 | { |
565 | throw new System.NotImplementedException(); | 565 | throw new System.NotImplementedException(); |
566 | } | 566 | } |
567 | 567 | ||
568 | public void SendAvatarTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, Vector3 position, Vector3 velocity, Quaternion rotation, UUID uuid) | 568 | public void SendAvatarTerseUpdate(SendAvatarTerseData data) |
569 | { | 569 | { |
570 | throw new System.NotImplementedException(); | 570 | throw new System.NotImplementedException(); |
571 | } | 571 | } |
@@ -585,17 +585,12 @@ namespace OpenSim.Client.VWoHTTP.ClientStack | |||
585 | throw new System.NotImplementedException(); | 585 | throw new System.NotImplementedException(); |
586 | } | 586 | } |
587 | 587 | ||
588 | public void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, Vector3 pos, Vector3 vel, Vector3 acc, Quaternion rotation, Vector3 rvel, uint flags, UUID objectID, UUID ownerID, string text, byte[] color, uint parentID, byte[] particleSystem, byte clickAction, byte material, byte[] textureanim, bool attachment, uint AttachPoint, UUID AssetId, UUID SoundId, double SoundVolume, byte SoundFlags, double SoundRadius) | 588 | public void SendPrimitiveToClient(SendPrimitiveData data) |
589 | { | 589 | { |
590 | throw new System.NotImplementedException(); | 590 | throw new System.NotImplementedException(); |
591 | } | 591 | } |
592 | 592 | ||
593 | public void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, Vector3 pos, Vector3 vel, Vector3 acc, Quaternion rotation, Vector3 rvel, uint flags, UUID objectID, UUID ownerID, string text, byte[] color, uint parentID, byte[] particleSystem, byte clickAction, byte material) | 593 | public void SendPrimTerseUpdate(SendPrimitiveTerseData data) |
594 | { | ||
595 | throw new System.NotImplementedException(); | ||
596 | } | ||
597 | |||
598 | public void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, Vector3 position, Quaternion rotation, Vector3 velocity, Vector3 rotationalvelocity, byte state, UUID AssetId, UUID owner, int attachPoint) | ||
599 | { | 594 | { |
600 | throw new System.NotImplementedException(); | 595 | throw new System.NotImplementedException(); |
601 | } | 596 | } |