Reset default environment. Passthrough only for Zapbox (#660)

Accidentally set default environment to passthrough. set only for zapbox
icosa-foundation · Mar 22, 2024 · f9398d1 · f9398d1
1 parent c58affc
commit f9398d1
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity
@@ -10184,7 +10184,9 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_SkyboxMaterial: {fileID: 2100000, guid: 502c8257ef70e3f4b9f6b176302930e6, type: 2}
-  m_DefaultEnvironment: {fileID: 11400000, guid: e7ee458a16eae2b48ac405f4ccc693e6,
+  m_DefaultEnvironment: {fileID: 11400000, guid: 5effa9d950f0f5943b60c7dd24471505,
+    type: 2}
+  m_PassthroughEnvironment: {fileID: 11400000, guid: e7ee458a16eae2b48ac405f4ccc693e6,
     type: 2}
 --- !u!114 &652605549
 MonoBehaviour:

diff --git a/Assets/Scripts/EnvironmentCatalog.cs b/Assets/Scripts/EnvironmentCatalog.cs
@@ -27,6 +27,9 @@ public class EnvironmentCatalog : MonoBehaviour
         public Material m_SkyboxMaterial;
 
         [SerializeField] private TiltBrush.Environment m_DefaultEnvironment;
+
+        [SerializeField] private TiltBrush.Environment m_PassthroughEnvironment;
+
         private bool m_IsLoading;
         private Dictionary<Guid, Environment> m_GuidToEnvironment;
 
@@ -36,7 +39,15 @@ public IEnumerable<Environment> AllEnvironments
         }
         public Environment DefaultEnvironment
         {
-            get { return m_DefaultEnvironment; }
+            get
+            {
+#if ZAPBOX_SUPPORTED
+                // Load into passthrough straight away.
+                return m_PassthroughEnvironment;
+#endif
+                return m_DefaultEnvironment;
+
+            }
         }
 
         void Awake()