OpenSimulator GForge > Projects > realXtend Modules > SVN

Diff of /branches/os-udp/ModularRex/RexNetwork/ClientViews/RexClientViewBase.cs

-revision 117, Wed Apr 22 07:35:46 2009 UTC
+revision 141, Mon May 11 06:12:20 2009 UTC
 Line 13
  using OpenSim.Framework.Communications.Cache;
  using OpenSim.Region.ClientStack;
  using OpenSim.Region.ClientStack.LindenUDP;
+ using ModularRex.RexNetwork.RexLogin;
+ using System.Timers;
  namespace ModularRex.RexNetwork
  {
-Line 220
+Line 222
              set
              {
                  m_rexAuthURL = value;
-                 // Request Agent Properties Asynchronously
-                 ThreadPool.QueueUserWorkItem(RequestProperties);
              }
          }
-Line 493
+Line 492
          }
          /// <summary>
-         /// Requests properties about this agent from their
-         /// authentication server. This should be run in
-         /// an async thread.
-         ///
-         /// Note that this particular function may set the
-         /// avatars appearance which may in turn call
-         /// additional modules and functions elsewhere.
-         /// </summary>
-         /// <param name="o"></param>
-         private void RequestProperties(object o)
-         {
-             m_log.Info("[REXCLIENT] Resolving avatar...");
-             Hashtable ReqVals = new Hashtable();
-             ReqVals["avatar_account"] = RexAccount;
-             ReqVals["AuthenticationAddress"] = RexAuthURL;
-             ArrayList SendParams = new ArrayList();
-             SendParams.Add(ReqVals);
-             XmlRpcRequest req = new XmlRpcRequest("get_user_by_account", SendParams);
-             m_log.Info("[REXCLIENT] Sending XMLRPC Request to http://" + RexAuthURL);
-             XmlRpcResponse authreply = req.Send("http://" + RexAuthURL, 9000);
-             //m_log.Info(authreply.ToString());
-             if (!((Hashtable)authreply.Value).ContainsKey("error_type"))
-             {
-             string rexAsAddress = ((Hashtable)authreply.Value)["as_address"].ToString();
-             //string rexSkypeURL = ((Hashtable)authreply.Value)["skype_url"].ToString();
-             UUID userID = new UUID(((Hashtable) authreply.Value)["uuid"].ToString());
-                 // Sanity check
-                 if (userID == AgentId)
-                 {
-                     RexAvatarURL = rexAsAddress;
-                     //RexSkypeURL = rexSkypeURL;
-                 }
-             }
-             else
-             {
-                 m_log.Warn("[REXCLIENT]: User not found");
-             }
-         }
-         /// <summary>
          /// Sends Fog parameters to client. Only works underwater.
          /// </summary>
          /// <param name="start">meters from camera where the fog starts</param>
-Line 953
+Line 906
          public override void InformClientOfNeighbour(ulong neighbourHandle, IPEndPoint neighbourExternalEndPoint)
          {
+             IRexUDPPort module = m_scene.RequestModuleInterface<IRexUDPPort>();
+             int udpport = module.GetPort(neighbourHandle);
              m_log.DebugFormat("[REXCLIENT]: Informing Client About Neighbour {0}", neighbourExternalEndPoint);
-             base.InformClientOfNeighbour(neighbourHandle, new IPEndPoint(neighbourExternalEndPoint.Address, neighbourExternalEndPoint.Port-2000));
+             base.InformClientOfNeighbour(neighbourHandle, new IPEndPoint(neighbourExternalEndPoint.Address, udpport));
          }
          public override void CrossRegion(ulong newRegionHandle, Vector3 pos, Vector3 lookAt, IPEndPoint externalIPEndPoint,
                                  string capsURL)
          {
+             IRexUDPPort module = m_scene.RequestModuleInterface<IRexUDPPort>();
+             int udpport = module.GetPort(newRegionHandle);
              m_log.DebugFormat("[REXCLIENT]: Crossing client to region {0}", externalIPEndPoint);
-             base.CrossRegion(newRegionHandle, pos, lookAt, new IPEndPoint(externalIPEndPoint.Address, externalIPEndPoint.Port - 2000), capsURL);
+             base.CrossRegion(newRegionHandle, pos, lookAt, new IPEndPoint(externalIPEndPoint.Address, udpport), capsURL);
          }
          public override void SendRegionTeleport(ulong regionHandle, byte simAccess, IPEndPoint newRegionEndPoint, uint locationID,
                                         uint flags, string capsURL)
          {
+             IRexUDPPort module = m_scene.RequestModuleInterface<IRexUDPPort>();
+             int udpport = module.GetPort(regionHandle);
              m_log.DebugFormat("[REXCLIENT]: Sending region teleport to client {0}", newRegionEndPoint);
-             base.SendRegionTeleport(regionHandle, simAccess, new IPEndPoint(newRegionEndPoint.Address, newRegionEndPoint.Port - 2000), locationID, flags, capsURL);
+             base.SendRegionTeleport(regionHandle, simAccess, new IPEndPoint(newRegionEndPoint.Address, udpport), locationID, flags, capsURL);
+         }
+         #region Avatar terse update
+         protected override void InitNewClient()
+         {
+             m_avatarTerseUpdateTimer = new System.Timers.Timer(m_avatarTerseUpdateRate);
+             m_avatarTerseUpdateTimer.Elapsed += new ElapsedEventHandler(ProcessAvatarTerseUpdates);
+             m_avatarTerseUpdateTimer.AutoReset = false;
+             base.InitNewClient();
          }
+         private System.Timers.Timer m_avatarTerseUpdateTimer;
+         private List<ImprovedTerseObjectUpdatePacket.ObjectDataBlock> m_avatarTerseUpdates = new List<ImprovedTerseObjectUpdatePacket.ObjectDataBlock>();
+         /// <summary>
+         /// Send a terse positional/rotation/velocity update about an avatar
+         /// to the client.  This avatar can be that of the client itself.
+         /// </summary>
+         public override void SendAvatarTerseUpdate(ulong regionHandle,
+                 ushort timeDilation, uint localID, Vector3 position,
+                 Vector3 velocity, Quaternion rotation, UUID agentid)
+         {
+             if (rotation.X == rotation.Y &&
+                 rotation.Y == rotation.Z &&
+                 rotation.Z == rotation.W && rotation.W == 0)
+                 rotation = Quaternion.Identity;
+             position.Z = (float)(position.Z - 0.15);
+             ImprovedTerseObjectUpdatePacket.ObjectDataBlock terseBlock =
+                 RexCreateAvatarImprovedBlock(localID, position, velocity, rotation);
+                 //CreateAvatarImprovedBlock(localID, position, velocity, rotation);
+             lock (m_avatarTerseUpdates)
+             {
+                 m_avatarTerseUpdates.Add(terseBlock);
+                 // If packet is full or own movement packet, send it.
+                 if (m_avatarTerseUpdates.Count >= m_avatarTerseUpdatesPerPacket)
+                 {
+                     ProcessAvatarTerseUpdates(this, null);
+                 }
+                 else if (m_avatarTerseUpdates.Count == 1)
+                 {
+                     m_avatarTerseUpdateTimer.Start();
+                 }
+             }
+         }
+         private void ProcessAvatarTerseUpdates(object sender, ElapsedEventArgs e)
+         {
+             lock (m_avatarTerseUpdates)
+             {
+                 ImprovedTerseObjectUpdatePacket terse = (ImprovedTerseObjectUpdatePacket)PacketPool.Instance.GetPacket(PacketType.ImprovedTerseObjectUpdate);
+                 terse.RegionData = new ImprovedTerseObjectUpdatePacket.RegionDataBlock();
+                 terse.RegionData.RegionHandle = Scene.RegionInfo.RegionHandle;
+                 terse.RegionData.TimeDilation =
+                         (ushort)(Scene.TimeDilation * ushort.MaxValue);
+                 int max = m_avatarTerseUpdatesPerPacket;
+                 if (max > m_avatarTerseUpdates.Count)
+                     max = m_avatarTerseUpdates.Count;
+                 int count = 0;
+                 int size = 0;
+                 byte[] zerobuffer = new byte[1024];
+                 byte[] blockbuffer = new byte[1024];
+                 for (count = 0; count < max; count++)
+                 {
+                     int length = 0;
+                     m_avatarTerseUpdates[count].ToBytes(blockbuffer, ref length);
+                     length = Helpers.ZeroEncode(blockbuffer, length, zerobuffer);
+                     if (size + length > m_packetMTU)
+                         break;
+                     size += length;
+                 }
+                 terse.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[count];
+                 for (int i = 0; i < count; i++)
+                 {
+                     terse.ObjectData[i] = m_avatarTerseUpdates[0];
+                     m_avatarTerseUpdates.RemoveAt(0);
+                 }
+                 terse.Header.Reliable = false;
+                 terse.Header.Zerocoded = true;
+                 OutPacket(terse, ThrottleOutPacketType.Task);
+                 if (m_avatarTerseUpdates.Count == 0)
+                     m_avatarTerseUpdateTimer.Stop();
+             }
+         }
+         /// <summary>
+         /// Creates compressed avatar terse update block. This is about half smaller than the orginal SL
+         /// </summary>
+         /// <param name="localID"></param>
+         /// <param name="pos"></param>
+         /// <param name="velocity"></param>
+         /// <param name="rotation"></param>
+         /// <returns></returns>
+         protected ImprovedTerseObjectUpdatePacket.ObjectDataBlock RexCreateAvatarImprovedBlock(uint localID, Vector3 pos,
+                                                                                             Vector3 velocity,
+                                                                                             Quaternion rotation)
+         {
+             byte[] bytes = new byte[30];
+             int i = 0;
+             ImprovedTerseObjectUpdatePacket.ObjectDataBlock dat = PacketPool.GetDataBlock<ImprovedTerseObjectUpdatePacket.ObjectDataBlock>();
+             dat.TextureEntry = new byte[0];
+             uint ID = localID;
+             bytes[i++] = (byte)(ID % 256);
+             bytes[i++] = (byte)((ID >> 8) % 256);
+             bytes[i++] = (byte)((ID >> 16) % 256);
+             bytes[i++] = (byte)((ID >> 24) % 256);
+             // pos
+             byte[] pb = pos.GetBytes();
+             Array.Copy(pb, 0, bytes, i, pb.Length);
+             i += 12;
+             // velocity
+             velocity = velocity / 128.0f;
+             velocity.X += 1;
+             velocity.Y += 1;
+             velocity.Z += 1;
+             ushort InternVelocityX = (ushort)(32768 * velocity.X);
+             ushort InternVelocityY = (ushort)(32768 * velocity.Y);
+             ushort InternVelocityZ = (ushort)(32768 * velocity.Z);
+             bytes[i++] = (byte)(InternVelocityX % 256);
+             bytes[i++] = (byte)((InternVelocityX >> 8) % 256);
+             bytes[i++] = (byte)(InternVelocityY % 256);
+             bytes[i++] = (byte)((InternVelocityY >> 8) % 256);
+             bytes[i++] = (byte)(InternVelocityZ % 256);
+             bytes[i++] = (byte)((InternVelocityZ >> 8) % 256);
+             //rotation
+             ushort rw = (ushort)(32768 * (rotation.W + 1));
+             ushort rx = (ushort)(32768 * (rotation.X + 1));
+             ushort ry = (ushort)(32768 * (rotation.Y + 1));
+             ushort rz = (ushort)(32768 * (rotation.Z + 1));
+             //rot
+             bytes[i++] = (byte)(rx % 256);
+             bytes[i++] = (byte)((rx >> 8) % 256);
+             bytes[i++] = (byte)(ry % 256);
+             bytes[i++] = (byte)((ry >> 8) % 256);
+             bytes[i++] = (byte)(rz % 256);
+             bytes[i++] = (byte)((rz >> 8) % 256);
+             bytes[i++] = (byte)(rw % 256);
+             bytes[i++] = (byte)((rw >> 8) % 256);
+             dat.Data = bytes;
+             return (dat);
+         }
+         #endregion
      }
  }

 Legend:



Removed from v.117
 


changed lines


 
Added in v.141
 Legend:



Removed from v.117
 


changed lines


 
Added in v.141
-Removed from v.117
+Added in v.141

	ViewVC Help
Powered by ViewVC 1.0.0

MyGforge Home

realXtend Modules

Diff of /branches/os-udp/ModularRex/RexNetwork/ClientViews/RexClientViewBase.cs