From 6eeb034febd0108538dad7a0c1b653846b890964 Mon Sep 17 00:00:00 2001
From: Latif Khalifa <latifer@streamgrid.net>
Date: Wed, 27 Jul 2011 07:09:00 +0000
Subject: [PATCH] Only decode textures that we know will be on the screen.

git-svn-id: https://radegast.googlecode.com/svn/trunk@1011 f7a694da-4d33-11de-9ad6-1127a62b9fcd
---
 Radegast/GUI/Rendering/Rendering.cs        | 78 +++++++++++++++++++++---------
 Radegast/GUI/Rendering/RenderingHelpers.cs |  2 +
 2 files changed, 57 insertions(+), 23 deletions(-)

diff --git a/Radegast/GUI/Rendering/Rendering.cs b/Radegast/GUI/Rendering/Rendering.cs
index 5531e53..e06f160 100644
--- a/Radegast/GUI/Rendering/Rendering.cs
+++ b/Radegast/GUI/Rendering/Rendering.cs
@@ -906,8 +906,12 @@ namespace Radegast.Rendering
                 {
                     imageBytes = item.TGAData;
                 }
-                else if (item.TextureData != null)
+                else if (item.TextureData != null || item.LoadAssetFromCache)
                 {
+                    if (item.LoadAssetFromCache)
+                    {
+                        item.TextureData = Client.Assets.Cache.GetCachedAssetBytes(item.Data.TextureInfo.TextureID);
+                    }
                     ManagedImage mi;
                     if (!OpenJPEG.DecodeToImage(item.TextureData, out mi)) continue;
 
@@ -1903,7 +1907,7 @@ namespace Radegast.Rendering
             // Draw the prim faces
             for (int j = 0; j < mesh.Faces.Count; j++)
             {
-                Primitive.TextureEntryFace teFace = mesh.Prim.Textures.FaceTextures[j];
+                Primitive.TextureEntryFace teFace = mesh.Prim.Textures.GetFace((uint)j);
                 Face face = mesh.Faces[j];
                 FaceData data = (FaceData)mesh.Faces[j].UserData;
 
@@ -1911,9 +1915,6 @@ namespace Radegast.Rendering
                     continue;
 
                 if (teFace == null)
-                    teFace = mesh.Prim.Textures.DefaultTexture;
-
-                if (teFace == null)
                     continue;
 
                 // Don't render transparent faces
@@ -1969,7 +1970,27 @@ namespace Radegast.Rendering
 
                     GL.Material(MaterialFace.Front, MaterialParameter.Specular, new float[] { 0.5f, 0.5f, 0.5f, 1f });
 
-                    if (data.TextureInfo.TexturePointer != 0)
+                    if (data.TextureInfo.TexturePointer == 0 && TexturesPtrMap.ContainsKey(teFace.TextureID))
+                    {
+                        data.TextureInfo = TexturesPtrMap[teFace.TextureID];
+                    }
+
+                    if (data.TextureInfo.TexturePointer == 0)
+                    {
+                        GL.Disable(EnableCap.Texture2D);
+                        if (texturesRequestedThisFrame < 2 && !data.TextureInfo.FetchFailed)
+                        {
+                            texturesRequestedThisFrame++;
+
+                            DownloadTexture(new TextureLoadItem()
+                            {
+                                Prim = prim,
+                                TeFace = teFace,
+                                Data = data
+                            });
+                        }
+                    }
+                    else 
                     {
                         // Is this face using texture animation
                         if ((prim.TextureAnim.Flags & Primitive.TextureAnimMode.ANIM_ON) != 0
@@ -1991,10 +2012,6 @@ namespace Radegast.Rendering
                         GL.Enable(EnableCap.Texture2D);
                         GL.BindTexture(TextureTarget.Texture2D, data.TextureInfo.TexturePointer);
                     }
-                    else
-                    {
-                        GL.Disable(EnableCap.Texture2D);
-                    }
 
                 }
                 else
@@ -2309,6 +2326,8 @@ namespace Radegast.Rendering
             GL.End();
         }
 
+        int texturesRequestedThisFrame;
+
         private void Render(bool picking)
         {
             if (picking)
@@ -2366,6 +2385,8 @@ namespace Radegast.Rendering
             }
             else
             {
+                texturesRequestedThisFrame = 0;
+
                 // Alpha mask elements, no blending, alpha test for A > 0.5
                 GL.Enable(EnableCap.AlphaTest);
                 RenderTerrain();
@@ -2491,24 +2512,35 @@ namespace Radegast.Rendering
                 else
                 {
                     TexturesPtrMap[item.TeFace.TextureID] = item.Data.TextureInfo;
+
                     if (item.TextureData == null && item.TGAData == null)
                     {
                         if (CacheDecodedTextures && RHelp.LoadCachedImage(item.TeFace.TextureID, out item.TGAData, out item.Data.TextureInfo.HasAlpha, out item.Data.TextureInfo.FullAlpha, out item.Data.TextureInfo.IsMask))
                         {
                             PendingTextures.Enqueue(item);
                         }
-                        else
+                        else if (Client.Assets.Cache.HasAsset(item.Data.TextureInfo.TextureID))
+                        {
+                            item.LoadAssetFromCache = true;
+                            PendingTextures.Enqueue(item);
+                        }
+                        else if (!item.Data.TextureInfo.FetchFailed)
                         {
-                            ThreadPool.QueueUserWorkItem(sync =>
+                            Client.Assets.RequestImage(item.TeFace.TextureID, (state, asset) =>
                             {
-                                Client.Assets.RequestImage(item.TeFace.TextureID, (state, asset) =>
+                                switch (state)
                                 {
-                                    if (state == TextureRequestState.Finished)
-                                    {
+                                    case TextureRequestState.Finished:
                                         item.TextureData = asset.AssetData;
                                         PendingTextures.Enqueue(item);
-                                    }
-                                });
+                                        break;
+
+                                    case TextureRequestState.Aborted:
+                                    case TextureRequestState.NotFound:
+                                    case TextureRequestState.Timeout:
+                                        item.Data.TextureInfo.FetchFailed = true;
+                                        break;
+                                }
                             });
                         }
                     }
@@ -2568,12 +2600,12 @@ namespace Radegast.Rendering
                 face.UserData = data;
                 rprim.Faces[j] = face;
 
-                DownloadTexture(new TextureLoadItem()
-                {
-                    Data = data,
-                    Prim = prim,
-                    TeFace = teFace
-                });
+                //DownloadTexture(new TextureLoadItem()
+                //{
+                //    Data = data,
+                //    Prim = prim,
+                //    TeFace = teFace
+                //});
             }
 
             lock (Prims)
diff --git a/Radegast/GUI/Rendering/RenderingHelpers.cs b/Radegast/GUI/Rendering/RenderingHelpers.cs
index 2ef9a3d..7ed6e01 100644
--- a/Radegast/GUI/Rendering/RenderingHelpers.cs
+++ b/Radegast/GUI/Rendering/RenderingHelpers.cs
@@ -266,6 +266,7 @@ namespace Radegast.Rendering
         public bool FullAlpha;
         public bool IsMask;
         public UUID TextureID;
+        public bool FetchFailed;
     }
 
     public class TextureLoadItem
@@ -275,6 +276,7 @@ namespace Radegast.Rendering
         public Primitive.TextureEntryFace TeFace;
         public byte[] TextureData = null;
         public byte[] TGAData = null;
+        public bool LoadAssetFromCache = false;
     }
 
     public enum RenderPass
-- 
2.11.0