OpenSimulator GForge > Projects > realXtend Modules > SVN

Diff of /trunk/ModularRex/RexNetwork/RexClientViewBase.cs

-revision 50, Tue Feb  3 07:08:25 2009 UTC
+revision 55, Wed Feb  4 15:04:47 2009 UTC
 Line 22
      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 56
          public event RexObjectPropertiesDelegate OnRexObjectProperties;
          public event RexStartUpDelegate OnRexStartUp;
          public event RexClientScriptCmdDelegate OnRexClientScriptCmd;
+         public event ReceiveRexMediaURL OnReceiveRexMediaURL;
          public RexClientView(EndPoint remoteEP, IScene scene, AssetCache assetCache,
                               LLPacketServer packServer, AuthenticateResponse authenSessions, UUID agentId,
-Line 65
+Line 66
          {
              // 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 81
              // Rex communication now occurs via GenericMessage
              // We need to register GenericMessage handlers
-             AddGenericPacketHandler("RexAppearance",        RealXtendClientView_OnGenericMessage);
+             AddGenericPacketHandlers();
-             AddGenericPacketHandler("RexFaceExpression",    RealXtendClientView_OnGenericMessage);
-             AddGenericPacketHandler("RexAvatarProp",        RealXtendClientView_OnGenericMessage);
-             AddGenericPacketHandler("RexPrimData",          RealXtendClientView_OnGenericMessage);
-             AddGenericPacketHandler("RexData",              RealXtendClientView_OnGenericMessage);
              OnBinaryGenericMessage += RexClientView_BinaryGenericMessage;
-Line 96
+Line 89
              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);
+         }
          /// <summary>
          /// Registers interfaces for IClientCore,
          /// every time you make a new Rex-specific
-Line 229
+Line 232
                  OnRexObjectProperties(this, id, new RexObjectProperties(rpdArray));
          }
+         private Dictionary<string, RexAvatarPropertiesDelegate> m_genericMessageHandlers;
          /// <summary>
          /// Special - used to convert GenericMessage packets
          /// to their appropriate Rex equivilents.
-Line 239
+Line 244
          void RealXtendClientView_OnGenericMessage(object sender, string method, List<string> args)
          {
              //TODO: Convert to Dictionary<Method, GenericMessageHandler>
+             //RexAvatarPropertiesDelegate method;
+             //if (m_genericMessageHandlers.TryGetValue(method, out method))
+             //{
+             //    method(this, args);
+             //    return;
+             //}
              if (method == "RexAppearance")
                  if (OnRexAppearance != null)
                  {
-Line 287
+Line 299
                  }
              }
+             if (method == "rexmediaurl")
+             {
+                 TriggerOnReceivedRexMediaURL(this, args);
+                 return;
+             }
              m_log.Warn("[REXCLIENTVIEW] Unhandled GenericMessage (" + method + ") {");
              foreach (string s in args)
              {
-Line 295
+Line 313
              m_log.Warn("}");
          }
+         private void TriggerOnReceivedRexMediaURL(IClientAPI sender, List<string> args)
+         {
+             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);
+             }
+         }
          public void SendRexObjectProperties(UUID id, RexObjectProperties x)
          {
              GenericMessagePacket gmp = new GenericMessagePacket();
-Line 690
+Line 725
          /// <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 | mediaURL == string.Empty)
+                 return;
              List<string> pack = new List<string>();
              pack.Add(assetId.ToString());

 Legend:



Removed from v.50
 


changed lines


 
Added in v.55
 Legend:



Removed from v.50
 


changed lines


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

	ViewVC Help
Powered by ViewVC 1.0.0

MyGforge Home

realXtend Modules

Diff of /trunk/ModularRex/RexNetwork/RexClientViewBase.cs