OpenSimulator GForge > Projects > realXtend Modules > SVN

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

-revision 83, Tue Mar  3 11:28:28 2009 UTC
+revision 86, Wed Mar  4 14:40:05 2009 UTC
 Line 59
          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 96
+Line 97
              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 104
+Line 108
              m_genericMessageHandlers.Add("rexfaceexpression", OnRexFaceExpression);
              m_genericMessageHandlers.Add("rexavatarprop", OnRexAvatarProperties);
              m_genericMessageHandlers.Add("rexmediaurl", TriggerOnReceivedRexMediaURL);
+             m_genericMessageHandlers.Add("rexdata", TriggerOnPrimFreeData);
          }
          /// <summary>
-Line 115
+Line 120
          {
              RegisterInterface<IClientRexAppearance>(this);
              RegisterInterface<IClientRexFaceExpression>(this);
+             RegisterInterface<IClientMediaURL>(this);
              // Register our own class 'as-is' so it can be
              // used via IClientCore.Get<RexClientView>()...
-Line 320
+Line 326
                      return;
                  }
              }
+             if (method == "rexprimdata")
+                 return;
              m_log.Warn("[REXCLIENT] Unhandled GenericMessage (" + method + ") {");
              foreach (string s in args)
-Line 329
+Line 337
              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 650
+Line 678
          {
              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);
          }

 Legend:



Removed from v.83
 


changed lines


 
Added in v.86
 Legend:



Removed from v.83
 


changed lines


 
Added in v.86
-Removed from v.83
+Added in v.86

	ViewVC Help
Powered by ViewVC 1.0.0

MyGforge Home

realXtend Modules

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