OpenSimulator GForge > Projects > Xenki Viewer > SVN

Diff of /trunk/DefaultNetwork/DefaultNetwork.cs

-revision 37, Sat Sep 27 10:42:29 2008 UTC
+revision 38, Sun Sep 28 11:35:18 2008 UTC
 Line 5
  using Xenki.Framework;
  using System.Drawing;
  using System.Windows.Media.Imaging;
+ using System.IO;
+ using OpenMetaverse.Imaging;
  //using System.IO;
  //using System.Windows.Media;
  //using System.Drawing.Imaging;
-Line 15
+Line 17
  namespace Xenki.DefaultNetwork
  {
      public delegate void OnLogDelegate(string msg);
+     public delegate void OnMessageChatDelegate(string msg);
      class DefaultNetwork
      {
-Line 27
+Line 31
          private Timer m_cameraTimer = new Timer(1000);
          private int m_cameraSeed;
          private Random m_random = new Random(1338);
+         private DefaultTexture.DefaultTexture defaultTexture;
+        public static TextureCache textureCauche;
          public event OnLogDelegate OnLog;
+         public event OnMessageChatDelegate OnMessageChat;
+         DefaultAgent.MessageChatManage chat;
          //AssetManager asset ;
-Line 45
+Line 55
              m_gridclient = new GridClient();
              this.m_renderer = m_renderer;
              DefaultNetwork.m_primitiveData = m_primitiveData;
+             defaultTexture = new Xenki.DefaultTexture.DefaultTexture(m_gridclient);
-             //asset = new AssetManager(m_gridclient);
+             m_gridclient.Settings.USE_TEXTURE_CACHE = true;
-             //asset.OnAssetReceived += new AssetManager.AssetReceivedCallback(asset_OnAssetReceived);
+             m_gridclient.Settings.TEXTURE_CACHE_DIR = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "textures");
              // Important
              m_gridclient.Settings.MULTIPLE_SIMS = false;
              m_gridclient.Settings.OBJECT_TRACKING = false;
              Settings.LOG_LEVEL = Helpers.LogLevel.Debug;
              m_gridclient.Throttle.Land = 10000;
-Line 63
+Line 75
              m_gridclient.Terrain.OnLandPatch += Terrain_OnLandPatch;
              m_gridclient.Network.OnSimConnected += Network_OnSimConnected;
-             m_gridclient.Assets.OnImageReceived += new AssetManager.ImageReceivedCallback(Assets_OnImageReceived);
+             defaultTexture.OnDownloadFinished += new Xenki.DefaultTexture.DefaultTexture.DownloadFinishedCallback(defaultTexture_OnDownloadFinished);
+              chat = new Xenki.DefaultAgent.MessageChatManage(m_gridclient);
+              chat.OnChat += new Xenki.DefaultAgent.OnChatDelegate(chat_OnChat);
+              textureCauche = new TextureCache(m_gridclient);
              Logger.OnLogMessage += Logger_OnLogMessage;
-Line 71
+Line 89
              m_cameraTimer.Elapsed += m_cameraTimer_Elapsed;
          }
+         void chat_OnChat(string msg)
+         {
+             if (OnMessageChat != null)
+                 OnMessageChat(msg);
+         }
+         void defaultTexture_OnDownloadFinished(ImageDownload imageIDDownload, bool success)
+         {
+             byte[] bytes;
+             bytes = DefaultNetwork.m_primitiveData.RetireveTextureData(imageIDDownload.ID);
+             if (bytes == null || bytes.Length <= 0)
+             {
+                 DefaultNetwork.m_primitiveData.CacheDownloadedTexture(imageIDDownload);
+             }
+             if (success == true)
+             {
+                 textureCauche.SaveImageToCache(imageIDDownload.ID, imageIDDownload.AssetData);
+                 m_renderer.UpdatePrimTexture(imageIDDownload.ID);
+             }
+         }
-         int times = 0;
          void Objects_OnObjectUpdated(Simulator simulator, ObjectUpdate update, ulong regionHandle, ushort timeDilation)
          {
-             times++;
          }
          void m_cameraTimer_Elapsed(object sender, ElapsedEventArgs e)
-Line 134
+Line 174
          void Network_OnConnected(object sender)
          {
              // Download whole scene here.
-             textureCache = new TextureCache(m_gridclient);
+             //textureCache = new TextureCache(m_gridclient);
              m_gridclient.Self.Movement.Camera.LookAt(new Vector3(128, 128, 192), new Vector3(128, 128, 0));
          }
-Line 173
+Line 213
          {
              try
              {
                  //log("Adding new primitive to Renderer scene: " + prim.LocalID + " at " + prim.Position);
                  DownLoadTextureAndCache(prim.Textures.DefaultTexture.TextureID);
-                 m_renderer.AddPrimitive(prim.LocalID, prim);
-                // m_primitiveData.AddNewPrimitive(prim.LocalID, prim);
+                 m_renderer.AddPrimitive(prim.LocalID, prim);
              } catch(Exception e)
              {
-Line 185
+Line 225
              }
          }
-        public static TextureCache textureCache;
+        //public static TextureCache textureCache;
          void DownLoadTextureAndCache(UUID textureID)
          {
             // asset.Cache = textureCache;
              //asset.RequestAsset(textureID, AssetType.Texture, true);
-             byte[] imagebytes = DefaultNetwork.textureCache.GetCachedImageBytes(textureID);
+             byte[] imagebytes = DefaultNetwork.m_primitiveData.RetireveTextureData(textureID);
              if (imagebytes != null && imagebytes.Length > 0)
                  return;
              if (DefaultNetwork.m_primitiveData.UnAttachedTextures.ContainsValue(textureID) == true)
                  return;
-             RequestTexture(textureID);
+             defaultTexture.RequestTexture(textureID);
-         }
-         void Assets_OnImageReceived(ImageDownload image, AssetTexture asset)
-         {
-             if (image.Success == true)
-             {
-                 lock (textureCache)
-                 {
-                     if (textureCache.HasImage(image.ID) == false)
-                     {
-                         textureCache.SaveImageToCache(image.ID, image.AssetData);
-                     }
-                    // OpenMetaverse.Imaging.ManagedImage img;
-                    // //    //Image imgg ;
-                    // OpenMetaverse.AssetTexture texture = new AssetTexture();
-                    // OpenMetaverse.Imaging.OpenJPEG.DecodeToImage(image.AssetData, out texture.Image);
-                    //byte[] test= texture.Image.ExportTGA();
-                     //if (texture.Image == null)
-                     //    return;
-                     //img = texture.Image;
-                     ////OpenMetaverse.Imaging.OpenJPEG.DecodeToImage(asset.AssetData, out img);
-                     //byte[] imagebytes = img.ExportTGA();
-                     //MemoryStream ms = new MemoryStream(imagebytes);
-                     //ms.Write(imagebytes, 0, imagebytes.Length);
-                     //Bitmap bitmap = OpenMetaverse.Imaging.LoadTGAClass.LoadTGA(ms);
-                     //ms.Close();
-                     //bitmap.Save(Path.Combine(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "test"), new Guid().ToString() + ".bmp"), ImageFormat.Bmp);
-                 }
-                 m_renderer.UpdatePrimTexture(image.ID);
              }
-         }
-         void asset_OnAssetReceived(AssetDownload transfer, Asset asset)
-         {
-             OpenMetaverse.Imaging.ManagedImage image;
-             OpenMetaverse.Imaging.OpenJPEG.DecodeToImage(transfer.AssetData, out image);
-             if (image != null)
-             {
-                 image.ExportTGA();
-             }
-             if (transfer.Status == StatusCode.Done)
-             {
-                 lock (textureCache)
-                 {
-                     if (textureCache.HasImage(transfer.AssetID) == false)
-                     {
-                         textureCache.SaveImageToCache(transfer.AssetID, transfer.AssetData);
-                     }
-                 }
-                 m_renderer.UpdatePrimTexture(transfer.AssetID);
-             }
-         }
      }
  }

 Legend:



Removed from v.37
 


changed lines


 
Added in v.38
 Legend:



Removed from v.37
 


changed lines


 
Added in v.38
-Removed from v.37
+Added in v.38

	ViewVC Help
Powered by ViewVC 1.0.0

MyGforge Home

Xenki Viewer

Diff of /trunk/DefaultNetwork/DefaultNetwork.cs