Fix speed issues with chunk loading under Linux

RedpointArchive · Dec 21, 2013 · 379e4a0 · 379e4a0
1 parent 831bb29
commit 379e4a0
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/Protogame/Assets/DefaultTransparentAssetCompiler.cs b/Protogame/Assets/DefaultTransparentAssetCompiler.cs
@@ -25,7 +25,9 @@ public IAsset HandlePlatform(IAsset asset, TargetPlatform platform, bool force =
                 var compiler = this.m_Kernel.TryGet(compilerType);
                 if (compiler == null)
                 {
-                    throw new AssetNotCompiledException(asset.Name);
+                    // The caller will throw AssetNotCompiledException if all of the candidates
+                    // for loading only have source information.
+                    return asset;
                 }
                 var proxyType = typeof(AssetCompilerProxy<>).MakeGenericType(asset.GetType());
                 var proxy = (IAssetCompilerProxyInterface)

diff --git a/Protogame/Assets/LocalAsset.cs b/Protogame/Assets/LocalAsset.cs
@@ -12,7 +12,9 @@ public class LocalAsset : IAsset
         private LocalAssetManager Manager { get; set; }
 
         private IAsset m_Instance;
-
+
+        private IAsset m_CachedProxy;
+
         public event EventHandler Dirtied;
 
         /// <summary>
@@ -62,20 +64,32 @@ public IAsset Instance
         {
             get
             {
-                return this.FormProxyIfPossible(this.m_Instance);
+                return this.GetProxy(this.m_Instance);
             }
         }
 
         public T Resolve<T>() where T : class, IAsset
         {
             if (this.m_Instance is T)
             {
-                return this.FormProxyIfPossible(this.m_Instance as T);
+                return this.GetProxy(this.m_Instance as T);
             }
             throw new InvalidOperationException(
                 "Local asset can not be resolved");
         }
 
+        private T GetProxy<T>(T obj) where T : class, IAsset
+        {
+            if (this.m_CachedProxy != null)
+            {
+                return this.m_CachedProxy as T;
+            }
+
+            var proxy = this.FormProxyIfPossible(obj);
+            this.m_CachedProxy = proxy;
+            return proxy;
+        }
+
         private T FormProxyIfPossible<T>(T obj) where T : class, IAsset
         {
             if (!typeof(MarshalByRefObject).IsAssignableFrom(obj.GetType()))