OpenSimulator GForge > Projects > realXtend Modules > SVN

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

-revision 50, Tue Feb  3 07:08:25 2009 UTC
+revision 74, Wed Feb 18 09:49:33 2009 UTC
 Line 16
  namespace ModularRex.RexNetwork
  {
+     public delegate void RexGenericMessageDelegate(RexClientView sender, List<string> parameters);
      public delegate void RexAppearanceDelegate(RexClientView sender);
-     public delegate void RexFaceExpressionDelegate(RexClientView sender, List<string> parameters);
-     public delegate void RexAvatarPropertiesDelegate(RexClientView sender, List<string> parameters);
      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
-Line 32
+Line 31
      /// between Rex and LL, you can use a override on those specific functions
      /// to overload the request.
      /// </summary>
-     public class RexClientView : LLClientView, IClientRexFaceExpression, IClientRexAppearance
+     public class RexClientView : LLClientView, IClientRexFaceExpression, IClientRexAppearance, IClientMediaURL
      {
          private static readonly ILog m_log =
              LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+         protected Dictionary<string, RexGenericMessageDelegate> m_genericMessageHandlers = new Dictionary<string, RexGenericMessageDelegate>();
          private string m_rexAccountID;
          private string m_rexAvatarURL;
          private string m_rexAuthURL;
-Line 51
+Line 52
          public bool RexSitDisabled = false;
          public event RexAppearanceDelegate OnRexAppearance;
-         public event RexFaceExpressionDelegate OnRexFaceExpression;
+         public event RexGenericMessageDelegate OnRexFaceExpression;
-         public event RexAvatarPropertiesDelegate OnRexAvatarProperties;
+         public event RexGenericMessageDelegate OnRexAvatarProperties;
          public event RexObjectPropertiesDelegate OnRexObjectProperties;
          public event RexStartUpDelegate OnRexStartUp;
          public event RexClientScriptCmdDelegate OnRexClientScriptCmd;
+         public event ReceiveRexMediaURL OnReceiveRexMediaURL;
-         public RexClientView(EndPoint remoteEP, IScene scene, AssetCache assetCache,
+         public RexClientView(EndPoint remoteEP, IScene scene, IAssetCache assetCache,
                               LLPacketServer packServer, AuthenticateResponse authenSessions, UUID agentId,
                               UUID sessionId, uint circuitCode, EndPoint proxyEP, ClientStackUserSettings userSettings)
              : base(remoteEP, scene, assetCache, packServer, authenSessions, agentId,
-Line 65
+Line 67
          {
              // Rex communication now occurs via GenericMessage
              // We have a special handler here below.
-             AddGenericPacketHandler("RexAppearance", RealXtendClientView_OnGenericMessage);
+             AddGenericPacketHandlers();
-             AddGenericPacketHandler("RexFaceExpression", RealXtendClientView_OnGenericMessage);
-             AddGenericPacketHandler("RexAvatarProp", RealXtendClientView_OnGenericMessage);
-             AddGenericPacketHandler("RexPrimData", RealXtendClientView_OnGenericMessage);
-             AddGenericPacketHandler("RexData", RealXtendClientView_OnGenericMessage);
              OnBinaryGenericMessage += RexClientView_BinaryGenericMessage;
              OnGenericMessage += RealXtendClientView_OnGenericMessage;
-Line 84
+Line 82
              // Rex communication now occurs via GenericMessage
              // We need to register GenericMessage handlers
+             AddGenericPacketHandlers();
+             OnBinaryGenericMessage += RexClientView_BinaryGenericMessage;
+             RexAvatarURL = rexAvatarURL;
+             RexAuthURL = rexAuthURL;
+         }
+         private void AddGenericPacketHandlers()
+         {
              AddGenericPacketHandler("RexAppearance",        RealXtendClientView_OnGenericMessage);
              AddGenericPacketHandler("RexFaceExpression",    RealXtendClientView_OnGenericMessage);
              AddGenericPacketHandler("RexAvatarProp",        RealXtendClientView_OnGenericMessage);
              AddGenericPacketHandler("RexPrimData",          RealXtendClientView_OnGenericMessage);
              AddGenericPacketHandler("RexData",              RealXtendClientView_OnGenericMessage);
+             AddGenericPacketHandler("RexMediaUrl", RealXtendClientView_OnGenericMessage);
+             AddGenericPacketHandler("rexstartup", RealXtendClientView_OnGenericMessage);
-             OnBinaryGenericMessage += RexClientView_BinaryGenericMessage;
+             m_genericMessageHandlers.Add("rexfaceexpression", OnRexFaceExpression);
+             m_genericMessageHandlers.Add("rexavatarprop", OnRexAvatarProperties);
-             RexAvatarURL = rexAvatarURL;
+             m_genericMessageHandlers.Add("rexmediaurl", TriggerOnReceivedRexMediaURL);
-             RexAuthURL = rexAuthURL;
          }
          /// <summary>
-Line 182
+Line 191
              }
          }
-         void RexClientView_BinaryGenericMessage(Object sender, string method, byte[][] args)
+         private void RexClientView_BinaryGenericMessage(Object sender, string method, byte[][] args)
          {
              if(method == "RexPrimData".ToLower())
              {
-Line 236
+Line 245
          /// Eg: GenericMessage(RexAppearance) ->
          ///     OnRexAppearance(...)
          /// </summary>
-         void RealXtendClientView_OnGenericMessage(object sender, string method, List<string> args)
+         private void RealXtendClientView_OnGenericMessage(object sender, string method, List<string> args)
          {
-             //TODO: Convert to Dictionary<Method, GenericMessageHandler>
+             RexGenericMessageDelegate handler;
-             if (method == "RexAppearance")
+             if (m_genericMessageHandlers.ContainsKey(method.ToLower()))
-                 if (OnRexAppearance != null)
                  {
-                     OnRexAppearance(this);
+                 handler = m_genericMessageHandlers[method.ToLower()];
-                     return;
+                 if (handler != null)
-                 }
-             if (method == "RexFaceExpression")
-             {
-                 if (OnRexFaceExpression != null)
                  {
-                     OnRexFaceExpression(this, args);
+                     handler(this, args);
-                     return;
                  }
+                 return;
              }
-             if (method == "RexAvatarProp")
+             if (method == "RexAppearance")
              {
-                 if(OnRexAvatarProperties != null)
+                 if (OnRexAppearance != null)
                  {
-                     OnRexAvatarProperties(this, args);
+                     OnRexAppearance(this);
                      return;
                  }
              }
-             if(method == "RexData")
-             {
-             }
              if (method == "rexscr")
              {
                  if (OnRexClientScriptCmd != null)
-Line 278
+Line 276
                  }
              }
-             if (method == "RexStartup")
+             if (method == "rexstartup")
              {
                  if (OnRexStartUp != null)
                  {
-Line 287
+Line 285
                  }
              }
-             m_log.Warn("[REXCLIENTVIEW] Unhandled GenericMessage (" + method + ") {");
+             m_log.Warn("[REXCLIENT] Unhandled GenericMessage (" + method + ") {");
              foreach (string s in args)
              {
                  m_log.Warn("\t" + s);
-Line 295
+Line 293
              m_log.Warn("}");
          }
+         private void TriggerOnReceivedRexMediaURL(IClientAPI sender, List<string> args)
+         {
+             try
+             {
+                 foreach (string s in args)
+                 {
+                     m_log.Debug("[REXCLIENT] MediaURL: " + s);
+                 }
+                 UUID assetID = new UUID(args[0]);
+                 string mediaUrl = args[1];
+                 byte refreshRate = Convert.ToByte(args[2]);
+                 if (OnReceiveRexMediaURL != null)
+                 {
+                     OnReceiveRexMediaURL(this, AgentId, assetID, mediaUrl, refreshRate);
+                 }
+             }
+             catch (Exception e)
+             {
+                 m_log.ErrorFormat("[REXCLIENT] Error parseing incoming media url. Exception: ", e);
+             }
+         }
          public void SendRexObjectProperties(UUID id, RexObjectProperties x)
          {
              GenericMessagePacket gmp = new GenericMessagePacket();
-Line 506
+Line 528
          /// <param name="height">Height of the texture</param>
          public void SendRexRttCamera(int command, string name, UUID assetId, Vector3 pos, Vector3 lookat, int width, int height)
          {
+             string sPos = pos.X.ToString() + " " + pos.Y.ToString() + " " + pos.Z.ToString();
+             sPos = sPos.Replace(",", ".");
+             string sLookAt = lookat.X.ToString() + " " + lookat.Y.ToString() + " " + lookat.Z.ToString();
+             sLookAt = sLookAt.Replace(",", ".");
              List<string> pack = new List<string>();
              pack.Add(command.ToString());
              pack.Add(name);
              pack.Add(assetId.ToString());
-             pack.Add(pos.ToString());
+             pack.Add(sPos);
-             pack.Add(lookat.ToString());
+             pack.Add(sLookAt);
              pack.Add(width.ToString());
              pack.Add(height.ToString());
-Line 617
+Line 644
              SendGenericMessage("RexFlashAnim", pack);
          }
-         internal void SendRexPreloadAvatarAssets(List<string> vAssetsList)
+         /// <summary>
+         /// Sends preload avatar assets
+         /// </summary>
+         /// <param name="assetList">List of avatar assets</param>
+         public void SendRexPreloadAvatarAssets(List<string> assetList)
+         {
+             try
+             {
+                 List<string> pack = new List<string>();
+                 foreach (string avatarUrl in assetList)
          {
-             throw new System.NotImplementedException();
+                     pack.Add(avatarUrl);
+                 }
+                 SendGenericMessage("RexPreloadAppearance", pack);
+             }
+             catch (Exception exep)
+             {
+                 m_log.Error("[REXCLIENT]: SendRexPreloadAvatarAssets fail:" + exep.ToString());
+             }
          }
          /// <summary>
-Line 677
+Line 722
              SendGenericMessage("RexSky", pack);
          }
-         internal void SendRexPreloadAssets(Dictionary<UUID, uint> tempassetlist)
+         /// <summary>
+         /// Sends list of preloaded assets to user
+         /// </summary>
+         /// <param name="assetList"></param>
+         public void SendRexPreloadAssets(Dictionary<UUID, uint> assetList)
+         {
+             try
+             {
+                 List<string> pack = new List<string>();
+                 string assetline = String.Empty;
+                 foreach (UUID materialUUID in assetList.Keys)
+                 {
+                     assetline = assetList[materialUUID] + " " + materialUUID.ToString();
+                     pack.Add(assetline);
+                 }
+                 SendGenericMessage("RexPreloadAssets", pack);
+             }
+             catch (Exception exep)
          {
-             throw new System.NotImplementedException();
+                 m_log.Error("[REXCLIENT]: SendRexPreloadAssets fail:" + exep.ToString());
+             }
          }
          /// <summary>
-Line 690
+Line 755
          /// <param name="refreshRate">How many times per second to refresh the texture</param>
          public void SendMediaURL(UUID assetId, string mediaURL, byte refreshRate)
          {
+             if (mediaURL == null)
+             {
+                 m_log.Warn("[REXCLIENT]: Did not send media url to user, because it was null");
+                 return;
+             }
              List<string> pack = new List<string>();
              pack.Add(assetId.ToString());
-Line 748
+Line 818
              SendGenericMessage("RexMorph", pack);
          }
-         internal void SendRexMeshAnimation(UUID uUID, string vAnimName, float vRate, bool vbLooped, bool vbStopAnim)
+         /// <summary>
+         /// Send Mesh Animation command to client
+         /// </summary>
+         /// <param name="primId">id of the primitive</param>
+         /// <param name="animationName">Name of the animation to launch</param>
+         /// <param name="rate">Speed of the animation, where 1.0 is default speed</param>
+         /// <param name="loop">True to make the animation looped, false to play it only once</param>
+         /// <param name="stopAnimation">True to stop the animation, false to launch the animation</param>
+         public void SendRexMeshAnimation(UUID primId, string animationName, float rate, bool loop, bool stopAnimation)
          {
-             throw new System.NotImplementedException();
+             List<string> pack = new List<string>();
+             pack.Add(primId.ToString());
+             pack.Add(animationName);
+             pack.Add(rate.ToString());
+             pack.Add(loop.ToString());
+             pack.Add(stopAnimation.ToString());
+             SendGenericMessage("RexPrimAnim", pack);
          }
-         internal void SendRexClientSideEffect(string assetId, float vTimeUntilLaunch, float vTimeUntilDeath, Vector3 pos, Quaternion rot, float vSpeed)
+         /// <summary>
+         /// Send Client side effect to client
+         /// </summary>
+         /// <param name="assetId">Id of the asset</param>
+         /// <param name="timeUntilLaunch">Time in seconds until the effect is launched on the client.
+         ///  Set to zero to launch immediatelly</param>
+         /// <param name="timeUntilDeath">The duration of the effect. The particle system gets completely
+         ///  destroyed after this duration. The duration is counted after the effect is launched. </param>
+         /// <param name="pos">Position of the effect in the world</param>
+         /// <param name="rot">Rotation of the particle system. Affects it's movement if speed > 0</param>
+         /// <param name="speed">Speed at which the particle system moves. The system moves at the direction
+         ///  specified by rot. Set to zero to make it stationary.</param>
+         public void SendRexClientSideEffect(string assetId, float timeUntilLaunch, float timeUntilDeath, Vector3 pos, Quaternion rot, float speed)
          {
-             throw new System.NotImplementedException();
+             List<string> pack = new List<string>();
+             pack.Add(assetId.ToString());
+             pack.Add(timeUntilLaunch.ToString().Replace(",", "."));
+             pack.Add(timeUntilDeath.ToString().Replace(",", "."));
+             string sPos = pos.X.ToString() + " " + pos.Y.ToString() + " " + pos.Z.ToString();
+             sPos = sPos.Replace(",", ".");
+             pack.Add(sPos);
+             string sRot = rot.X.ToString() + " " + rot.Y.ToString() + " " + rot.Z.ToString() + " " + rot.W.ToString();
+             sRot = sRot.Replace(",", ".");
+             pack.Add(sRot);
+             pack.Add(speed.ToString().Replace(",", "."));
+             SendGenericMessage("RexCSEffect", pack);
          }
+         //public override void InformClientOfNeighbour(ulong neighbourHandle, IPEndPoint neighbourExternalEndPoint)
+         //{
+         //    m_log.Debug("[REXCLIENT]: Informing Client About Neighbour");
+         //    neighbourExternalEndPoint.Port = neighbourExternalEndPoint.Port - 2000;
+         //    base.InformClientOfNeighbour(neighbourHandle, neighbourExternalEndPoint);
+         //}
      }
  }

 Legend:



Removed from v.50
 


changed lines


 
Added in v.74
 Legend:



Removed from v.50
 


changed lines


 
Added in v.74
-Removed from v.50
+Added in v.74

	ViewVC Help
Powered by ViewVC 1.0.0

MyGforge Home

realXtend Modules

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