diff --git a/XRTK.WindowsMixedReality/Packages/com.xrtk.wmr/Runtime/Providers/SpatialAwarenessSystem/SpatialObservers/WindowsMixedRealitySpatialMeshObserver.cs b/XRTK.WindowsMixedReality/Packages/com.xrtk.wmr/Runtime/Providers/SpatialAwarenessSystem/SpatialObservers/WindowsMixedRealitySpatialMeshObserver.cs index d105c47..9315533 100644 --- a/XRTK.WindowsMixedReality/Packages/com.xrtk.wmr/Runtime/Providers/SpatialAwarenessSystem/SpatialObservers/WindowsMixedRealitySpatialMeshObserver.cs +++ b/XRTK.WindowsMixedReality/Packages/com.xrtk.wmr/Runtime/Providers/SpatialAwarenessSystem/SpatialObservers/WindowsMixedRealitySpatialMeshObserver.cs @@ -152,7 +152,7 @@ private async void SurfaceObserver_OnSurfaceChanged(SurfaceId surfaceId, Surface // If we're adding or updating a mesh if (changeType != SurfaceChange.Removed) { - var spatialMeshObject = await RequestSpatialMeshObject(surfaceId.handle); + var spatialMeshObject = await RequestSpatialMeshObject(new Guid(surfaceId.handle.ToString())); spatialMeshObject.GameObject.name = $"SpatialMesh_{surfaceId.handle.ToString()}"; var worldAnchor = spatialMeshObject.GameObject.EnsureComponent(); var surfaceData = new SurfaceData(surfaceId, spatialMeshObject.Filter, worldAnchor, spatialMeshObject.Collider, 1000 * (int)MeshLevelOfDetail, true); @@ -171,7 +171,7 @@ void OnDataReady(SurfaceData cookedData, bool outputWritten, float elapsedCookTi return; } - if (!SpatialMeshObjects.TryGetValue(cookedData.id.handle, out var meshObject)) + if (!SpatialMeshObjects.TryGetValue(new Guid(cookedData.id.handle.ToString()), out var meshObject)) { // Likely it was removed before data could be cooked. return; @@ -221,7 +221,7 @@ void OnDataReady(SurfaceData cookedData, bool outputWritten, float elapsedCookTi } } } - else if (SpatialMeshObjects.TryGetValue(surfaceId.handle, out var meshObject)) + else if (SpatialMeshObjects.TryGetValue(new Guid(surfaceId.handle.ToString()), out var meshObject)) { RaiseMeshRemoved(meshObject); } @@ -231,4 +231,4 @@ void OnDataReady(SurfaceData cookedData, bool outputWritten, float elapsedCookTi #endif // UNITY_WSA } -} \ No newline at end of file +} diff --git a/XRTK.WindowsMixedReality/Packages/com.xrtk.wmr/package.json b/XRTK.WindowsMixedReality/Packages/com.xrtk.wmr/package.json index ee56b89..6e21f69 100644 --- a/XRTK.WindowsMixedReality/Packages/com.xrtk.wmr/package.json +++ b/XRTK.WindowsMixedReality/Packages/com.xrtk.wmr/package.json @@ -10,7 +10,7 @@ "mixed", "reality" ], - "version": "0.2.7", + "version": "0.2.8", "unity": "2019.4", "license": "MIT", "repository": { @@ -19,7 +19,7 @@ }, "author": "XRTK Team (https://github.com/XRTK)", "dependencies": { - "com.xrtk.core": "0.2.12", + "com.xrtk.core": "0.2.13-preview.2", "com.unity.xr.windowsmr.metro": "4.2.3" }, "profiles": [ @@ -28,4 +28,4 @@ "path": "Profiles~/" } ] -} +} \ No newline at end of file diff --git a/XRTK.WindowsMixedReality/Packages/packages-lock.json b/XRTK.WindowsMixedReality/Packages/packages-lock.json index 646cbb2..98fa6a3 100644 --- a/XRTK.WindowsMixedReality/Packages/packages-lock.json +++ b/XRTK.WindowsMixedReality/Packages/packages-lock.json @@ -91,7 +91,7 @@ "url": "https://packages.unity.com" }, "com.xrtk.core": { - "version": "0.2.12", + "version": "0.2.13-preview.2", "depth": 1, "source": "registry", "dependencies": { @@ -108,7 +108,7 @@ "depth": 0, "source": "embedded", "dependencies": { - "com.xrtk.core": "0.2.12", + "com.xrtk.core": "0.2.13-preview.2", "com.unity.xr.windowsmr.metro": "4.2.3" } }, diff --git a/XRTK.WindowsMixedReality/ProjectSettings/ProjectSettings.asset b/XRTK.WindowsMixedReality/ProjectSettings/ProjectSettings.asset index 0348a37..a59a7d1 100644 --- a/XRTK.WindowsMixedReality/ProjectSettings/ProjectSettings.asset +++ b/XRTK.WindowsMixedReality/ProjectSettings/ProjectSettings.asset @@ -3,7 +3,7 @@ --- !u!129 &1 PlayerSettings: m_ObjectHideFlags: 0 - serializedVersion: 16 + serializedVersion: 20 productGUID: 13b596ff7846c714ca3f3a075c62572f AndroidProfiler: 0 AndroidFilterTouchesWhenObscured: 0 @@ -52,8 +52,7 @@ PlayerSettings: m_StackTraceTypes: 010000000100000001000000010000000100000001000000 iosShowActivityIndicatorOnLoading: -1 androidShowActivityIndicatorOnLoading: -1 - iosAppInBackgroundBehavior: 0 - displayResolutionDialog: 1 + iosUseCustomAppBackgroundBehavior: 0 iosAllowHTTPDownload: 1 allowedAutorotateToPortrait: 1 allowedAutorotateToPortraitUpsideDown: 1 @@ -65,6 +64,7 @@ PlayerSettings: disableDepthAndStencilBuffers: 0 androidStartInFullscreen: 1 androidRenderOutsideSafeArea: 0 + androidUseSwappy: 0 androidBlitType: 0 defaultIsNativeResolution: 1 macRetinaSupport: 1 @@ -79,11 +79,11 @@ PlayerSettings: usePlayerLog: 1 bakeCollisionMeshes: 0 forceSingleInstance: 0 + useFlipModelSwapchain: 1 resizableWindow: 0 useMacAppStoreValidation: 0 macAppStoreCategory: public.app-category.games gpuSkinning: 1 - graphicsJobs: 0 xboxPIXTextureCapture: 0 xboxEnableAvatar: 0 xboxEnableKinect: 0 @@ -91,7 +91,6 @@ PlayerSettings: xboxEnableFitness: 0 visibleInBackground: 1 allowFullscreenSwitch: 1 - graphicsJobMode: 0 fullscreenMode: 1 xboxSpeechDB: 0 xboxEnableHeadOrientation: 0 @@ -104,6 +103,7 @@ PlayerSettings: xboxOneMonoLoggingLevel: 0 xboxOneLoggingLevel: 1 xboxOneDisableEsram: 0 + xboxOneEnableTypeOptimization: 0 xboxOnePresentImmediateThreshold: 0 switchQueueCommandMemory: 0 switchQueueControlMemory: 16384 @@ -111,14 +111,20 @@ PlayerSettings: switchNVNShaderPoolsGranularity: 33554432 switchNVNDefaultPoolsGranularity: 16777216 switchNVNOtherPoolsGranularity: 16777216 + switchNVNMaxPublicTextureIDCount: 0 + switchNVNMaxPublicSamplerIDCount: 0 + stadiaPresentMode: 0 + stadiaTargetFramerate: 0 + vulkanNumSwapchainBuffers: 3 vulkanEnableSetSRGBWrite: 0 + vulkanEnableLateAcquireNextImage: 0 m_SupportedAspectRatios: 4:3: 1 5:4: 1 16:10: 1 16:9: 1 Others: 1 - bundleVersion: 0.1 + bundleVersion: 0.2.8 preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0 @@ -148,11 +154,14 @@ PlayerSettings: oculus: sharedDepthBuffer: 1 dashSupport: 1 + lowOverheadMode: 0 + protectedContext: 0 + v2Signing: 1 enable360StereoCapture: 0 isWsaHolographicRemotingEnabled: 0 - protectGraphicsMemory: 0 enableFrameTimingStats: 0 useHDRDisplay: 0 + D3DHDRBitDepth: 0 m_ColorGamuts: 00000000 targetPixelDensity: 30 resolutionScalingMode: 0 @@ -161,7 +170,7 @@ PlayerSettings: applicationIdentifier: {} buildNumber: {} AndroidBundleVersionCode: 1 - AndroidMinSdkVersion: 16 + AndroidMinSdkVersion: 19 AndroidTargetSdkVersion: 0 AndroidPreferredInstallLocation: 1 aotOptions: @@ -176,32 +185,16 @@ PlayerSettings: StripUnusedMeshComponents: 1 VertexChannelCompressionMask: 4054 iPhoneSdkVersion: 988 - iOSTargetOSVersionString: 9.0 + iOSTargetOSVersionString: 10.0 tvOSSdkVersion: 0 tvOSRequireExtendedGameController: 0 - tvOSTargetOSVersionString: 9.0 + tvOSTargetOSVersionString: 10.0 uIPrerenderedIcon: 0 uIRequiresPersistentWiFi: 0 uIRequiresFullScreen: 1 uIStatusBarHidden: 1 uIExitOnSuspend: 0 uIStatusBarStyle: 0 - iPhoneSplashScreen: {fileID: 0} - iPhoneHighResSplashScreen: {fileID: 0} - iPhoneTallHighResSplashScreen: {fileID: 0} - iPhone47inSplashScreen: {fileID: 0} - iPhone55inPortraitSplashScreen: {fileID: 0} - iPhone55inLandscapeSplashScreen: {fileID: 0} - iPhone58inPortraitSplashScreen: {fileID: 0} - iPhone58inLandscapeSplashScreen: {fileID: 0} - iPadPortraitSplashScreen: {fileID: 0} - iPadHighResPortraitSplashScreen: {fileID: 0} - iPadLandscapeSplashScreen: {fileID: 0} - iPadHighResLandscapeSplashScreen: {fileID: 0} - iPhone65inPortraitSplashScreen: {fileID: 0} - iPhone65inLandscapeSplashScreen: {fileID: 0} - iPhone61inPortraitSplashScreen: {fileID: 0} - iPhone61inLandscapeSplashScreen: {fileID: 0} appleTVSplashScreen: {fileID: 0} appleTVSplashScreen2x: {fileID: 0} tvOSSmallIconLayers: [] @@ -238,6 +231,7 @@ PlayerSettings: metalEditorSupport: 1 metalAPIValidation: 1 iOSRenderExtraFrameOnPause: 0 + iosCopyPluginsCodeInsteadOfSymlink: 0 appleDeveloperTeamID: iOSManualSigningProvisioningProfileID: tvOSManualSigningProvisioningProfileID: @@ -267,7 +261,8 @@ PlayerSettings: height: 180 banner: {fileID: 0} androidGamepadSupportLevel: 0 - resolutionDialogBanner: {fileID: 0} + AndroidValidateAppBundleSize: 1 + AndroidAppBundleSizeToValidate: 150 m_BuildTargetIcons: [] m_BuildTargetPlatformIcons: [] m_BuildTargetBatching: @@ -286,6 +281,42 @@ PlayerSettings: - m_BuildTarget: WebGL m_StaticBatching: 0 m_DynamicBatching: 0 + m_BuildTargetGraphicsJobs: + - m_BuildTarget: MacStandaloneSupport + m_GraphicsJobs: 0 + - m_BuildTarget: Switch + m_GraphicsJobs: 0 + - m_BuildTarget: MetroSupport + m_GraphicsJobs: 0 + - m_BuildTarget: AppleTVSupport + m_GraphicsJobs: 0 + - m_BuildTarget: BJMSupport + m_GraphicsJobs: 0 + - m_BuildTarget: LinuxStandaloneSupport + m_GraphicsJobs: 0 + - m_BuildTarget: PS4Player + m_GraphicsJobs: 0 + - m_BuildTarget: iOSSupport + m_GraphicsJobs: 0 + - m_BuildTarget: PS5Player + m_GraphicsJobs: 0 + - m_BuildTarget: WindowsStandaloneSupport + m_GraphicsJobs: 0 + - m_BuildTarget: XboxOnePlayer + m_GraphicsJobs: 0 + - m_BuildTarget: LuminSupport + m_GraphicsJobs: 0 + - m_BuildTarget: CloudRendering + m_GraphicsJobs: 0 + - m_BuildTarget: AndroidPlayer + m_GraphicsJobs: 0 + - m_BuildTarget: WebGLSupport + m_GraphicsJobs: 0 + m_BuildTargetGraphicsJobMode: + - m_BuildTarget: PS4Player + m_GraphicsJobMode: 0 + - m_BuildTarget: XboxOnePlayer + m_GraphicsJobMode: 0 m_BuildTargetGraphicsAPIs: - m_BuildTarget: AndroidPlayer m_APIs: 0b00000008000000 @@ -309,7 +340,6 @@ PlayerSettings: m_Enabled: 1 m_Devices: - WindowsMR - m_BuildTargetEnableVuforiaSettings: [] openGLRequireES31: 0 openGLRequireES31AEP: 0 openGLRequireES32: 0 @@ -428,6 +458,7 @@ PlayerSettings: switchRatingsInt_9: 0 switchRatingsInt_10: 0 switchRatingsInt_11: 0 + switchRatingsInt_12: 0 switchLocalCommunicationIds_0: switchLocalCommunicationIds_1: switchLocalCommunicationIds_2: @@ -484,6 +515,7 @@ PlayerSettings: ps4ShareFilePath: ps4ShareOverlayImagePath: ps4PrivacyGuardImagePath: + ps4ExtraSceSysFile: ps4NPtitleDatPath: ps4RemotePlayKeyAssignment: -1 ps4RemotePlayKeyMappingDir: @@ -509,6 +541,7 @@ PlayerSettings: ps4UseResolutionFallback: 0 ps4ReprojectionSupport: 0 ps4UseAudio3dBackend: 0 + ps4UseLowGarlicFragmentationMode: 1 ps4SocialScreenEnabled: 0 ps4ScriptOptimizationLevel: 0 ps4Audio3dVirtualSpeakerCount: 14 @@ -525,11 +558,38 @@ PlayerSettings: ps4disableAutoHideSplash: 0 ps4videoRecordingFeaturesUsed: 0 ps4contentSearchFeaturesUsed: 0 + ps4CompatibilityPS5: 0 + ps4GPU800MHz: 1 ps4attribEyeToEyeDistanceSettingVR: 0 ps4IncludedModules: [] + ps4attribVROutputEnabled: 0 + ps5ParamFilePath: + ps5VideoOutPixelFormat: 0 + ps5VideoOutInitialWidth: 1920 + ps5VideoOutOutputMode: 1 + ps5BackgroundImagePath: + ps5StartupImagePath: + ps5Pic2Path: + ps5StartupImagesFolder: + ps5IconImagesFolder: + ps5SaveDataImagePath: + ps5SdkOverride: + ps5BGMPath: + ps5ShareOverlayImagePath: + ps5NPConfigZipPath: + ps5Passcode: frAQBc8Wsa1xVPfvJcrgRYwTiizs2trQ + ps5UseResolutionFallback: 0 + ps5UseAudio3dBackend: 0 + ps5ScriptOptimizationLevel: 2 + ps5Audio3dVirtualSpeakerCount: 14 + ps5UpdateReferencePackage: + ps5disableAutoHideSplash: 0 + ps5OperatingSystemCanDisableSplashScreen: 0 + ps5IncludedModules: [] monoEnv: splashScreenBackgroundSourceLandscape: {fileID: 0} splashScreenBackgroundSourcePortrait: {fileID: 0} + blurSplashScreenBackground: 1 spritePackerPolicy: webGLMemorySize: 256 webGLExceptionSupport: 1 @@ -557,18 +617,19 @@ PlayerSettings: additionalIl2CppArgs: scriptingRuntimeVersion: 1 gcIncremental: 0 + assemblyVersionValidation: 1 gcWBarrierValidation: 0 apiCompatibilityLevelPerPlatform: {} m_RenderingPath: 1 m_MobileRenderingPath: 1 - metroPackageName: Template_3D - metroPackageVersion: + metroPackageName: com.xrtk.wmr + metroPackageVersion: 0.2.8.0 metroCertificatePath: metroCertificatePassword: metroCertificateSubject: metroCertificateIssuer: metroCertificateNotAfter: 0000000000000000 - metroApplicationDescription: Template_3D + metroApplicationDescription: com.xrtk.wmr wsaImages: {} metroTileShortName: metroTileShowName: 0 @@ -585,9 +646,52 @@ PlayerSettings: metroSplashScreenUseBackgroundColor: 0 platformCapabilities: WindowsStoreApps: + AllJoyn: False + Appointments: False + BackgroundMediaPlayback: False + BlockedChatMessages: False + Bluetooth: False + Chat: False + CodeGeneration: False + Contacts: False + EnterpriseAuthentication: False + GazeInput: False + HumanInterfaceDevice: False + InputInjectionBrokered: False + InternetClient: False + InternetClientServer: False + Location: False + LowLevelDevices: False Microphone: True + MusicLibrary: False + Objects3D: False + OfflineMapsManagement: False + PhoneCall: False + PhoneCallHistoryPublic: False + PicturesLibrary: False + PointOfService: False + PrivateNetworkClientServer: False + Proximity: False + RecordedCallsFolder: False + RemoteSystem: False + RemovableStorage: False + SharedUserCertificates: False SpatialPerception: True - metroTargetDeviceFamilies: {} + SystemManagement: False + UserAccountInformation: False + UserDataTasks: False + UserNotificationListener: False + VideosLibrary: False + VoipCall: False + WebCam: False + metroTargetDeviceFamilies: + Desktop: False + Holographic: False + IoT: False + IoTHeadless: False + Mobile: False + Team: False + Xbox: False metroFTAName: metroFTAFileTypes: [] metroProtocolName: @@ -609,14 +713,15 @@ PlayerSettings: XboxOneCapability: [] XboxOneGameRating: {} XboxOneIsContentPackage: 0 + XboxOneEnhancedXboxCompatibilityMode: 0 XboxOneEnableGPUVariability: 1 XboxOneSockets: {} XboxOneSplashScreen: {fileID: 0} XboxOneAllowedProductIds: [] XboxOnePersistentLocalStorageSize: 0 XboxOneXTitleMemory: 8 - xboxOneScriptCompiler: 1 XboxOneOverrideIdentityName: + XboxOneOverrideIdentityPublisher: vrEditorSettings: daydream: daydreamIconForeground: {fileID: 0} @@ -634,13 +739,6 @@ PlayerSettings: luminVersion: m_VersionCode: 1 m_VersionName: - facebookSdkVersion: 7.9.4 - facebookAppId: - facebookCookies: 1 - facebookLogging: 1 - facebookStatus: 1 - facebookXfbml: 0 - facebookFrictionlessRequests: 1 apiCompatibilityLevel: 6 cloudProjectId: framebufferDepthMemorylessMode: 0