diff --git a/Basis/Assets/AddressableAssetsData/AssetGroups/Basis Foundation Assets.asset b/Basis/Assets/AddressableAssetsData/AssetGroups/Basis Foundation Assets.asset index 295734646b..7bcc11717b 100644 --- a/Basis/Assets/AddressableAssetsData/AssetGroups/Basis Foundation Assets.asset +++ b/Basis/Assets/AddressableAssetsData/AssetGroups/Basis Foundation Assets.asset @@ -46,6 +46,11 @@ MonoBehaviour: m_ReadOnly: 0 m_SerializedLabels: [] FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: 0eada6da580205b4987e0befda25ca0a + m_Address: BasisLoadingScenePrefab + m_ReadOnly: 0 + m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 - m_GUID: 1a876a9e9a22e4643b0d03f0eb3d0c30 m_Address: Locomotion m_ReadOnly: 0 @@ -56,6 +61,11 @@ MonoBehaviour: m_ReadOnly: 0 m_SerializedLabels: [] FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: 2bd088cd6bc90ca4ba6518e7a36f2681 + m_Address: BasisLoadingScene + m_ReadOnly: 0 + m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 - m_GUID: 2c84803c5e0cef44f9e0152b5fba4f35 m_Address: Packages/com.basis.sdk/Prefabs/Panel Elements/Platform Panel - Android.prefab m_ReadOnly: 0 diff --git a/Basis/Assets/config.xml b/Basis/Assets/config.xml deleted file mode 100644 index 6a76244a40..0000000000 --- a/Basis/Assets/config.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - default_password - localhost - 4296 - \ No newline at end of file diff --git a/Basis/Packages/com.basis.framework.editor/Editor/Project Window/BasisProjectSetup.cs b/Basis/Packages/com.basis.framework.editor/Editor/Project Window/BasisProjectSetup.cs index 5e6920dc61..fc859b35b2 100644 --- a/Basis/Packages/com.basis.framework.editor/Editor/Project Window/BasisProjectSetup.cs +++ b/Basis/Packages/com.basis.framework.editor/Editor/Project Window/BasisProjectSetup.cs @@ -61,7 +61,7 @@ private enum Tab { QuickStart, BuildModules, PlatformQuality, PlayXR, Docs, Scen private Texture2D _basisLogo; // Basis default scenes (adjust as needed) - private const string SCENE_INIT = "Packages/com.basis.sdk/Scenes/initialization.unity"; + private const string SCENE_INIT = "Packages/com.basis.framework/Scenes/initialization.unity"; private const string SCENE_DEMO = "Packages/com.basis.examples/Scenes/DemoScene.unity"; private const string SCENE_INTERACTABLES = "Packages/com.basis.examples/Scenes/InteractablesScene.unity"; diff --git a/Basis/Packages/com.basis.framework/Prefabs/BasisLoadingScene.prefab b/Basis/Packages/com.basis.framework/Prefabs/BasisLoadingScene.prefab new file mode 100644 index 0000000000..6019f2a40a --- /dev/null +++ b/Basis/Packages/com.basis.framework/Prefabs/BasisLoadingScene.prefab @@ -0,0 +1,248 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &3486026088491347433 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3979782111813828791} + - component: {fileID: 295678913888221480} + m_Layer: 0 + m_Name: Floor Collider + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3979782111813828791 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3486026088491347433} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: -1.6, z: -8.4} + m_LocalScale: {x: 1000, y: 0.10000002, z: 1000} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1521688259443178838} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &295678913888221480 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3486026088491347433} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &6945557231596396514 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1521688259443178838} + - component: {fileID: 1035056478208136688} + m_Layer: 0 + m_Name: BasisLoadingScene + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1521688259443178838 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6945557231596396514} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.27392977, y: -0.15742171, z: 2.5556765} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 3979782111813828791} + - {fileID: 1224640974644970203} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1035056478208136688 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6945557231596396514} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a77971dc49cce9541828138eb5e2270e, type: 3} + m_Name: + m_EditorClassIdentifier: + BasisBundleDescription: + AssetBundleName: Loading + AssetBundleDescription: Loading + AssetBundleIcon: {fileID: 0} + SpawnPoint: {fileID: 1521688259443178838} + RespawnHeight: -96 + RespawnCheckTimer: 0.1 + Group: {fileID: 6216228358845890117, guid: 471a0209081144d4da2426822e8a0b47, type: 2} + MainCamera: {fileID: 6394783033775837509} + IsReady: 0 +--- !u!1 &8889982030994524610 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1224640974644970203} + - component: {fileID: 6394783033775837509} + - component: {fileID: 2386002763484957437} + - component: {fileID: 46591783705350866} + m_Layer: 0 + m_Name: ReferenceCamera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1224640974644970203 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8889982030994524610} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1521688259443178838} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!20 &6394783033775837509 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8889982030994524610} + m_Enabled: 0 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.01 + far clip plane: 100 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!81 &2386002763484957437 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8889982030994524610} + m_Enabled: 1 +--- !u!114 &46591783705350866 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8889982030994524610} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Runtime::UnityEngine.Rendering.Universal.UniversalAdditionalCameraData + m_RenderShadows: 1 + m_RequiresDepthTextureOption: 2 + m_RequiresOpaqueTextureOption: 2 + m_CameraType: 0 + m_Cameras: [] + m_RendererIndex: -1 + m_VolumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + m_VolumeTrigger: {fileID: 0} + m_VolumeFrameworkUpdateModeOption: 2 + m_RenderPostProcessing: 0 + m_Antialiasing: 0 + m_AntialiasingQuality: 2 + m_StopNaN: 0 + m_Dithering: 0 + m_ClearDepth: 1 + m_AllowXRRendering: 1 + m_AllowHDROutput: 1 + m_UseScreenCoordOverride: 0 + m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0} + m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} + m_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_TaaSettings: + m_Quality: 3 + m_FrameInfluence: 0.1 + m_JitterScale: 1 + m_MipBias: 0 + m_VarianceClampScale: 0.9 + m_ContrastAdaptiveSharpening: 0 + m_Version: 2 diff --git a/Basis/Assets/config.xml.meta b/Basis/Packages/com.basis.framework/Prefabs/BasisLoadingScene.prefab.meta similarity index 62% rename from Basis/Assets/config.xml.meta rename to Basis/Packages/com.basis.framework/Prefabs/BasisLoadingScene.prefab.meta index f70ac35fc9..0fc504eabb 100644 --- a/Basis/Assets/config.xml.meta +++ b/Basis/Packages/com.basis.framework/Prefabs/BasisLoadingScene.prefab.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: b9f4e338287d552478b4678ba3832250 -TextScriptImporter: +guid: 0eada6da580205b4987e0befda25ca0a +PrefabImporter: externalObjects: {} userData: assetBundleName: diff --git a/Basis/Packages/com.basis.framework/Scene Management/BasisSceneFactory.cs b/Basis/Packages/com.basis.framework/Scene Management/BasisSceneFactory.cs index 564ca2a472..9f72d8faa0 100644 --- a/Basis/Packages/com.basis.framework/Scene Management/BasisSceneFactory.cs +++ b/Basis/Packages/com.basis.framework/Scene Management/BasisSceneFactory.cs @@ -3,20 +3,42 @@ using Basis.Scripts.Drivers; using System; using System.Collections.Generic; +using System.Threading.Tasks; using UnityEngine; +using UnityEngine.AddressableAssets; using UnityEngine.Rendering.Universal; +using UnityEngine.ResourceManagement.AsyncOperations; +using UnityEngine.ResourceManagement.ResourceProviders; +using UnityEngine.SceneManagement; +using Object = UnityEngine.Object; public static class BasisSceneFactory { + public const string BasisLoadingSceneKey = "BasisLoadingScene"; + public static BasisScene BasisScene; private static float timeSinceLastCheck = 0f; public static float RespawnCheckTimer = 5f; public static float RespawnHeight = -100f; public static BasisLocalPlayer BasisLocalPlayer; + private static bool _isLoadingLoadingScene = false; + private static AsyncOperationHandle? _loadingSceneHandle = null; + public static void Initalize() { BasisScene.Ready += Initalize; BasisScene.Destroyed += BasisSceneDestroyed; + SceneManager.sceneUnloaded -= OnSceneUnloaded; + SceneManager.sceneUnloaded += OnSceneUnloaded; + } + private static void OnSceneUnloaded(Scene unloadedScene) + { + // Check if any BasisScene still exists after the scene was unloaded + BasisScene[] scenes = Object.FindObjectsByType(FindObjectsInactive.Exclude); + if (scenes.Length == 0) + { + LoadLoadingScene(); + } } public static void BasisSceneDestroyed(BasisScene UnloadingScene) { @@ -24,21 +46,79 @@ public static void BasisSceneDestroyed(BasisScene UnloadingScene) { return; } - else + + BasisScene[] scenes = Object.FindObjectsByType(FindObjectsInactive.Exclude); + foreach(BasisScene potentialMainScene in scenes) { - BasisScene[] Scenes = GameObject.FindObjectsByType( FindObjectsInactive.Exclude, FindObjectsSortMode.None); - foreach(BasisScene PotentialMainScene in Scenes) + if (potentialMainScene == UnloadingScene) { - if(PotentialMainScene != UnloadingScene) - { - Initalize(PotentialMainScene); - return; - } + continue; + } + + Initalize(potentialMainScene); + return; + } + } + private static async void LoadLoadingScene() + { + if (_isLoadingLoadingScene) + { + BasisDebug.Log("Loading scene load already in progress, skipping.", BasisDebug.LogTag.Scene); + return; + } + _isLoadingLoadingScene = true; + try + { + BasisDebug.Log("No BasisScene found after scene unload. Loading BasisLoadingScene.", BasisDebug.LogTag.Scene); + BasisLocalPlayer.SpawnPlayerOnSceneLoad = true; + AsyncOperationHandle handle = Addressables.LoadSceneAsync(BasisLoadingSceneKey, LoadSceneMode.Additive, activateOnLoad: true); + while (!handle.IsDone) + { + await Task.Yield(); } + await handle.Task; + _loadingSceneHandle = handle; + BasisDebug.Log("BasisLoadingScene loaded successfully.", BasisDebug.LogTag.Scene); + } + catch (Exception ex) + { + BasisDebug.LogError($"Error loading BasisLoadingScene: {ex}", BasisDebug.LogTag.Scene); + } + finally + { + _isLoadingLoadingScene = false; + } + } + private static async void UnloadLoadingScene() + { + if (_loadingSceneHandle == null) + { + return; + } + try + { + BasisDebug.Log("Unloading BasisLoadingScene.", BasisDebug.LogTag.Scene); + AsyncOperationHandle handle = _loadingSceneHandle.Value; + _loadingSceneHandle = null; + await Addressables.UnloadSceneAsync(handle).Task; + BasisDebug.Log("BasisLoadingScene unloaded successfully.", BasisDebug.LogTag.Scene); + } + catch (Exception ex) + { + BasisDebug.LogError($"Error unloading BasisLoadingScene: {ex}", BasisDebug.LogTag.Scene); } } public static void Initalize(BasisScene scene) { + // If a loading scene is active and a different BasisScene is now ready, unload the loading scene + if (_loadingSceneHandle != null && _loadingSceneHandle.Value.IsValid()) + { + Scene loadingScene = _loadingSceneHandle.Value.Result.Scene; + if (scene.gameObject.scene != loadingScene) + { + UnloadLoadingScene(); + } + } BasisScene = scene; AttachMixerToAllSceneAudioSources(); RespawnCheckTimer = BasisScene.RespawnCheckTimer; diff --git a/Basis/Packages/com.basis.sdk/Scenes.meta b/Basis/Packages/com.basis.framework/Scenes.meta similarity index 100% rename from Basis/Packages/com.basis.sdk/Scenes.meta rename to Basis/Packages/com.basis.framework/Scenes.meta diff --git a/Basis/Packages/com.basis.sdk/Scenes/initialization.meta b/Basis/Packages/com.basis.framework/Scenes/initialization.meta similarity index 100% rename from Basis/Packages/com.basis.sdk/Scenes/initialization.meta rename to Basis/Packages/com.basis.framework/Scenes/initialization.meta diff --git a/Basis/Packages/com.basis.sdk/Scenes/initialization.unity b/Basis/Packages/com.basis.framework/Scenes/initialization.unity similarity index 79% rename from Basis/Packages/com.basis.sdk/Scenes/initialization.unity rename to Basis/Packages/com.basis.framework/Scenes/initialization.unity index 2e35aa0682..a5e0d51643 100644 --- a/Basis/Packages/com.basis.sdk/Scenes/initialization.unity +++ b/Basis/Packages/com.basis.framework/Scenes/initialization.unity @@ -94,7 +94,7 @@ LightmapSettings: m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 112000000, guid: 0d205cc10662a964cadd07ba4c8a88bd, type: 2} - m_LightingSettings: {fileID: 4890085278179872738, guid: c42bb63125d6f2f4fac641d7804856dc, type: 2} + m_LightingSettings: {fileID: 0} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -176,8 +176,59 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f84144c055f881f4797d59bd2802d4a4, type: 3} +--- !u!1 &1620637455 +GameObject: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1620637457} + - component: {fileID: 1620637456} + m_Layer: 0 + m_Name: ProbeVolumePerSceneData + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1620637456 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1620637455} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a83d2f7ae04ab6f4f99b0d85377be998, type: 3} + m_Name: + m_EditorClassIdentifier: + serializedBakingSet: {fileID: 0} + sceneGUID: dd1db054b177db7459cc81633b86e525 + obsoleteAsset: {fileID: 0} + obsoleteCellSharedDataAsset: {fileID: 0} + obsoleteCellSupportDataAsset: {fileID: 0} + obsoleteSerializedScenarios: [] +--- !u!4 &1620637457 +Transform: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1620637455} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 m_Roots: - {fileID: 1187098623} + - {fileID: 1620637457} diff --git a/Basis/Packages/com.basis.sdk/Scenes/initialization.unity.meta b/Basis/Packages/com.basis.framework/Scenes/initialization.unity.meta similarity index 100% rename from Basis/Packages/com.basis.sdk/Scenes/initialization.unity.meta rename to Basis/Packages/com.basis.framework/Scenes/initialization.unity.meta diff --git a/Basis/Packages/com.basis.sdk/Scenes/initialization/LightingData.asset b/Basis/Packages/com.basis.framework/Scenes/initialization/LightingData.asset similarity index 100% rename from Basis/Packages/com.basis.sdk/Scenes/initialization/LightingData.asset rename to Basis/Packages/com.basis.framework/Scenes/initialization/LightingData.asset diff --git a/Basis/Packages/com.basis.sdk/Scenes/initialization/LightingData.asset.meta b/Basis/Packages/com.basis.framework/Scenes/initialization/LightingData.asset.meta similarity index 100% rename from Basis/Packages/com.basis.sdk/Scenes/initialization/LightingData.asset.meta rename to Basis/Packages/com.basis.framework/Scenes/initialization/LightingData.asset.meta diff --git a/Basis/Packages/com.basis.sdk/Scenes/initialization/ReflectionProbe-0.exr b/Basis/Packages/com.basis.framework/Scenes/initialization/ReflectionProbe-0.exr similarity index 100% rename from Basis/Packages/com.basis.sdk/Scenes/initialization/ReflectionProbe-0.exr rename to Basis/Packages/com.basis.framework/Scenes/initialization/ReflectionProbe-0.exr diff --git a/Basis/Packages/com.basis.sdk/Scenes/initialization/ReflectionProbe-0.exr.meta b/Basis/Packages/com.basis.framework/Scenes/initialization/ReflectionProbe-0.exr.meta similarity index 100% rename from Basis/Packages/com.basis.sdk/Scenes/initialization/ReflectionProbe-0.exr.meta rename to Basis/Packages/com.basis.framework/Scenes/initialization/ReflectionProbe-0.exr.meta diff --git a/Basis/Packages/com.basis.sdk/Scenes/initialization/initialization Baking Set.asset b/Basis/Packages/com.basis.framework/Scenes/initialization/initialization Baking Set.asset similarity index 100% rename from Basis/Packages/com.basis.sdk/Scenes/initialization/initialization Baking Set.asset rename to Basis/Packages/com.basis.framework/Scenes/initialization/initialization Baking Set.asset diff --git a/Basis/Packages/com.basis.sdk/Scenes/initialization/initialization Baking Set.asset.meta b/Basis/Packages/com.basis.framework/Scenes/initialization/initialization Baking Set.asset.meta similarity index 100% rename from Basis/Packages/com.basis.sdk/Scenes/initialization/initialization Baking Set.asset.meta rename to Basis/Packages/com.basis.framework/Scenes/initialization/initialization Baking Set.asset.meta diff --git a/Basis/Packages/com.basis.framework/Scenes/loading.meta b/Basis/Packages/com.basis.framework/Scenes/loading.meta new file mode 100644 index 0000000000..52c93d6b32 --- /dev/null +++ b/Basis/Packages/com.basis.framework/Scenes/loading.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ef67284e8cefbde4e89be1ff805da651 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Basis/Packages/com.basis.framework/Scenes/loading.unity b/Basis/Packages/com.basis.framework/Scenes/loading.unity new file mode 100644 index 0000000000..7ad476f365 --- /dev/null +++ b/Basis/Packages/com.basis.framework/Scenes/loading.unity @@ -0,0 +1,187 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +OcclusionCullingSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 10 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 0 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SkyboxMaterial: {fileID: 2100000, guid: 892019a34083d5f45abbba395c47f6fb, type: 2} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} + m_UseRadianceAmbientProbe: 0 +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 13 + m_BakeOnSceneLoad: 0 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 0 + m_LightmapEditorSettings: + serializedVersion: 12 + m_Resolution: 2 + m_BakeResolution: 40 + m_AtlasSize: 1024 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAmbientOcclusion: 0 + m_Padding: 2 + m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 + m_TextureCompression: 1 + m_ReflectionCompression: 2 + m_MixedBakeMode: 2 + m_BakeBackend: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 512 + m_PVRBounces: 2 + m_PVREnvironmentSampleCount: 256 + m_PVREnvironmentReferencePointCount: 2048 + m_PVRFilteringMode: 1 + m_PVRDenoiserTypeDirect: 1 + m_PVRDenoiserTypeIndirect: 1 + m_PVRDenoiserTypeAO: 1 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVREnvironmentMIS: 1 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 + m_LightingDataAsset: {fileID: 112000000, guid: 00c05359c4ffa8a40bd353227f6bf6c2, type: 2} + m_LightingSettings: {fileID: 0} +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 3 + agentTypeID: 0 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + minRegionArea: 2 + manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + buildHeightMesh: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 + debug: + m_Flags: 0 + m_NavMeshData: {fileID: 0} +--- !u!1001 &1122217895 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1521688259443178838, guid: 0eada6da580205b4987e0befda25ca0a, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1521688259443178838, guid: 0eada6da580205b4987e0befda25ca0a, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1521688259443178838, guid: 0eada6da580205b4987e0befda25ca0a, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1521688259443178838, guid: 0eada6da580205b4987e0befda25ca0a, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1521688259443178838, guid: 0eada6da580205b4987e0befda25ca0a, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1521688259443178838, guid: 0eada6da580205b4987e0befda25ca0a, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1521688259443178838, guid: 0eada6da580205b4987e0befda25ca0a, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1521688259443178838, guid: 0eada6da580205b4987e0befda25ca0a, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1521688259443178838, guid: 0eada6da580205b4987e0befda25ca0a, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1521688259443178838, guid: 0eada6da580205b4987e0befda25ca0a, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2233025765587422440, guid: 0eada6da580205b4987e0befda25ca0a, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6945557231596396514, guid: 0eada6da580205b4987e0befda25ca0a, type: 3} + propertyPath: m_Name + value: BasisLoadingScene + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 0eada6da580205b4987e0befda25ca0a, type: 3} +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 1122217895} diff --git a/Basis/Packages/com.basis.framework/Scenes/loading.unity.meta b/Basis/Packages/com.basis.framework/Scenes/loading.unity.meta new file mode 100644 index 0000000000..19623817a0 --- /dev/null +++ b/Basis/Packages/com.basis.framework/Scenes/loading.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 2bd088cd6bc90ca4ba6518e7a36f2681 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Basis/Packages/com.basis.framework/Scenes/loading/LightingData.asset b/Basis/Packages/com.basis.framework/Scenes/loading/LightingData.asset new file mode 100644 index 0000000000..3e91369f56 Binary files /dev/null and b/Basis/Packages/com.basis.framework/Scenes/loading/LightingData.asset differ diff --git a/Basis/Packages/com.basis.framework/Scenes/loading/LightingData.asset.meta b/Basis/Packages/com.basis.framework/Scenes/loading/LightingData.asset.meta new file mode 100644 index 0000000000..cf94a0ccdc --- /dev/null +++ b/Basis/Packages/com.basis.framework/Scenes/loading/LightingData.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 00c05359c4ffa8a40bd353227f6bf6c2 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 112000000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Basis/Packages/com.basis.framework/Scenes/loading/ReflectionProbe-0.exr b/Basis/Packages/com.basis.framework/Scenes/loading/ReflectionProbe-0.exr new file mode 100644 index 0000000000..a26df1d8a1 Binary files /dev/null and b/Basis/Packages/com.basis.framework/Scenes/loading/ReflectionProbe-0.exr differ diff --git a/Basis/Packages/com.basis.framework/Scenes/loading/ReflectionProbe-0.exr.meta b/Basis/Packages/com.basis.framework/Scenes/loading/ReflectionProbe-0.exr.meta new file mode 100644 index 0000000000..8bcc867f56 --- /dev/null +++ b/Basis/Packages/com.basis.framework/Scenes/loading/ReflectionProbe-0.exr.meta @@ -0,0 +1,117 @@ +fileFormatVersion: 2 +guid: c73232969c9db0348b910e201a5754ee +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 1 + seamlessCubemap: 1 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: 0 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 2 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 100 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Basis/Packages/com.basis.framework/Scenes/loading/loading Baking Set.asset b/Basis/Packages/com.basis.framework/Scenes/loading/loading Baking Set.asset new file mode 100644 index 0000000000..1a6ad9a6b1 --- /dev/null +++ b/Basis/Packages/com.basis.framework/Scenes/loading/loading Baking Set.asset @@ -0,0 +1,129 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4881f9a2c4d568047b316028d20a8dca, type: 3} + m_Name: loading Baking Set + m_EditorClassIdentifier: Unity.RenderPipelines.Core.Runtime::UnityEngine.Rendering.ProbeVolumeBakingSet + m_SceneBakeData: + m_Keys: + - 2bd088cd6bc90ca4ba6518e7a36f2681 + m_Values: + - hasProbeVolume: 0 + bakeScene: 1 + bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + singleSceneMode: 1 + dialogNoProbeVolumeInSetShown: 1 + settings: + m_Version: 1 + dilationSettings: + enableDilation: 0 + dilationDistance: 1 + dilationValidityThreshold: 0.25 + dilationIterations: 1 + squaredDistWeighting: 1 + virtualOffsetSettings: + useVirtualOffset: 1 + validityThreshold: 0.25 + outOfGeoOffset: 0.01 + searchMultiplier: 0.2 + rayOriginBias: -0.001 + collisionMask: + serializedVersion: 2 + m_Bits: 4294967291 + m_SceneGUIDs: + - 2bd088cd6bc90ca4ba6518e7a36f2681 + obsoleteScenesToNotBake: [] + m_LightingScenarios: + - Default + cellDescs: + m_Keys: + m_Values: [] + m_SerializedPerSceneCellList: [] + cellSharedDataAsset: + m_AssetGUID: + m_StreamableAssetPath: + m_ElementSize: 0 + m_StreamableCellDescs: + m_Keys: + m_Values: [] + m_Asset: {fileID: 0} + scenarios: + m_Keys: [] + m_Values: [] + cellBricksDataAsset: + m_AssetGUID: + m_StreamableAssetPath: + m_ElementSize: 0 + m_StreamableCellDescs: + m_Keys: + m_Values: [] + m_Asset: {fileID: 0} + cellSupportDataAsset: + m_AssetGUID: + m_StreamableAssetPath: + m_ElementSize: 0 + m_StreamableCellDescs: + m_Keys: + m_Values: [] + m_Asset: {fileID: 0} + chunkSizeInBricks: 128 + maxCellPosition: {x: 0, y: 0, z: 0} + minCellPosition: {x: 0, y: 0, z: 0} + globalBounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + bakedSimplificationLevels: 3 + bakedMinDistanceBetweenProbes: 1 + bakedProbeOcclusion: 0 + bakedSkyOcclusionValue: 0 + bakedSkyShadingDirectionValue: 0 + bakedProbeOffset: {x: 0, y: 0, z: 0} + bakedMaskCount: 1 + bakedLayerMasks: + x: 0 + y: 0 + z: 0 + w: 0 + maxSHChunkCount: -1 + L0ChunkSize: 0 + L1ChunkSize: 0 + L2TextureChunkSize: 0 + ProbeOcclusionChunkSize: 0 + sharedValidityMaskChunkSize: 8192 + sharedSkyOcclusionL0L1ChunkSize: 0 + sharedSkyShadingDirectionIndicesChunkSize: 0 + sharedDataChunkSize: 0 + supportPositionChunkSize: 0 + supportValidityChunkSize: 0 + supportTouchupChunkSize: 0 + supportLayerMaskChunkSize: 0 + supportOffsetsChunkSize: 0 + supportDataChunkSize: 0 + lightingScenario: Default + version: 2 + freezePlacement: 0 + probeOffset: {x: 0, y: 0, z: 0} + simplificationLevels: 3 + minDistanceBetweenProbes: 1 + renderersLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + minRendererVolumeSize: 0.1 + skyOcclusion: 0 + skyOcclusionBakingSamples: 2048 + skyOcclusionBakingBounces: 2 + skyOcclusionAverageAlbedo: 0.6 + skyOcclusionBackFaceCulling: 0 + skyOcclusionShadingDirection: 0 + useRenderingLayers: 0 + renderingLayerMasks: [] diff --git a/Basis/Packages/com.basis.framework/Scenes/loading/loading Baking Set.asset.meta b/Basis/Packages/com.basis.framework/Scenes/loading/loading Baking Set.asset.meta new file mode 100644 index 0000000000..d32716414c --- /dev/null +++ b/Basis/Packages/com.basis.framework/Scenes/loading/loading Baking Set.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8bc681a53c5ec1949957e79ba0fa5d9c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Basis/ProjectSettings/EditorBuildSettings.asset b/Basis/ProjectSettings/EditorBuildSettings.asset index 16d552b5e5..966baba474 100644 --- a/Basis/ProjectSettings/EditorBuildSettings.asset +++ b/Basis/ProjectSettings/EditorBuildSettings.asset @@ -6,7 +6,7 @@ EditorBuildSettings: serializedVersion: 2 m_Scenes: - enabled: 1 - path: Packages/com.basis.sdk/Scenes/initialization.unity + path: Packages/com.basis.framework/Scenes/initialization.unity guid: dd1db054b177db7459cc81633b86e525 m_configObjects: BasisVR/Styling/ActivePalette: {fileID: 11400000, guid: 3f30a6ab7dbd22b4c93b22fee927fd9d, type: 2}