diff --git a/Assets/Editor/EnableFileSharingPostBuildProcessor.cs b/Assets/Editor/EnableFileSharingPostBuildProcessor.cs new file mode 100644 index 0000000000000000000000000000000000000000..f6251ffb22c1cfbab0363337496cf309150e97b1 --- /dev/null +++ b/Assets/Editor/EnableFileSharingPostBuildProcessor.cs @@ -0,0 +1,29 @@ +#if UNITY_IOS +using System.IO; +using UnityEditor; +using UnityEditor.Callbacks; +using UnityEditor.iOS.Xcode; + +public class EnableFileSharingPostBuildProcessor +{ + [PostProcessBuild] + public static void ChangeXcodePlist(BuildTarget buildTarget, string pathToBuiltProject) + { + if (buildTarget == BuildTarget.iOS) + { + // Get plist + string plistPath = pathToBuiltProject + "/Info.plist"; + PlistDocument plist = new PlistDocument(); + plist.ReadFromString(File.ReadAllText(plistPath)); + + // Get root + PlistElementDict rootDict = plist.root; + + rootDict.SetBoolean("UIFileSharingEnabled", true); + + // Write to file + File.WriteAllText(plistPath, plist.WriteToString()); + } + } +} +#endif \ No newline at end of file diff --git a/Assets/Editor/EnableFileSharingPostBuildProcessor.cs.meta b/Assets/Editor/EnableFileSharingPostBuildProcessor.cs.meta new file mode 100644 index 0000000000000000000000000000000000000000..ae5229db55795a1b43cd949f74096e214533e509 --- /dev/null +++ b/Assets/Editor/EnableFileSharingPostBuildProcessor.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 993024e5e07a745a6a495d99e0f8e82f +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/HHI.asset b/Assets/Resources/HHI.asset new file mode 100644 index 0000000000000000000000000000000000000000..f3495a88bb2ba7366bafa861a1af633d51dc42eb --- /dev/null +++ b/Assets/Resources/HHI.asset @@ -0,0 +1,19 @@ +%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: e4b7be4c33f68d0418c3b4e1a7053d91, type: 3} + m_Name: HHI + m_EditorClassIdentifier: + serverName: HHI + company: HHI + basePath: https://etsi.hhi.fraunhofer.de/ + port: 443 + currentUser: {fileID: 11400000, guid: 220ed7f6ba8f6404e8bee0e9057e2ffd, type: 2} diff --git a/Assets/Resources/HHI.asset.meta b/Assets/Resources/HHI.asset.meta new file mode 100644 index 0000000000000000000000000000000000000000..84ddb9533559b4df3e2025b381be104f9674808b --- /dev/null +++ b/Assets/Resources/HHI.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b9f1854d991254dd4ba5e0586e57af27 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/ExampleGLTF.unity b/Assets/Scenes/ExampleGLTF.unity index cd4d9971efd8c9c114f14ad9212760f9d14a1b40..0f23bd7d837ea6acca4859645ca6ade1c8c57b99 100644 --- a/Assets/Scenes/ExampleGLTF.unity +++ b/Assets/Scenes/ExampleGLTF.unity @@ -38,7 +38,6 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.37311953, g: 0.38074014, b: 0.3587274, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -104,7 +103,7 @@ NavMeshSettings: serializedVersion: 2 m_ObjectHideFlags: 0 m_BuildSettings: - serializedVersion: 2 + serializedVersion: 3 agentTypeID: 0 agentRadius: 0.5 agentHeight: 2 @@ -117,7 +116,7 @@ NavMeshSettings: cellSize: 0.16666667 manualTileSize: 0 tileSize: 256 - accuratePlacement: 0 + buildHeightMesh: 0 maxJobWorkers: 0 preserveTilesOutsideBounds: 0 debug: @@ -151,13 +150,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 13101072} + 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: 789254998} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &13101074 MonoBehaviour: @@ -260,7 +259,6 @@ MonoBehaviour: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - m_HasMigratedActions: 1 --- !u!114 &13101075 MonoBehaviour: m_ObjectHideFlags: 0 @@ -315,9 +313,17 @@ Camera: 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_FocalLength: 50 m_NormalizedViewPortRect: serializedVersion: 2 x: 0 @@ -368,13 +374,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 221176651} + 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: 925320705} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &221176653 MonoBehaviour: @@ -418,7 +424,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 02da7adcc65f4694684d71e61d88070b, type: 3} m_Name: m_EditorClassIdentifier: - worldStorageServer: {fileID: 11400000, guid: cc5c5acfb44773a4ba9decc291b718d2, type: 2} + worldStorageServer: {fileID: 11400000, guid: b9f1854d991254dd4ba5e0586e57af27, type: 2} --- !u!4 &236535456 Transform: m_ObjectHideFlags: 0 @@ -426,13 +432,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 236535454} + 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: 925320705} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &334744955 GameObject: @@ -475,6 +481,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 334744955} + 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} @@ -482,7 +489,6 @@ Transform: m_Children: - {fileID: 789254998} m_Father: {fileID: 0} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &789254997 GameObject: @@ -507,6 +513,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 789254997} + 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} @@ -514,7 +521,6 @@ Transform: m_Children: - {fileID: 13101073} m_Father: {fileID: 334744957} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &842320173 GameObject: @@ -546,6 +552,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _PathToGLTF: ARSceneOneAnchor.glb + _ValiditySubscription: 100000 --- !u!4 &842320175 Transform: m_ObjectHideFlags: 0 @@ -553,13 +560,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 842320173} + 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: 925320705} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &925320704 GameObject: @@ -584,6 +591,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 925320704} + 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} @@ -593,7 +601,6 @@ Transform: - {fileID: 221176652} - {fileID: 236535456} m_Father: {fileID: 0} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1210990015 GameObject: @@ -647,13 +654,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1210990015} + 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_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1405320275 GameObject: @@ -725,11 +732,19 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1405320275} + 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_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 1210990018} + - {fileID: 334744957} + - {fileID: 1405320278} + - {fileID: 925320705} diff --git a/Assets/XR/XRGeneralSettingsPerBuildTarget.asset b/Assets/XR/XRGeneralSettingsPerBuildTarget.asset index a0e856a670f87ef050391e394be86eea62f67210..c0663c10588c4ce65d74b23a2a1c2ccbbde8d2ce 100644 --- a/Assets/XR/XRGeneralSettingsPerBuildTarget.asset +++ b/Assets/XR/XRGeneralSettingsPerBuildTarget.asset @@ -29,9 +29,41 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d2dc886499c26824283350fa532d087d, type: 3} m_Name: XRGeneralSettingsPerBuildTarget m_EditorClassIdentifier: - Keys: 07000000 + Keys: 0700000004000000 Values: - {fileID: 5732245400625790027} + - {fileID: 1027667839647070798} +--- !u!114 &1027667839647070798 +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: iPhone Settings + m_EditorClassIdentifier: + m_LoaderManagerInstance: {fileID: 2280873247514929973} + m_InitManagerOnStart: 1 +--- !u!114 &2280873247514929973 +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: iPhone Providers + m_EditorClassIdentifier: + m_RequiresSettingsUpdate: 0 + m_AutomaticLoading: 0 + m_AutomaticRunning: 0 + m_Loaders: + - {fileID: 11400000, guid: f49717f9ed07ee840b28b0950e029694, type: 2} --- !u!114 &5732245400625790027 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Packages/manifest.json b/Packages/manifest.json index 79cd97ef78f5c95287e8ea9eb427548d18c57fb0..4619fac65f392e48b31a93b53c98f6f0cdc62d97 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -2,17 +2,18 @@ "dependencies": { "com.unity.ai.navigation": "1.1.5", "com.unity.cloud.gltfast": "6.4.0", - "com.unity.collab-proxy": "2.2.0", - "com.unity.ide.rider": "3.0.27", + "com.unity.collab-proxy": "2.3.1", + "com.unity.ide.rider": "3.0.28", "com.unity.ide.visualstudio": "2.0.22", "com.unity.ide.vscode": "1.2.5", - "com.unity.mobile.android-logcat": "1.4.0", + "com.unity.mobile.android-logcat": "1.4.1", "com.unity.test-framework": "1.1.33", "com.unity.textmeshpro": "3.0.6", "com.unity.timeline": "1.7.6", "com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.6", "com.unity.ugui": "1.0.0", - "com.unity.visualscripting": "1.9.1", + "com.unity.visualscripting": "1.9.4", + "com.unity.xr.arkit": "5.1.4", "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 c30f5cd45e06654705f29c7099228c032e15eaca..29b7877fc49e0f74f6afecd5017baa450031e90f 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -10,7 +10,7 @@ "url": "https://packages.unity.com" }, "com.unity.burst": { - "version": "1.8.12", + "version": "1.8.13", "depth": 1, "source": "registry", "dependencies": { @@ -32,7 +32,7 @@ "url": "https://packages.unity.com" }, "com.unity.collab-proxy": { - "version": "2.2.0", + "version": "2.3.1", "depth": 0, "source": "registry", "dependencies": {}, @@ -40,7 +40,7 @@ }, "com.unity.editorcoroutines": { "version": "1.0.0", - "depth": 2, + "depth": 1, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" @@ -53,7 +53,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.rider": { - "version": "3.0.27", + "version": "3.0.28", "depth": 0, "source": "registry", "dependencies": { @@ -94,7 +94,7 @@ "url": "https://packages.unity.com" }, "com.unity.mobile.android-logcat": { - "version": "1.4.0", + "version": "1.4.1", "depth": 0, "source": "registry", "dependencies": {}, @@ -175,7 +175,7 @@ } }, "com.unity.visualscripting": { - "version": "1.9.1", + "version": "1.9.4", "depth": 0, "source": "registry", "dependencies": { @@ -185,11 +185,11 @@ "url": "https://packages.unity.com" }, "com.unity.xr.arcore": { - "version": "5.1.3", + "version": "5.1.4", "depth": 1, "source": "registry", "dependencies": { - "com.unity.xr.arfoundation": "5.1.3", + "com.unity.xr.arfoundation": "5.1.4", "com.unity.xr.core-utils": "2.1.0", "com.unity.xr.management": "4.0.1", "com.unity.modules.androidjni": "1.0.0", @@ -198,7 +198,7 @@ "url": "https://packages.unity.com" }, "com.unity.xr.arfoundation": { - "version": "5.1.3", + "version": "5.1.4", "depth": 1, "source": "registry", "dependencies": { @@ -216,12 +216,12 @@ "url": "https://packages.unity.com" }, "com.unity.xr.arkit": { - "version": "5.1.3", - "depth": 1, + "version": "5.1.4", + "depth": 0, "source": "registry", "dependencies": { "com.unity.editorcoroutines": "1.0.0", - "com.unity.xr.arfoundation": "5.1.3", + "com.unity.xr.arfoundation": "5.1.4", "com.unity.xr.core-utils": "2.1.0", "com.unity.xr.management": "4.0.1" }, @@ -229,7 +229,7 @@ }, "com.unity.xr.core-utils": { "version": "2.3.0", - "depth": 2, + "depth": 1, "source": "registry", "dependencies": { "com.unity.modules.xr": "1.0.0" @@ -238,7 +238,7 @@ }, "com.unity.xr.legacyinputhelpers": { "version": "2.1.10", - "depth": 3, + "depth": 2, "source": "registry", "dependencies": { "com.unity.modules.vr": "1.0.0", @@ -248,7 +248,7 @@ }, "com.unity.xr.management": { "version": "4.4.0", - "depth": 2, + "depth": 1, "source": "registry", "dependencies": { "com.unity.modules.subsystems": "1.0.0", diff --git a/Packages/unity-world-analysis-arfoundation-wrapper-package b/Packages/unity-world-analysis-arfoundation-wrapper-package index 1a50123932c3760560c3e8fd37d6317317a80ba1..c13cc4fc084b4b729330d007c90e3053041e0592 160000 --- a/Packages/unity-world-analysis-arfoundation-wrapper-package +++ b/Packages/unity-world-analysis-arfoundation-wrapper-package @@ -1 +1 @@ -Subproject commit 1a50123932c3760560c3e8fd37d6317317a80ba1 +Subproject commit c13cc4fc084b4b729330d007c90e3053041e0592 diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index f116aa12ff07cf6f22afd61073e3f25c1a70774e..af69ea9bb28904c5fa810116b9930bcd4cdc321c 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -141,10 +141,10 @@ PlayerSettings: tvOSBundleVersion: 1.0 bundleVersion: 1.0 preloadedAssets: - - {fileID: 5732245400625790027, guid: 8f63412dcece46d4d8ff48fb8fc6c31e, type: 2} + - {fileID: 1027667839647070798, guid: 8f63412dcece46d4d8ff48fb8fc6c31e, type: 2} - {fileID: 11400000, guid: 1ef61a6a59edbba4b81751378314e1d3, type: 2} - - {fileID: 4800000, guid: c9f956787b1d945e7b36e0516201fc76, type: 3} - - {fileID: 4800000, guid: 0945859e5a1034c2cb6dce53cb4fb899, type: 3} + - {fileID: 4800000, guid: e7c77f6eaab324a819efdc13b8125a39, type: 3} + - {fileID: 4800000, guid: 6743a50a812740be8c0aa3fccc46fae9, type: 3} metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1 @@ -166,6 +166,7 @@ PlayerSettings: androidMaxAspectRatio: 2.1 applicationIdentifier: Android: com.DefaultCompany.unityworldanalysisvalidation + iPhone: com.DefaultCompany.unity-world-analysis-validation buildNumber: Standalone: 0 VisionOS: 0 @@ -237,6 +238,7 @@ PlayerSettings: iOSMetalForceHardShadows: 0 metalEditorSupport: 1 metalAPIValidation: 1 + metalCompileShaderBinary: 0 iOSRenderExtraFrameOnPause: 0 iosCopyPluginsCodeInsteadOfSymlink: 0 appleDeveloperTeamID: @@ -517,7 +519,7 @@ PlayerSettings: enableInternalProfiler: 0 logObjCUncaughtExceptions: 1 enableCrashReportAPI: 0 - cameraUsageDescription: + cameraUsageDescription: ARKit augmented reality locationUsageDescription: microphoneUsageDescription: bluetoothUsageDescription: @@ -768,7 +770,8 @@ PlayerSettings: webGLMemoryGeometricGrowthStep: 0.2 webGLMemoryGeometricGrowthCap: 96 webGLPowerPreference: 2 - scriptingDefineSymbols: {} + scriptingDefineSymbols: + iPhone: UNITY_XR_ARKIT_LOADER_ENABLED additionalCompilerArguments: {} platformArchitecture: {} scriptingBackend: @@ -808,6 +811,7 @@ PlayerSettings: metroTileBackgroundColor: {r: 0.13333334, g: 0.17254902, b: 0.21568628, a: 0} metroSplashScreenBackgroundColor: {r: 0.12941177, g: 0.17254902, b: 0.21568628, a: 1} metroSplashScreenUseBackgroundColor: 0 + syncCapabilities: 0 platformCapabilities: {} metroTargetDeviceFamilies: {} metroFTAName: