Merge pull request #14122 from SamGondelman/skybox

Rebake default skybox for all platforms

interface/resources/images/Default-Sky-9-cubemap/Default-Sky-9-cubemap.texmeta.json

@@ -0,0 +1,8 @@
+{
+    "compressed": {
+        "COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT": "Default-Sky-9-cubemap_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT.ktx",
+        "COMPRESSED_SRGB8_ETC2": "Default-Sky-9-cubemap_COMPRESSED_SRGB8_ETC2.ktx"
+    },
+    "original": "Default-Sky-9-cubemap.jpg",
+    "uncompressed": "Default-Sky-9-cubemap.ktx"
+}

libraries/render-utils/src/DeferredLightingEffect.cpp

@@ -647,19 +647,18 @@ void RenderDeferred::run(const RenderContextPointer& renderContext, const Inputs
 void DefaultLightingSetup::run(const RenderContextPointer& renderContext) {
 
     if (!_defaultLight || !_defaultBackground) {
-        if (!_defaultSkyboxTexture) {
+        if (!_defaultSkyboxNetworkTexture) {
-            auto textureCache = DependencyManager::get<TextureCache>();
+            PROFILE_RANGE(render, "Process Default Skybox");
-            {
+            _defaultSkyboxNetworkTexture = DependencyManager::get<TextureCache>()->getTexture(
-                PROFILE_RANGE(render, "Process Default Skybox");
+                PathUtils::resourcesUrl() + "images/Default-Sky-9-cubemap/Default-Sky-9-cubemap.texmeta.json", image::TextureUsage::CUBE_TEXTURE);
-                QFileSelector fileSelector;
+        }
-                fileSelector.setExtraSelectors(FileUtils::getFileSelectors());
-                auto skyboxUrl = fileSelector.select(PathUtils::resourcesPath() + "images/Default-Sky-9-cubemap.ktx");
 
-                _defaultSkyboxTexture = gpu::Texture::unserialize(skyboxUrl.toStdString());
+        if (_defaultSkyboxNetworkTexture && _defaultSkyboxNetworkTexture->isLoaded() && _defaultSkyboxNetworkTexture->getGPUTexture()) {
-                _defaultSkyboxAmbientTexture = _defaultSkyboxTexture;
+            _defaultSkyboxAmbientTexture = _defaultSkyboxNetworkTexture->getGPUTexture();
-
+            _defaultSkybox->setCubemap(_defaultSkyboxAmbientTexture);
-                _defaultSkybox->setCubemap(_defaultSkyboxTexture);
+        } else {
-            }
+            // Don't do anything until the skybox has loaded
+            return;
         }
 
         auto lightStage = renderContext->_scene->getStage<LightStage>();

libraries/render-utils/src/DeferredLightingEffect.h

@@ -220,7 +220,7 @@ protected:
     graphics::HazePointer _defaultHaze{ nullptr };
     HazeStage::Index _defaultHazeID{ HazeStage::INVALID_INDEX };
     graphics::SkyboxPointer _defaultSkybox { new ProceduralSkybox() };
-    gpu::TexturePointer _defaultSkyboxTexture;
+    NetworkTexturePointer _defaultSkyboxNetworkTexture;
     gpu::TexturePointer _defaultSkyboxAmbientTexture;
 };
 

libraries/shared/src/PathUtils.cpp

@@ -132,8 +132,6 @@ QUrl PathUtils::expandToLocalDataAbsolutePath(const QUrl& fileUrl) {
         return expandedURL;
     }
 
-    QUrl::fromLocalFile(resourcesPath()).toString();
-
     return fileUrl;
 }