OpenSimulator GForge > Projects > realXtend Modules > SVN

Diff of /branches/taiga-0.1/ModularRex/RexNetwork/ClientViews/RexClientViewBase.cs

-revision 77, Wed Feb 25 06:56:19 2009 UTC
+revision 118, Wed Apr 22 12:48:11 2009 UTC
 Line 13
  using OpenSim.Framework.Communications.Cache;
  using OpenSim.Region.ClientStack;
  using OpenSim.Region.ClientStack.LindenUDP;
+ using ModularRex.RexNetwork.RexLogin;
  namespace ModularRex.RexNetwork
  {
-     public delegate void RexGenericMessageDelegate(RexClientView sender, List<string> parameters);
-     public delegate void RexAppearanceDelegate(RexClientView sender);
-     public delegate void RexObjectPropertiesDelegate(RexClientView sender, UUID id, RexObjectProperties props);
-     public delegate void RexStartUpDelegate(RexClientView remoteClient, UUID agentID, string status);
-     public delegate void RexClientScriptCmdDelegate(RexClientView remoteClient, UUID agentID, List<string> parameters);
-     public delegate void ReceiveRexMediaURL(IClientAPI remoteClient, UUID agentID, UUID itemID, string mediaURL, byte refreshRate);
      /// <summary>
      /// Inherits from LLClientView the majority of functionality
      /// Overrides and extends for Rex-specific functionality.
-Line 31
+Line 25
      /// between Rex and LL, you can use a override on those specific functions
      /// to overload the request.
      /// </summary>
-     public class RexClientView : LLClientView, IClientRexFaceExpression, IClientRexAppearance, IClientMediaURL
+     public class RexClientView : LLClientView, IClientRexFaceExpression, IClientRexAppearance, IClientMediaURL, IRexClientCore
      {
          private static readonly ILog m_log =
              LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-Line 40
+Line 34
          private string m_rexAccountID;
          private string m_rexAvatarURL;
+         private string m_rexAvatarURLOverride;
          private string m_rexAuthURL;
          private string m_rexSkypeURL;
-         public string AvatarStorageOverride;
-         public float RexCharacterSpeedMod = 1.0f;
+         private float m_RexCharacterSpeedMod = 1.0f;
-         public float RexMovementSpeedMod = 1.0f;
+         private float m_RexVertMovementSpeedMod = 1.0f;
-         public float RexVertMovementSpeedMod = 1.0f;
-         public bool RexWalkDisabled = false;
-         public bool RexFlyDisabled = false;
-         public bool RexSitDisabled = false;
          public event RexAppearanceDelegate OnRexAppearance;
          public event RexGenericMessageDelegate OnRexFaceExpression;
-Line 58
+Line 48
          public event RexStartUpDelegate OnRexStartUp;
          public event RexClientScriptCmdDelegate OnRexClientScriptCmd;
          public event ReceiveRexMediaURL OnReceiveRexMediaURL;
+         public event RexGenericMessageDelegate OnPrimFreeData;
          public RexClientView(EndPoint remoteEP, IScene scene, IAssetCache assetCache,
                               LLPacketServer packServer, AuthenticateResponse authenSessions, UUID agentId,
-Line 95
+Line 86
              AddGenericPacketHandler("RexAppearance", RealXtendClientView_OnGenericMessage);
              AddGenericPacketHandler("RexFaceExpression", RealXtendClientView_OnGenericMessage);
              AddGenericPacketHandler("RexAvatarProp", RealXtendClientView_OnGenericMessage);
+             //This added here only to disable warning about unhandled generic message
+             //RexPrimData is actually handled  in RexClientView_BinaryGenericMessage
              AddGenericPacketHandler("RexPrimData", RealXtendClientView_OnGenericMessage);
              AddGenericPacketHandler("RexData", RealXtendClientView_OnGenericMessage);
              AddGenericPacketHandler("RexMediaUrl", RealXtendClientView_OnGenericMessage);
-Line 103
+Line 97
              m_genericMessageHandlers.Add("rexfaceexpression", OnRexFaceExpression);
              m_genericMessageHandlers.Add("rexavatarprop", OnRexAvatarProperties);
              m_genericMessageHandlers.Add("rexmediaurl", TriggerOnReceivedRexMediaURL);
+             m_genericMessageHandlers.Add("rexdata", TriggerOnPrimFreeData);
          }
          /// <summary>
          /// Registers interfaces for IClientCore,
          /// every time you make a new Rex-specific
-Line 114
+Line 111
          {
              RegisterInterface<IClientRexAppearance>(this);
              RegisterInterface<IClientRexFaceExpression>(this);
+             RegisterInterface<IClientMediaURL>(this);
+             RegisterInterface<IRexClientCore>(this);
              // Register our own class 'as-is' so it can be
              // used via IClientCore.Get<RexClientView>()...
-Line 122
+Line 121
              base.RegisterInterfaces();
          }
+         #region Properties
          /// <summary>
          /// The avatar URL for this avatar
          /// Eg: http://avatar.com:10000/uuid/
-Line 141
+Line 142
          }
          /// <summary>
+         /// The avatar URL override for this avatar
+         /// Eg: http://avatar.com:10000/uuid/
+         /// </summary>
+         public string RexAvatarURLOverride
+         {
+             get { return m_rexAvatarURLOverride; }
+             set
+             {
+                 m_rexAvatarURLOverride = value;
+                 if (OnRexAppearance != null)
+                 {
+                     OnRexAppearance(this);
+                     return;
+                 }
+             }
+         }
+         /// <summary>
+         /// The URL to avatar appearance which this view currently uses.
+         /// If override is used, return it. Otherwise return normal avatar url.
+         /// Eg: http://avatar.com:10000/uuid/
+         /// </summary>
+         public string RexAvatarURLVisible
+         {
+             get
+             {
+                 if (!string.IsNullOrEmpty(RexAvatarURLOverride))
+                     return RexAvatarURLOverride;
+                 else
+                     return RexAvatarURL;
+             }
+         }
+         /// <summary>
          /// Skype username of the avatar
          /// eg: Skypeuser
          /// </summary>
-Line 191
+Line 227
              }
          }
+         public float RexCharacterSpeedMod
+         {
+             get { return m_RexCharacterSpeedMod; }
+             set { m_RexCharacterSpeedMod = value; }
+         }
+         public float RexVertMovementSpeedMod
+         {
+             get { return m_RexVertMovementSpeedMod; }
+             set { m_RexVertMovementSpeedMod = value; }
+         }
+         #endregion
          private void RexClientView_BinaryGenericMessage(Object sender, string method, byte[][] args)
          {
              if(method == "RexPrimData".ToLower())
-Line 258
+Line 309
                  return;
              }
-             if (method == "RexAppearance")
+             if (method.ToLower() == "rexappearance")
              {
                  if (OnRexAppearance != null)
                  {
-Line 284
+Line 335
                      return;
                  }
              }
+             if (method == "rexprimdata")
+                 return;
              m_log.Warn("[REXCLIENT] Unhandled GenericMessage (" + method + ") {");
              foreach (string s in args)
-Line 293
+Line 346
              m_log.Warn("}");
          }
+         private void TriggerOnPrimFreeData(IClientAPI sender, List<string> args)
+         {
+             try
+             {
+                 //foreach (string s in args)
+                 //{
+                 //    m_log.Debug("[REXCLIENT] PrimFreeData: " + s);
+                 //}
+                 if (OnPrimFreeData != null)
+                 {
+                     OnPrimFreeData(this, args);
+                 }
+             }
+             catch (Exception e)
+             {
+                 m_log.ErrorFormat("[REXCLIENT] Error parseing incoming prim free data. Exception: ", e);
+             }
+         }
          private void TriggerOnReceivedRexMediaURL(IClientAPI sender, List<string> args)
          {
              try
-Line 614
+Line 687
          {
              List<string> pack = new List<string>();
-             pack.Add(direction.ToString());
+             string slightDirection = direction.X.ToString() + " " + direction.Y.ToString() + " " + direction.Z.ToString();
-             pack.Add(colour.ToString());
+             slightDirection = slightDirection.Replace(",", ".");
-             pack.Add(ambientColour.ToString());
+             string slightColour = colour.X.ToString() + " " + colour.Y.ToString() + " " + colour.Z.ToString();
+             slightColour = slightColour.Replace(",", ".");
+             string sambientColour = ambientColour.X.ToString() + " " + ambientColour.Y.ToString() + " " + ambientColour.Z.ToString();
+             sambientColour = sambientColour.Replace(",", ".");
+             pack.Add(slightDirection);
+             pack.Add(slightColour);
+             pack.Add(sambientColour);
              SendGenericMessage("RexAmbientL", pack);
          }
-Line 874
+Line 954
          public override void InformClientOfNeighbour(ulong neighbourHandle, IPEndPoint neighbourExternalEndPoint)
          {
-             m_log.Debug("[REXCLIENT]: Informing Client About Neighbour");
+             IRexUDPPort module = m_scene.RequestModuleInterface<IRexUDPPort>();
-             neighbourExternalEndPoint.Port = neighbourExternalEndPoint.Port - 2000;
+             int udpport = module.GetPort(neighbourHandle);
-             base.InformClientOfNeighbour(neighbourHandle, neighbourExternalEndPoint);
+             m_log.DebugFormat("[REXCLIENT]: Informing Client About Neighbour {0}", neighbourExternalEndPoint);
+             base.InformClientOfNeighbour(neighbourHandle, new IPEndPoint(neighbourExternalEndPoint.Address, udpport));
          }
          public override void CrossRegion(ulong newRegionHandle, Vector3 pos, Vector3 lookAt, IPEndPoint externalIPEndPoint,
                                  string capsURL)
          {
-             m_log.Debug("[REXCLIENT]: Crossing client to region");
+             IRexUDPPort module = m_scene.RequestModuleInterface<IRexUDPPort>();
-             externalIPEndPoint.Port = externalIPEndPoint.Port - 2000;
+             int udpport = module.GetPort(newRegionHandle);
-             base.CrossRegion(newRegionHandle, pos, lookAt, externalIPEndPoint, capsURL);
+             m_log.DebugFormat("[REXCLIENT]: Crossing client to region {0}", externalIPEndPoint);
+             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)
          {
-             m_log.Debug("[REXCLIENT]: Sending region teleport to client");
+             IRexUDPPort module = m_scene.RequestModuleInterface<IRexUDPPort>();
-             newRegionEndPoint.Port = newRegionEndPoint.Port - 2000;
+             int udpport = module.GetPort(regionHandle);
-             base.SendRegionTeleport(regionHandle, simAccess, newRegionEndPoint, locationID, flags, capsURL);
+             m_log.DebugFormat("[REXCLIENT]: Sending region teleport to client {0}", newRegionEndPoint);
+             base.SendRegionTeleport(regionHandle, simAccess, new IPEndPoint(newRegionEndPoint.Address, udpport), locationID, flags, capsURL);
          }
      }
  }

 Legend:



Removed from v.77
 


changed lines


 
Added in v.118
 Legend:



Removed from v.77
 


changed lines


 
Added in v.118
-Removed from v.77
+Added in v.118

	ViewVC Help
Powered by ViewVC 1.0.0

MyGforge Home

realXtend Modules

Diff of /branches/taiga-0.1/ModularRex/RexNetwork/ClientViews/RexClientViewBase.cs