Merge branch 'fix/improve-image-loading-errors' into eerop

eeropomell · Jun 23, 2024 · 5377539 · 5377539
2 parents 687ed0c + 8c108cf
commit 5377539
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 1 deletion.
diff --git a/Assets/Scripts/GUI/LoadBackgroundImageButton.cs b/Assets/Scripts/GUI/LoadBackgroundImageButton.cs
@@ -47,7 +47,14 @@ override protected void OnButtonPressed()
             {
                 return;
             }
-            SceneSettings.m_Instance.LoadCustomSkybox(ReferenceImage.FileName);
+            if (ReferenceImage.NotLoaded)
+            {
+                // Load-on-demand.
+                ReferenceImage.SynchronousLoad();
+            }
+
+
+            SceneSettings.m_Instance.LoadCustomSkyboxFromCache(ReferenceImage.FileName);
         }
 
         override public void ResetState()

diff --git a/Assets/Scripts/SceneSettings.cs b/Assets/Scripts/SceneSettings.cs
@@ -250,6 +250,32 @@ public void LoadCustomSkybox(string filename)
             }
         }
 
+        public void LoadCustomSkyboxFromCache(string filename)
+        {
+            Texture2D tex = ImageCache.LoadImageCache(filename);
+
+            if (tex == null)
+            {
+                LoadCustomSkybox(filename);
+            }
+            else
+            {
+                float aspectRatio = tex.width / tex.height;
+                if (aspectRatio > 1.5)
+                {
+                    m_CustomSkyboxMaterial = Resources.Load<Material>("Environments/CustomSkybox");
+                }
+                else
+                {
+                    m_CustomSkyboxMaterial = Resources.Load<Material>("Environments/CustomStereoSkybox");
+                }
+                m_CustomSkyboxMaterial.mainTexture = tex;
+                m_CustomSkyboxMaterial.SetColor("_Tint", Color.gray);
+                RenderSettings.skybox = m_CustomSkyboxMaterial;
+                RenderSettings.ambientMode = AmbientMode.Skybox;
+            }
+        }
+
         public Quaternion GradientOrientation
         {
             get { return m_GradientSkew; }