diff --git a/Assets/XR.meta b/Assets/XR.meta new file mode 100644 index 0000000..b970790 --- /dev/null +++ b/Assets/XR.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: fec92174edb8d1a4aabb7c25880dec93 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/XR/Loaders.meta b/Assets/XR/Loaders.meta new file mode 100644 index 0000000..d57bea2 --- /dev/null +++ b/Assets/XR/Loaders.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: eb424f54ae4f33f49bc718452373bc48 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/XR/Loaders/XREALXRLoader.asset b/Assets/XR/Loaders/XREALXRLoader.asset new file mode 100644 index 0000000..9bcc119 --- /dev/null +++ b/Assets/XR/Loaders/XREALXRLoader.asset @@ -0,0 +1,14 @@ +%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: c8bc60fe6e655c444ab9e7db1b87f0e2, type: 3} + m_Name: XREALXRLoader + m_EditorClassIdentifier: diff --git a/Assets/XR/Loaders/XREALXRLoader.asset.meta b/Assets/XR/Loaders/XREALXRLoader.asset.meta new file mode 100644 index 0000000..841cc28 --- /dev/null +++ b/Assets/XR/Loaders/XREALXRLoader.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 58587c6063104fc4ba6749de9d92654f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/XR/Settings.meta b/Assets/XR/Settings.meta new file mode 100644 index 0000000..e59639d --- /dev/null +++ b/Assets/XR/Settings.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6af31ff3fc54fef47bec4b13bb269078 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/XR/Settings/XREALSettings.asset b/Assets/XR/Settings/XREALSettings.asset new file mode 100644 index 0000000..d3cde2b --- /dev/null +++ b/Assets/XR/Settings/XREALSettings.asset @@ -0,0 +1,24 @@ +%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: 5d6c6fbaebc0a41448bdb2a644012ac7, type: 3} + m_Name: XREALSettings + m_EditorClassIdentifier: + StereoRendering: 2 + InitialTrackingType: 0 + InitialInputSource: 3 + VirtualController: {fileID: 0} + SupportMultiResume: 1 + AddtionalPermissions: [] + EnableAutoLogcat: 0 + EnableNativeSessionManager: 0 + SupportDevices: 0100000002000000 + LicenseAsset: {fileID: 0} diff --git a/Assets/XR/Settings/XREALSettings.asset.meta b/Assets/XR/Settings/XREALSettings.asset.meta new file mode 100644 index 0000000..f42cb5d --- /dev/null +++ b/Assets/XR/Settings/XREALSettings.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b2e55e571bd3de34c99377eb8237b83d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/XR/XRGeneralSettingsPerBuildTarget.asset b/Assets/XR/XRGeneralSettingsPerBuildTarget.asset new file mode 100644 index 0000000..34a4892 --- /dev/null +++ b/Assets/XR/XRGeneralSettingsPerBuildTarget.asset @@ -0,0 +1,79 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-2338028227154298522 +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: d236b7d11115f2143951f1e14045df39, type: 3} + m_Name: Android Settings + m_EditorClassIdentifier: + m_LoaderManagerInstance: {fileID: 4949870636762479543} + m_InitManagerOnStart: 1 +--- !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: d2dc886499c26824283350fa532d087d, type: 3} + m_Name: XRGeneralSettingsPerBuildTarget + m_EditorClassIdentifier: + Keys: 0100000007000000 + Values: + - {fileID: 4283003275026294642} + - {fileID: -2338028227154298522} +--- !u!114 &1370368528910738246 +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: f4c3631f5e58749a59194e0cf6baf6d5, type: 3} + m_Name: Standalone Providers + m_EditorClassIdentifier: + m_RequiresSettingsUpdate: 0 + m_AutomaticLoading: 0 + m_AutomaticRunning: 0 + m_Loaders: [] +--- !u!114 &4283003275026294642 +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: d236b7d11115f2143951f1e14045df39, type: 3} + m_Name: Standalone Settings + m_EditorClassIdentifier: + m_LoaderManagerInstance: {fileID: 1370368528910738246} + m_InitManagerOnStart: 1 +--- !u!114 &4949870636762479543 +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: f4c3631f5e58749a59194e0cf6baf6d5, type: 3} + m_Name: Android Providers + m_EditorClassIdentifier: + m_RequiresSettingsUpdate: 0 + m_AutomaticLoading: 0 + m_AutomaticRunning: 0 + m_Loaders: + - {fileID: 11400000, guid: 58587c6063104fc4ba6749de9d92654f, type: 2} diff --git a/Assets/XR/XRGeneralSettingsPerBuildTarget.asset.meta b/Assets/XR/XRGeneralSettingsPerBuildTarget.asset.meta new file mode 100644 index 0000000..03f1774 --- /dev/null +++ b/Assets/XR/XRGeneralSettingsPerBuildTarget.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7170621592f4a344aa61e8b6eb6f8534 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.xreal.xr.tar.gz b/Packages/com.xreal.xr.tar.gz new file mode 100644 index 0000000..0358242 Binary files /dev/null and b/Packages/com.xreal.xr.tar.gz differ diff --git a/Packages/manifest.json b/Packages/manifest.json index 3f4f8a0..bf9e2f0 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -6,6 +6,7 @@ "com.unity.test-framework": "1.1.33", "com.unity.ugui": "1.0.0", "com.unity.webrtc": "3.0.0-pre.8", + "com.xreal.xr": "file:com.xreal.xr.tar.gz", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", "com.unity.modules.animation": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 5ed1873..7ac7bdb 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -138,6 +138,46 @@ }, "url": "https://packages.unity.com" }, + "com.unity.xr.core-utils": { + "version": "2.5.2", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.modules.xr": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.xr.legacyinputhelpers": { + "version": "2.1.12", + "depth": 2, + "source": "registry", + "dependencies": { + "com.unity.modules.vr": "1.0.0", + "com.unity.modules.xr": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.xr.management": { + "version": "4.4.1", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.modules.vr": "1.0.0", + "com.unity.modules.xr": "1.0.0", + "com.unity.modules.subsystems": "1.0.0", + "com.unity.xr.legacyinputhelpers": "2.1.7" + }, + "url": "https://packages.unity.com" + }, + "com.xreal.xr": { + "version": "file:com.xreal.xr.tar.gz", + "depth": 0, + "source": "local-tarball", + "dependencies": { + "com.unity.xr.management": "4.4.1", + "com.unity.xr.core-utils": "2.2.0" + } + }, "com.unity.modules.ai": { "version": "1.0.0", "depth": 0, diff --git a/ProjectSettings/BurstAotSettings_StandaloneWindows.json b/ProjectSettings/BurstAotSettings_StandaloneWindows.json index 2144f6d..34712b4 100644 --- a/ProjectSettings/BurstAotSettings_StandaloneWindows.json +++ b/ProjectSettings/BurstAotSettings_StandaloneWindows.json @@ -1,16 +1,18 @@ { "MonoBehaviour": { - "Version": 3, + "Version": 5, "EnableBurstCompilation": true, "EnableOptimisations": true, "EnableSafetyChecks": false, "EnableDebugInAllBuilds": false, - "UsePlatformSDKLinker": false, + "DebugDataKind": 0, + "EnableArmv9SecurityFeatures": false, "CpuMinTargetX32": 0, "CpuMaxTargetX32": 0, "CpuMinTargetX64": 0, "CpuMaxTargetX64": 0, "CpuTargetsX32": 6, - "CpuTargetsX64": 72 + "CpuTargetsX64": 72, + "OptimizeFor": 0 } } diff --git a/ProjectSettings/CommonBurstAotSettings.json b/ProjectSettings/CommonBurstAotSettings.json index 3dffdba..a6a6297 100644 --- a/ProjectSettings/CommonBurstAotSettings.json +++ b/ProjectSettings/CommonBurstAotSettings.json @@ -1,6 +1,6 @@ { "MonoBehaviour": { - "Version": 3, + "Version": 5, "DisabledWarnings": "" } } diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 45ee819..296668f 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -8,5 +8,9 @@ EditorBuildSettings: m_configObjects: com.unity.input.settings: {fileID: 11400000, guid: c8c74bf90d6715b4d87d227d8efc0b37, type: 2} - com.unity.renderstreaming.settings: {fileID: 11400000, guid: 039337c008e9a5c44a60f957eae3e450, + com.unity.renderstreaming.settings: {fileID: 11400000, guid: c58ccff264f2e0948adda75e963ef90a, + type: 2} + com.unity.xr.management.loader_settings: {fileID: 11400000, guid: 7170621592f4a344aa61e8b6eb6f8534, + type: 2} + com.unity.xr.management.xrealsettings: {fileID: 11400000, guid: b2e55e571bd3de34c99377eb8237b83d, type: 2} diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 19688f9..85aae21 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -77,6 +77,7 @@ PlayerSettings: androidMinimumWindowHeight: 300 androidFullscreenMode: 1 androidAutoRotationBehavior: 1 + androidPredictiveBackSupport: 1 defaultIsNativeResolution: 1 macRetinaSupport: 1 runInBackground: 1 diff --git a/ProjectSettings/XRPackageSettings.asset b/ProjectSettings/XRPackageSettings.asset new file mode 100644 index 0000000..7e791e1 --- /dev/null +++ b/ProjectSettings/XRPackageSettings.asset @@ -0,0 +1,5 @@ +{ + "m_Settings": [ + "RemoveLegacyInputHelpersForReload" + ] +} \ No newline at end of file