diff --git a/MixedRemoteViewCompositor/Samples/LowLatencyMRC/UWP/Viewer/Backup/Viewer.csproj b/MixedRemoteViewCompositor/Samples/LowLatencyMRC/UWP/Viewer/Backup/Viewer.csproj new file mode 100644 index 00000000..6388f346 --- /dev/null +++ b/MixedRemoteViewCompositor/Samples/LowLatencyMRC/UWP/Viewer/Backup/Viewer.csproj @@ -0,0 +1,116 @@ + + + + + Debug + x86 + {0A431D1B-5756-40E7-8DA5-C8A934D08CE0} + AppContainerExe + Properties + Viewer + Viewer + en-US + UAP + 10.0.10240.0 + 10.0.10240.0 + 14 + 512 + {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + Viewer.pfx + + + true + bin\x86\Debug\ + DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + ;2008 + full + x86 + false + prompt + true + + + bin\x86\Release\ + TRACE;NETFX_CORE;WINDOWS_UWP + true + ;2008 + pdbonly + x86 + false + prompt + true + true + + + + + + + + + App.xaml + + + Capture.xaml + + + MainPage.xaml + + + Playback.xaml + + + + + + Designer + + + + + + + + + + + + + + + MSBuild:Compile + Designer + + + Designer + MSBuild:Compile + + + MSBuild:Compile + Designer + + + Designer + MSBuild:Compile + + + + + ..\..\..\..\Source\Win32\MixedRemoteViewCompositor.winmd + true + MixedRemoteViewCompositor.dll + + + + + 14.0 + + + + \ No newline at end of file diff --git a/MixedRemoteViewCompositor/Samples/LowLatencyMRC/UWP/Viewer/project.json b/MixedRemoteViewCompositor/Samples/LowLatencyMRC/UWP/Viewer/Backup/project.json similarity index 100% rename from MixedRemoteViewCompositor/Samples/LowLatencyMRC/UWP/Viewer/project.json rename to MixedRemoteViewCompositor/Samples/LowLatencyMRC/UWP/Viewer/Backup/project.json diff --git a/MixedRemoteViewCompositor/Samples/LowLatencyMRC/UWP/Viewer/Viewer.csproj b/MixedRemoteViewCompositor/Samples/LowLatencyMRC/UWP/Viewer/Viewer.csproj index e1454f0d..1da198d9 100644 --- a/MixedRemoteViewCompositor/Samples/LowLatencyMRC/UWP/Viewer/Viewer.csproj +++ b/MixedRemoteViewCompositor/Samples/LowLatencyMRC/UWP/Viewer/Viewer.csproj @@ -11,12 +11,13 @@ Viewer en-US UAP - 10.0.10586.0 - 10.0.10240.0 + 10.0.16299.0 + 10.0.16299.0 14 512 {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} Viewer.pfx + win10-arm;win10-arm-aot;win10-x86;win10-x86-aot;win10-x64;win10-x64-aot true @@ -43,7 +44,6 @@ - @@ -95,10 +95,17 @@ - - False - $(SolutionDir)..\..\..\Build\$(Configuration)\Plugins\WSA\$(PlatformName)\MixedRemoteViewCompositor.winmd + + ..\..\..\..\Source\Win32\MixedRemoteViewCompositor.winmd + true + MixedRemoteViewCompositor.dll + + + + + 5.1.0 + 14.0 diff --git a/MixedRemoteViewCompositor/Samples/LowLatencyMRC/Unity/.collabignore b/MixedRemoteViewCompositor/Samples/LowLatencyMRC/Unity/.collabignore new file mode 100644 index 00000000..dded782e --- /dev/null +++ b/MixedRemoteViewCompositor/Samples/LowLatencyMRC/Unity/.collabignore @@ -0,0 +1,33 @@ +# =========================== +# Default Collab Ignore Rules +# =========================== + +# OS Generated +# ============ +.DS_Store +._* +.Spotlight-V100 +.Trashes +Icon? +ehthumbs.db +[Tt]humbs.db +[Dd]esktop.ini + +# Visual Studio / MonoDevelop generated +# ===================================== +[Ee]xported[Oo]bj/ +*.userprefs +*.csproj +*.pidb +*.suo +*.sln +*.user +*.unityproj +*.booproj + +# Unity generated +# =============== +[Oo]bj/ +[Bb]uild +sysinfo.txt +*.stackdump diff --git a/MixedRemoteViewCompositor/Samples/LowLatencyMRC/Unity/Assets/AddOns/MixedRemoteViewCompositor/Materials/Compositor.shader b/MixedRemoteViewCompositor/Samples/LowLatencyMRC/Unity/Assets/AddOns/MixedRemoteViewCompositor/Materials/Compositor.shader index f16a1d82..3d31866b 100644 --- a/MixedRemoteViewCompositor/Samples/LowLatencyMRC/Unity/Assets/AddOns/MixedRemoteViewCompositor/Materials/Compositor.shader +++ b/MixedRemoteViewCompositor/Samples/LowLatencyMRC/Unity/Assets/AddOns/MixedRemoteViewCompositor/Materials/Compositor.shader @@ -1,3 +1,5 @@ +// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)' + // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. See LICENSE in the project root for license information. @@ -28,7 +30,7 @@ Shader "Hidden/Compositor" v2f vert(appdata_img v) { v2f o; - o.pos = mul(UNITY_MATRIX_MVP, v.vertex); + o.pos = UnityObjectToClipPos(v.vertex); o.uv[0] = v.texcoord.xy; diff --git a/MixedRemoteViewCompositor/Samples/LowLatencyMRC/Unity/Assets/AddOns/MixedRemoteViewCompositor/Plugins/WSA/x86/MixedRemoteViewCompositor.dll b/MixedRemoteViewCompositor/Samples/LowLatencyMRC/Unity/Assets/AddOns/MixedRemoteViewCompositor/Plugins/WSA/x86/MixedRemoteViewCompositor.dll new file mode 100644 index 00000000..aabe436e Binary files /dev/null and b/MixedRemoteViewCompositor/Samples/LowLatencyMRC/Unity/Assets/AddOns/MixedRemoteViewCompositor/Plugins/WSA/x86/MixedRemoteViewCompositor.dll differ diff --git a/MixedRemoteViewCompositor/Samples/LowLatencyMRC/Unity/Assets/AddOns/MixedRemoteViewCompositor/Plugins/x86/MixedRemoteViewCompositor.dll b/MixedRemoteViewCompositor/Samples/LowLatencyMRC/Unity/Assets/AddOns/MixedRemoteViewCompositor/Plugins/x86/MixedRemoteViewCompositor.dll new file mode 100644 index 00000000..9aab760f Binary files /dev/null and b/MixedRemoteViewCompositor/Samples/LowLatencyMRC/Unity/Assets/AddOns/MixedRemoteViewCompositor/Plugins/x86/MixedRemoteViewCompositor.dll differ diff --git a/MixedRemoteViewCompositor/Samples/LowLatencyMRC/Unity/Assets/AddOns/MixedRemoteViewCompositor/Plugins/x86/MixedRemoteViewCompositor.dll.meta b/MixedRemoteViewCompositor/Samples/LowLatencyMRC/Unity/Assets/AddOns/MixedRemoteViewCompositor/Plugins/x86/MixedRemoteViewCompositor.dll.meta index 88887750..3d9d3ab6 100644 --- a/MixedRemoteViewCompositor/Samples/LowLatencyMRC/Unity/Assets/AddOns/MixedRemoteViewCompositor/Plugins/x86/MixedRemoteViewCompositor.dll.meta +++ b/MixedRemoteViewCompositor/Samples/LowLatencyMRC/Unity/Assets/AddOns/MixedRemoteViewCompositor/Plugins/x86/MixedRemoteViewCompositor.dll.meta @@ -1,62 +1,113 @@ -fileFormatVersion: 2 -guid: a8e91f03c255ff54aac15fe2e5791674 -timeCreated: 1472516408 -licenseType: Pro -PluginImporter: - serializedVersion: 1 - iconMap: {} - executionOrder: {} - isPreloaded: 0 - platformData: - Any: - enabled: 0 - settings: {} - Editor: - enabled: 1 - settings: - CPU: x86 - DefaultValueInitialized: true - OS: Windows - Linux: - enabled: 1 - settings: - CPU: x86 - Linux64: - enabled: 0 - settings: - CPU: None - LinuxUniversal: - enabled: 0 - settings: - CPU: x86 - OSXIntel: - enabled: 1 - settings: - CPU: AnyCPU - OSXIntel64: - enabled: 0 - settings: - CPU: None - OSXUniversal: - enabled: 0 - settings: - CPU: x86 - Win: - enabled: 1 - settings: - CPU: AnyCPU - Win64: - enabled: 0 - settings: - CPU: None - WindowsStoreApps: - enabled: 0 - settings: - CPU: AnyCPU - DontProcess: False - PlaceholderPath: - SDK: AnySDK - ScriptingBackend: AnyScriptingBackend - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: a8e91f03c255ff54aac15fe2e5791674 +timeCreated: 1472516408 +licenseType: Pro +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + isPreloaded: 0 + isOverridable: 0 + platformData: + - first: + '': Any + second: + enabled: 0 + settings: + Exclude Editor: 0 + Exclude Linux: 0 + Exclude Linux64: 1 + Exclude LinuxUniversal: 1 + Exclude OSXIntel: 0 + Exclude OSXIntel64: 1 + Exclude OSXUniversal: 1 + Exclude Win: 0 + Exclude Win64: 1 + Exclude WindowsStoreApps: 1 + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 1 + settings: + CPU: x86 + DefaultValueInitialized: true + OS: Windows + - first: + Facebook: Win + second: + enabled: 1 + settings: + CPU: AnyCPU + - first: + Facebook: Win64 + second: + enabled: 0 + settings: + CPU: None + - first: + Standalone: Linux + second: + enabled: 1 + settings: + CPU: x86 + - first: + Standalone: Linux64 + second: + enabled: 0 + settings: + CPU: None + - first: + Standalone: LinuxUniversal + second: + enabled: 0 + settings: + CPU: x86 + - first: + Standalone: OSXIntel + second: + enabled: 1 + settings: + CPU: AnyCPU + - first: + Standalone: OSXIntel64 + second: + enabled: 0 + settings: + CPU: None + - first: + Standalone: OSXUniversal + second: + enabled: 0 + settings: + CPU: x86 + - first: + Standalone: Win + second: + enabled: 1 + settings: + CPU: AnyCPU + - first: + Standalone: Win64 + second: + enabled: 0 + settings: + CPU: None + - first: + Windows Store Apps: WindowsStoreApps + second: + enabled: 0 + settings: + CPU: AnyCPU + DontProcess: False + PlaceholderPath: + SDK: AnySDK + ScriptingBackend: AnyScriptingBackend + userData: + assetBundleName: + assetBundleVariant: diff --git a/MixedRemoteViewCompositor/Samples/LowLatencyMRC/Unity/Assets/AddOns/MixedRemoteViewCompositor/Scripts/MrvcCapture.cs b/MixedRemoteViewCompositor/Samples/LowLatencyMRC/Unity/Assets/AddOns/MixedRemoteViewCompositor/Scripts/MrvcCapture.cs index 06151f6c..15ef5dbf 100644 --- a/MixedRemoteViewCompositor/Samples/LowLatencyMRC/Unity/Assets/AddOns/MixedRemoteViewCompositor/Scripts/MrvcCapture.cs +++ b/MixedRemoteViewCompositor/Samples/LowLatencyMRC/Unity/Assets/AddOns/MixedRemoteViewCompositor/Scripts/MrvcCapture.cs @@ -3,7 +3,7 @@ using System; using UnityEngine; -using UnityEngine.VR.WSA; +using UnityEngine.XR.WSA; namespace MixedRemoteViewCompositor { diff --git a/MixedRemoteViewCompositor/Samples/LowLatencyMRC/Unity/Assets/TestScene.meta b/MixedRemoteViewCompositor/Samples/LowLatencyMRC/Unity/Assets/TestScene.meta new file mode 100644 index 00000000..dd34d9fb --- /dev/null +++ b/MixedRemoteViewCompositor/Samples/LowLatencyMRC/Unity/Assets/TestScene.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: dbad29e70df8d814cad35c15f764fd32 +folderAsset: yes +timeCreated: 1511348920 +licenseType: Free +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/MixedRemoteViewCompositor/Samples/LowLatencyMRC/Unity/Assets/WSATestCertificate.pfx b/MixedRemoteViewCompositor/Samples/LowLatencyMRC/Unity/Assets/WSATestCertificate.pfx new file mode 100644 index 00000000..dbd9f23d Binary files /dev/null and b/MixedRemoteViewCompositor/Samples/LowLatencyMRC/Unity/Assets/WSATestCertificate.pfx differ diff --git a/MixedRemoteViewCompositor/Samples/LowLatencyMRC/Unity/Assets/WSATestCertificate.pfx.meta b/MixedRemoteViewCompositor/Samples/LowLatencyMRC/Unity/Assets/WSATestCertificate.pfx.meta new file mode 100644 index 00000000..4cf0b9fd --- /dev/null +++ b/MixedRemoteViewCompositor/Samples/LowLatencyMRC/Unity/Assets/WSATestCertificate.pfx.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 8538c80420f4a7340ba2255d87fe5e9a +timeCreated: 1511349700 +licenseType: Free +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/MixedRemoteViewCompositor/Samples/LowLatencyMRC/Unity/ProjectSettings/EditorBuildSettings.asset b/MixedRemoteViewCompositor/Samples/LowLatencyMRC/Unity/ProjectSettings/EditorBuildSettings.asset index 6dc24f7d..a51cd0ba 100644 --- a/MixedRemoteViewCompositor/Samples/LowLatencyMRC/Unity/ProjectSettings/EditorBuildSettings.asset +++ b/MixedRemoteViewCompositor/Samples/LowLatencyMRC/Unity/ProjectSettings/EditorBuildSettings.asset @@ -4,4 +4,7 @@ EditorBuildSettings: m_ObjectHideFlags: 0 serializedVersion: 2 - m_Scenes: [] + m_Scenes: + - enabled: 1 + path: Assets/TestScene/LowLatencyMrc.unity + guid: ba2db0edcecae7b48a550cd04e2527ec diff --git a/MixedRemoteViewCompositor/Samples/LowLatencyMRC/Unity/ProjectSettings/GraphicsSettings.asset b/MixedRemoteViewCompositor/Samples/LowLatencyMRC/Unity/ProjectSettings/GraphicsSettings.asset index 325937ca..ab4ac834 100644 --- a/MixedRemoteViewCompositor/Samples/LowLatencyMRC/Unity/ProjectSettings/GraphicsSettings.asset +++ b/MixedRemoteViewCompositor/Samples/LowLatencyMRC/Unity/ProjectSettings/GraphicsSettings.asset @@ -3,7 +3,7 @@ --- !u!30 &1 GraphicsSettings: m_ObjectHideFlags: 0 - serializedVersion: 7 + serializedVersion: 12 m_Deferred: m_Mode: 1 m_Shader: {fileID: 69, guid: 0000000000000000f000000000000000, type: 0} @@ -36,33 +36,28 @@ GraphicsSettings: - {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 10782, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0} m_PreloadedShaders: [] m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderSettings_Tier1: - useCascadedShadowMaps: 1 - standardShaderQuality: 2 - useReflectionProbeBoxProjection: 1 - useReflectionProbeBlending: 1 - m_ShaderSettings_Tier2: - useCascadedShadowMaps: 1 - standardShaderQuality: 2 - useReflectionProbeBoxProjection: 1 - useReflectionProbeBlending: 1 - m_ShaderSettings_Tier3: - useCascadedShadowMaps: 1 - standardShaderQuality: 2 - useReflectionProbeBoxProjection: 1 - useReflectionProbeBlending: 1 - m_BuildTargetShaderSettings: [] + m_CustomRenderPipeline: {fileID: 0} + m_TransparencySortMode: 0 + m_TransparencySortAxis: {x: 0, y: 0, z: 1} + m_DefaultRenderingPath: 1 + m_DefaultMobileRenderingPath: 1 + m_TierSettings: [] m_LightmapStripping: 0 m_FogStripping: 0 + m_InstancingStripping: 0 m_LightmapKeepPlain: 1 m_LightmapKeepDirCombined: 1 - m_LightmapKeepDirSeparate: 1 m_LightmapKeepDynamicPlain: 1 m_LightmapKeepDynamicDirCombined: 1 - m_LightmapKeepDynamicDirSeparate: 1 + m_LightmapKeepShadowMask: 1 + m_LightmapKeepSubtractive: 1 m_FogKeepLinear: 1 m_FogKeepExp: 1 m_FogKeepExp2: 1 + m_AlbedoSwatchInfos: [] + m_LightsUseLinearIntensity: 0 + m_LightsUseColorTemperature: 0 diff --git a/MixedRemoteViewCompositor/Samples/LowLatencyMRC/Unity/ProjectSettings/ProjectSettings.asset b/MixedRemoteViewCompositor/Samples/LowLatencyMRC/Unity/ProjectSettings/ProjectSettings.asset index f7b2ef27..facdfaf9 100644 --- a/MixedRemoteViewCompositor/Samples/LowLatencyMRC/Unity/ProjectSettings/ProjectSettings.asset +++ b/MixedRemoteViewCompositor/Samples/LowLatencyMRC/Unity/ProjectSettings/ProjectSettings.asset @@ -3,8 +3,10 @@ --- !u!129 &1 PlayerSettings: m_ObjectHideFlags: 0 - serializedVersion: 8 + serializedVersion: 13 + productGUID: 2051505bf1e1c5a4baa6583cd0aaa075 AndroidProfiler: 0 + AndroidFilterTouchesWhenObscured: 0 defaultScreenOrientation: 4 targetDevice: 2 useOnDemandResources: 0 @@ -13,22 +15,43 @@ PlayerSettings: productName: LowLatencyMrcSample defaultCursor: {fileID: 0} cursorHotspot: {x: 0, y: 0} - m_SplashScreenStyle: 0 + m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1} m_ShowUnitySplashScreen: 1 + m_ShowUnitySplashLogo: 1 + m_SplashScreenOverlayOpacity: 1 + m_SplashScreenAnimation: 1 + m_SplashScreenLogoStyle: 1 + m_SplashScreenDrawMode: 0 + m_SplashScreenBackgroundAnimationZoom: 1 + m_SplashScreenLogoAnimationZoom: 1 + m_SplashScreenBackgroundLandscapeAspect: 1 + m_SplashScreenBackgroundPortraitAspect: 1 + m_SplashScreenBackgroundLandscapeUvs: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + m_SplashScreenBackgroundPortraitUvs: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + m_SplashScreenLogos: [] m_VirtualRealitySplashScreen: {fileID: 0} m_HolographicTrackingLossScreen: {fileID: 0} defaultScreenWidth: 1024 defaultScreenHeight: 768 defaultScreenWidthWeb: 960 defaultScreenHeightWeb: 600 - m_RenderingPath: 1 - m_MobileRenderingPath: 1 + m_StereoRenderingPath: 0 m_ActiveColorSpace: 0 m_MTRendering: 1 - m_MobileMTRendering: 0 m_StackTraceTypes: 010000000100000001000000010000000100000001000000 iosShowActivityIndicatorOnLoading: -1 androidShowActivityIndicatorOnLoading: -1 + tizenShowActivityIndicatorOnLoading: -1 iosAppInBackgroundBehavior: 0 displayResolutionDialog: 1 iosAllowHTTPDownload: 1 @@ -39,18 +62,24 @@ PlayerSettings: useOSAutorotation: 1 use32BitDisplayBuffer: 1 disableDepthAndStencilBuffers: 0 + androidBlitType: 0 defaultIsFullScreen: 1 defaultIsNativeResolution: 1 + macRetinaSupport: 1 runInBackground: 1 captureSingleScreen: 0 - Override IPod Music: 0 + muteOtherAudioSources: 0 Prepare IOS For Recording: 0 + Force IOS Speakers When Recording: 0 + deferSystemGesturesMode: 0 + hideHomeButton: 0 submitAnalytics: 1 usePlayerLog: 1 bakeCollisionMeshes: 0 forceSingleInstance: 0 resizableWindow: 0 useMacAppStoreValidation: 0 + macAppStoreCategory: public.app-category.games gpuSkinning: 0 graphicsJobs: 0 xboxPIXTextureCapture: 0 @@ -60,6 +89,7 @@ PlayerSettings: xboxEnableFitness: 0 visibleInBackground: 0 allowFullscreenSwitch: 1 + graphicsJobMode: 0 macFullscreenMode: 2 d3d9FullscreenMode: 1 d3d11FullscreenMode: 1 @@ -67,14 +97,16 @@ PlayerSettings: xboxEnableHeadOrientation: 0 xboxEnableGuest: 0 xboxEnablePIXSampling: 0 + metalFramebufferOnly: 0 n3dsDisableStereoscopicView: 0 n3dsEnableSharedListOpt: 1 n3dsEnableVSync: 0 - uiUse16BitDepthBuffer: 1 ignoreAlphaClear: 0 xboxOneResolution: 0 xboxOneMonoLoggingLevel: 0 - ps3SplashScreen: {fileID: 0} + xboxOneLoggingLevel: 1 + xboxOneDisableEsram: 0 + xboxOnePresentImmediateThreshold: 0 videoMemoryForVertexBuffers: 0 psp2PowerMode: 0 psp2AcquireBGM: 1 @@ -93,37 +125,60 @@ PlayerSettings: 16:10: 1 16:9: 1 Others: 1 - bundleIdentifier: com.Company.ProductName bundleVersion: 1.0 preloadedAssets: [] - metroEnableIndependentInputSource: 0 + metroInputSource: 0 m_HolographicPauseOnTrackingLoss: 1 xboxOneDisableKinectGpuReservation: 0 - singlePassStereoRendering: 0 + xboxOneEnable7thCore: 0 + vrSettings: + cardboard: + depthFormat: 0 + enableTransitionView: 0 + daydream: + depthFormat: 0 + useSustainedPerformanceMode: 0 + enableVideoLayer: 0 + useProtectedVideoMemory: 0 + hololens: + depthFormat: 1 protectGraphicsMemory: 0 - productGUID: 2051505bf1e1c5a4baa6583cd0aaa075 + useHDRDisplay: 0 + m_ColorGamuts: 00000000 + targetPixelDensity: 0 + resolutionScalingMode: 0 + androidSupportedAspectRatio: 1 + androidMaxAspectRatio: 2.1 + applicationIdentifier: + Android: com.Company.ProductName + Standalone: unity.DefaultCompany.LowLatencyMrcSample + Tizen: com.Company.ProductName + iOS: com.Company.ProductName + tvOS: com.Company.ProductName + buildNumber: + iOS: 0 AndroidBundleVersionCode: 1 - AndroidMinSdkVersion: 9 + AndroidMinSdkVersion: 16 + AndroidTargetSdkVersion: 0 AndroidPreferredInstallLocation: 1 aotOptions: - apiCompatibilityLevel: 2 stripEngineCode: 1 iPhoneStrippingLevel: 0 iPhoneScriptCallOptimization: 0 - iPhoneBuildNumber: 0 ForceInternetPermission: 0 ForceSDCardPermission: 0 CreateWallpaper: 0 APKExpansionFiles: 0 - preloadShaders: 0 + keepLoadedShadersAlive: 0 StripUnusedMeshComponents: 0 VertexChannelCompressionMask: serializedVersion: 2 m_Bits: 238 iPhoneSdkVersion: 988 - iPhoneTargetOSVersion: 24 + iOSTargetOSVersionString: 7.0 tvOSSdkVersion: 0 - tvOSTargetOSVersion: 900 + tvOSRequireExtendedGameController: 0 + tvOSTargetOSVersionString: 9.0 uIPrerenderedIcon: 0 uIRequiresPersistentWiFi: 0 uIRequiresFullScreen: 1 @@ -136,14 +191,22 @@ PlayerSettings: 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} appleTVSplashScreen: {fileID: 0} + appleTVSplashScreen2x: {fileID: 0} tvOSSmallIconLayers: [] + tvOSSmallIconLayers2x: [] tvOSLargeIconLayers: [] + tvOSLargeIconLayers2x: [] tvOSTopShelfImageLayers: [] + tvOSTopShelfImageLayers2x: [] + tvOSTopShelfImageWideLayers: [] + tvOSTopShelfImageWideLayers2x: [] iOSLaunchScreenType: 0 iOSLaunchScreenPortrait: {fileID: 0} iOSLaunchScreenLandscape: {fileID: 0} @@ -163,6 +226,15 @@ PlayerSettings: iOSLaunchScreeniPadCustomXibPath: iOSDeviceRequirements: [] iOSURLSchemes: [] + iOSBackgroundModes: 0 + iOSMetalForceHardShadows: 0 + metalEditorSupport: 1 + metalAPIValidation: 1 + iOSRenderExtraFrameOnPause: 1 + appleDeveloperTeamID: + iOSManualSigningProvisioningProfileID: + tvOSManualSigningProvisioningProfileID: + appleEnableAutomaticSigning: 0 AndroidTargetDevice: 0 AndroidSplashScreenScale: 0 androidSplashScreen: {fileID: 0} @@ -170,7 +242,9 @@ PlayerSettings: AndroidKeyaliasName: AndroidTVCompatibility: 1 AndroidIsGame: 1 + AndroidEnableTango: 0 androidEnableBanner: 1 + androidUseLowAccuracyLocation: 0 m_AndroidBanners: - width: 320 height: 180 @@ -184,10 +258,72 @@ PlayerSettings: m_Icon: {fileID: 0} m_Width: 128 m_Height: 128 + m_Kind: 0 m_BuildTargetBatching: [] m_BuildTargetGraphicsAPIs: [] - webPlayerTemplate: APPLICATION:Default + m_BuildTargetVRSettings: + - m_BuildTarget: Android + m_Enabled: 0 + m_Devices: + - Oculus + - m_BuildTarget: Metro + m_Enabled: 1 + m_Devices: + - HoloLens + - m_BuildTarget: N3DS + m_Enabled: 0 + m_Devices: [] + - m_BuildTarget: PS3 + m_Enabled: 0 + m_Devices: [] + - m_BuildTarget: PS4 + m_Enabled: 0 + m_Devices: + - PlayStationVR + - m_BuildTarget: PSM + m_Enabled: 0 + m_Devices: [] + - m_BuildTarget: PSP2 + m_Enabled: 0 + m_Devices: [] + - m_BuildTarget: SamsungTV + m_Enabled: 0 + m_Devices: [] + - m_BuildTarget: Standalone + m_Enabled: 0 + m_Devices: + - Oculus + - m_BuildTarget: Tizen + m_Enabled: 0 + m_Devices: [] + - m_BuildTarget: WebGL + m_Enabled: 0 + m_Devices: [] + - m_BuildTarget: WebPlayer + m_Enabled: 0 + m_Devices: [] + - m_BuildTarget: WiiU + m_Enabled: 0 + m_Devices: [] + - m_BuildTarget: Xbox360 + m_Enabled: 0 + m_Devices: [] + - m_BuildTarget: XboxOne + m_Enabled: 0 + m_Devices: [] + - m_BuildTarget: iOS + m_Enabled: 0 + m_Devices: [] + - m_BuildTarget: tvOS + m_Enabled: 0 + m_Devices: [] + m_BuildTargetEnableVuforiaSettings: [] + openGLRequireES31: 0 + openGLRequireES31AEP: 0 m_TemplateCustomTags: {} + mobileMTRendering: + iPhone: 1 + tvOS: 1 wiiUTitleID: 0005000011000000 wiiUGroupID: 00010000 wiiUCommonSaveSize: 4096 @@ -204,40 +340,140 @@ PlayerSettings: wiiUSystemHeapSize: 128 wiiUTVStartupScreen: {fileID: 0} wiiUGamePadStartupScreen: {fileID: 0} + wiiUDrcBufferDisabled: 0 wiiUProfilerLibPath: + playModeTestRunnerEnabled: 0 actionOnDotNetUnhandledException: 1 enableInternalProfiler: 0 logObjCUncaughtExceptions: 1 enableCrashReportAPI: 0 + cameraUsageDescription: locationUsageDescription: - XboxTitleId: - XboxImageXexPath: - XboxSpaPath: - XboxGenerateSpa: 0 - XboxDeployKinectResources: 0 - XboxSplashScreen: {fileID: 0} - xboxEnableSpeech: 0 - xboxAdditionalTitleMemorySize: 0 - xboxDeployKinectHeadOrientation: 0 - xboxDeployKinectHeadPosition: 0 - ps3TitleConfigPath: - ps3DLCConfigPath: - ps3ThumbnailPath: - ps3BackgroundPath: - ps3SoundPath: - ps3NPAgeRating: 12 - ps3TrophyCommId: - ps3NpCommunicationPassphrase: - ps3TrophyPackagePath: - ps3BootCheckMaxSaveGameSizeKB: 128 - ps3TrophyCommSig: - ps3SaveGameSlots: 1 - ps3TrialMode: 0 - ps3VideoMemoryForAudio: 0 - ps3EnableVerboseMemoryStats: 0 - ps3UseSPUForUmbra: 0 - ps3EnableMoveSupport: 1 - ps3DisableDolbyEncoding: 0 + microphoneUsageDescription: + switchNetLibKey: + switchSocketMemoryPoolSize: 6144 + switchSocketAllocatorPoolSize: 128 + switchSocketConcurrencyLimit: 14 + switchScreenResolutionBehavior: 2 + switchUseCPUProfiler: 0 + switchApplicationID: 0x01004b9000490000 + switchNSODependencies: + switchTitleNames_0: + switchTitleNames_1: + switchTitleNames_2: + switchTitleNames_3: + switchTitleNames_4: + switchTitleNames_5: + switchTitleNames_6: + switchTitleNames_7: + switchTitleNames_8: + switchTitleNames_9: + switchTitleNames_10: + switchTitleNames_11: + switchTitleNames_12: + switchTitleNames_13: + switchTitleNames_14: + switchPublisherNames_0: + switchPublisherNames_1: + switchPublisherNames_2: + switchPublisherNames_3: + switchPublisherNames_4: + switchPublisherNames_5: + switchPublisherNames_6: + switchPublisherNames_7: + switchPublisherNames_8: + switchPublisherNames_9: + switchPublisherNames_10: + switchPublisherNames_11: + switchPublisherNames_12: + switchPublisherNames_13: + switchPublisherNames_14: + switchIcons_0: {fileID: 0} + switchIcons_1: {fileID: 0} + switchIcons_2: {fileID: 0} + switchIcons_3: {fileID: 0} + switchIcons_4: {fileID: 0} + switchIcons_5: {fileID: 0} + switchIcons_6: {fileID: 0} + switchIcons_7: {fileID: 0} + switchIcons_8: {fileID: 0} + switchIcons_9: {fileID: 0} + switchIcons_10: {fileID: 0} + switchIcons_11: {fileID: 0} + switchIcons_12: {fileID: 0} + switchIcons_13: {fileID: 0} + switchIcons_14: {fileID: 0} + switchSmallIcons_0: {fileID: 0} + switchSmallIcons_1: {fileID: 0} + switchSmallIcons_2: {fileID: 0} + switchSmallIcons_3: {fileID: 0} + switchSmallIcons_4: {fileID: 0} + switchSmallIcons_5: {fileID: 0} + switchSmallIcons_6: {fileID: 0} + switchSmallIcons_7: {fileID: 0} + switchSmallIcons_8: {fileID: 0} + switchSmallIcons_9: {fileID: 0} + switchSmallIcons_10: {fileID: 0} + switchSmallIcons_11: {fileID: 0} + switchSmallIcons_12: {fileID: 0} + switchSmallIcons_13: {fileID: 0} + switchSmallIcons_14: {fileID: 0} + switchManualHTML: + switchAccessibleURLs: + switchLegalInformation: + switchMainThreadStackSize: 1048576 + switchPresenceGroupId: + switchLogoHandling: 0 + switchReleaseVersion: 0 + switchDisplayVersion: 1.0.0 + switchStartupUserAccount: 0 + switchTouchScreenUsage: 0 + switchSupportedLanguagesMask: 0 + switchLogoType: 0 + switchApplicationErrorCodeCategory: + switchUserAccountSaveDataSize: 0 + switchUserAccountSaveDataJournalSize: 0 + switchApplicationAttribute: 0 + switchCardSpecSize: -1 + switchCardSpecClock: -1 + switchRatingsMask: 0 + switchRatingsInt_0: 0 + switchRatingsInt_1: 0 + switchRatingsInt_2: 0 + switchRatingsInt_3: 0 + switchRatingsInt_4: 0 + switchRatingsInt_5: 0 + switchRatingsInt_6: 0 + switchRatingsInt_7: 0 + switchRatingsInt_8: 0 + switchRatingsInt_9: 0 + switchRatingsInt_10: 0 + switchRatingsInt_11: 0 + switchLocalCommunicationIds_0: + switchLocalCommunicationIds_1: + switchLocalCommunicationIds_2: + switchLocalCommunicationIds_3: + switchLocalCommunicationIds_4: + switchLocalCommunicationIds_5: + switchLocalCommunicationIds_6: + switchLocalCommunicationIds_7: + switchParentalControl: 0 + switchAllowsScreenshot: 1 + switchAllowsVideoCapturing: 1 + switchAllowsRuntimeAddOnContentInstall: 0 + switchDataLossConfirmation: 0 + switchSupportedNpadStyles: 3 + switchSocketConfigEnabled: 0 + switchTcpInitialSendBufferSize: 32 + switchTcpInitialReceiveBufferSize: 64 + switchTcpAutoSendBufferSizeMax: 256 + switchTcpAutoReceiveBufferSizeMax: 256 + switchUdpSendBufferSize: 9 + switchUdpReceiveBufferSize: 42 + switchSocketBufferEfficiency: 4 + switchSocketInitializeEnabled: 1 + switchNetworkInterfaceManagerInitializeEnabled: 1 + switchPlayerConnectionEnabled: 1 ps4NPAgeRating: 12 ps4NPTitleSecret: ps4NPTrophyPackPath: @@ -249,7 +485,9 @@ PlayerSettings: ps4AppType: 0 ps4ParamSfxPath: ps4VideoOutPixelFormat: 0 - ps4VideoOutResolution: 4 + ps4VideoOutInitialWidth: 1920 + ps4VideoOutBaseModeInitialWidth: 1920 + ps4VideoOutReprojectionRate: 60 ps4PronunciationXMLPath: ps4PronunciationSIGPath: ps4BackgroundImagePath: @@ -271,26 +509,34 @@ PlayerSettings: ps4ApplicationParam4: 0 ps4DownloadDataSize: 0 ps4GarlicHeapSize: 2048 + ps4ProGarlicHeapSize: 2560 ps4Passcode: frAQBc8Wsa1xVPfvJcrgRYwTiizs2trQ - ps4UseDebugIl2cppLibs: 0 ps4pnSessions: 1 ps4pnPresence: 1 ps4pnFriends: 1 ps4pnGameCustomData: 1 playerPrefsSupport: 0 + restrictedAudioUsageRights: 0 + ps4UseResolutionFallback: 0 ps4ReprojectionSupport: 0 ps4UseAudio3dBackend: 0 ps4SocialScreenEnabled: 0 + ps4ScriptOptimizationLevel: 0 ps4Audio3dVirtualSpeakerCount: 14 ps4attribCpuUsage: 0 ps4PatchPkgPath: ps4PatchLatestPkgPath: ps4PatchChangeinfoPath: + ps4PatchDayOne: 0 ps4attribUserManagement: 0 ps4attribMoveSupport: 0 ps4attrib3DSupport: 0 ps4attribShareSupport: 0 + ps4attribExclusiveVR: 0 ps4disableAutoHideSplash: 0 + ps4videoRecordingFeaturesUsed: 0 + ps4contentSearchFeaturesUsed: 0 + ps4attribEyeToEyeDistanceSettingVR: 0 ps4IncludedModules: [] monoEnv: psp2Splashimage: {fileID: 0} @@ -339,17 +585,41 @@ PlayerSettings: psp2UseLibLocation: 0 psp2InfoBarOnStartup: 0 psp2InfoBarColor: 0 - psp2UseDebugIl2cppLibs: 0 + psp2ScriptOptimizationLevel: 0 psmSplashimage: {fileID: 0} + splashScreenBackgroundSourceLandscape: {fileID: 0} + splashScreenBackgroundSourcePortrait: {fileID: 0} spritePackerPolicy: + webGLMemorySize: 256 + webGLExceptionSupport: 1 + webGLNameFilesAsHashes: 0 + webGLDataCaching: 0 + webGLDebugSymbols: 0 + webGLEmscriptenArgs: + webGLModulesDirectory: + webGLTemplate: APPLICATION:Default + webGLAnalyzeBuildSize: 0 + webGLUseEmbeddedResources: 0 + webGLUseWasm: 0 + webGLCompressionFormat: 1 scriptingDefineSymbols: {} + platformArchitecture: {} + scriptingBackend: + Metro: 2 + Standalone: 0 + incrementalIl2cppBuild: {} + additionalIl2CppArgs: + scriptingRuntimeVersion: 0 + apiCompatibilityLevelPerPlatform: {} + m_RenderingPath: 1 + m_MobileRenderingPath: 1 metroPackageName: LowLatencyMrc metroPackageVersion: 1.0.0.0 metroCertificatePath: Assets\WSATestCertificate.pfx metroCertificatePassword: metroCertificateSubject: DefaultCompany metroCertificateIssuer: DefaultCompany - metroCertificateNotAfter: 00fff01fb538d301 + metroCertificateNotAfter: 80a6d5d28782d401 metroApplicationDescription: sample of using low latency MRC mode wsaImages: {} metroTileShortName: LowLatencyMrc @@ -400,6 +670,9 @@ PlayerSettings: tizenSigningProfileName: tizenGPSPermissions: 0 tizenMicrophonePermissions: 0 + tizenDeploymentTarget: + tizenDeploymentTargetType: -1 + tizenMinOSVersion: 1 n3dsUseExtSaveData: 0 n3dsCompressStaticMem: 1 n3dsExtSaveDataNumber: 0x12345 @@ -429,111 +702,36 @@ PlayerSettings: XboxOnePackageEncryption: 0 XboxOnePackageUpdateGranularity: 2 XboxOneDescription: + XboxOneLanguage: + - enus + XboxOneCapability: [] + XboxOneGameRating: {} XboxOneIsContentPackage: 0 XboxOneEnableGPUVariability: 0 XboxOneSockets: {} XboxOneSplashScreen: {fileID: 0} XboxOneAllowedProductIds: [] XboxOnePersistentLocalStorageSize: 0 - intPropertyNames: - - Metro::ScriptingBackend - - Standalone::ScriptingBackend - Metro::ScriptingBackend: 2 - Standalone::ScriptingBackend: 0 - boolPropertyNames: - - Android::VR::enable - - Metro::VR::enable - - N3DS::VR::enable - - PS3::VR::enable - - PS4::VR::enable - - PSM::VR::enable - - PSP2::VR::enable - - SamsungTV::VR::enable - - Standalone::VR::enable - - Tizen::VR::enable - - WebGL::VR::enable - - WebPlayer::VR::enable - - WiiU::VR::enable - - Xbox360::VR::enable - - XboxOne::VR::enable - - iOS::VR::enable - - tvOS::VR::enable - Android::VR::enable: 0 - Metro::VR::enable: 1 - N3DS::VR::enable: 0 - PS3::VR::enable: 0 - PS4::VR::enable: 0 - PSM::VR::enable: 0 - PSP2::VR::enable: 0 - SamsungTV::VR::enable: 0 - Standalone::VR::enable: 0 - Tizen::VR::enable: 0 - WebGL::VR::enable: 0 - WebPlayer::VR::enable: 0 - WiiU::VR::enable: 0 - Xbox360::VR::enable: 0 - XboxOne::VR::enable: 0 - iOS::VR::enable: 0 - tvOS::VR::enable: 0 - stringPropertyNames: - - Analytics_ServiceEnabled::Analytics_ServiceEnabled - - Build_ServiceEnabled::Build_ServiceEnabled - - Collab_ServiceEnabled::Collab_ServiceEnabled - - ErrorHub_ServiceEnabled::ErrorHub_ServiceEnabled - - Game_Performance_ServiceEnabled::Game_Performance_ServiceEnabled - - Hub_ServiceEnabled::Hub_ServiceEnabled - - Purchasing_ServiceEnabled::Purchasing_ServiceEnabled - - UNet_ServiceEnabled::UNet_ServiceEnabled - - Unity_Ads_ServiceEnabled::Unity_Ads_ServiceEnabled - Analytics_ServiceEnabled::Analytics_ServiceEnabled: False - Build_ServiceEnabled::Build_ServiceEnabled: False - Collab_ServiceEnabled::Collab_ServiceEnabled: False - ErrorHub_ServiceEnabled::ErrorHub_ServiceEnabled: False - Game_Performance_ServiceEnabled::Game_Performance_ServiceEnabled: False - Hub_ServiceEnabled::Hub_ServiceEnabled: False - Purchasing_ServiceEnabled::Purchasing_ServiceEnabled: False - UNet_ServiceEnabled::UNet_ServiceEnabled: False - Unity_Ads_ServiceEnabled::Unity_Ads_ServiceEnabled: False - vectorPropertyNames: - - Android::VR::enabledDevices - - Metro::VR::enabledDevices - - N3DS::VR::enabledDevices - - PS3::VR::enabledDevices - - PS4::VR::enabledDevices - - PSM::VR::enabledDevices - - PSP2::VR::enabledDevices - - SamsungTV::VR::enabledDevices - - Standalone::VR::enabledDevices - - Tizen::VR::enabledDevices - - WebGL::VR::enabledDevices - - WebPlayer::VR::enabledDevices - - WiiU::VR::enabledDevices - - Xbox360::VR::enabledDevices - - XboxOne::VR::enabledDevices - - iOS::VR::enabledDevices - - tvOS::VR::enabledDevices - Android::VR::enabledDevices: - - Oculus - Metro::VR::enabledDevices: - - HoloLens - N3DS::VR::enabledDevices: [] - PS3::VR::enabledDevices: [] - PS4::VR::enabledDevices: - - PlayStationVR - PSM::VR::enabledDevices: [] - PSP2::VR::enabledDevices: [] - SamsungTV::VR::enabledDevices: [] - Standalone::VR::enabledDevices: - - Oculus - Tizen::VR::enabledDevices: [] - WebGL::VR::enabledDevices: [] - WebPlayer::VR::enabledDevices: [] - WiiU::VR::enabledDevices: [] - Xbox360::VR::enabledDevices: [] - XboxOne::VR::enabledDevices: [] - iOS::VR::enabledDevices: [] - tvOS::VR::enabledDevices: [] - cloudProjectId: - projectName: - organizationId: + xboxOneScriptCompiler: 0 + vrEditorSettings: + daydream: + daydreamIconForeground: {fileID: 0} + daydreamIconBackground: {fileID: 0} + cloudServicesEnabled: + Analytics: 0 + Build: 0 + Collab: 1 + ErrorHub: 0 + Game_Performance: 0 + Hub: 0 + Purchasing: 0 + UNet: 1 + Unity_Ads: 0 + facebookSdkVersion: 7.9.4 + apiCompatibilityLevel: 2 + cloudProjectId: f8457e3b-2bf2-4ad7-88c3-5208cf4f5f21 + projectName: LowLatencyMrcSample + organizationId: adamtuliper cloudEnabled: 0 + enableNativePlatformBackendsForNewInputSystem: 0 + disableOldInputManagerSupport: 0 diff --git a/MixedRemoteViewCompositor/Samples/LowLatencyMRC/Unity/ProjectSettings/ProjectVersion.txt b/MixedRemoteViewCompositor/Samples/LowLatencyMRC/Unity/ProjectSettings/ProjectVersion.txt index a12138ab..b33736ce 100644 --- a/MixedRemoteViewCompositor/Samples/LowLatencyMRC/Unity/ProjectSettings/ProjectVersion.txt +++ b/MixedRemoteViewCompositor/Samples/LowLatencyMRC/Unity/ProjectSettings/ProjectVersion.txt @@ -1,2 +1 @@ -m_EditorVersion: 5.4.0b24-HTP -m_StandardAssetsVersion: 0 +m_EditorVersion: 2017.2.0p2 diff --git a/MixedRemoteViewCompositor/Samples/LowLatencyMRC/Unity/ProjectSettings/UnityAdsSettings.asset b/MixedRemoteViewCompositor/Samples/LowLatencyMRC/Unity/ProjectSettings/UnityAdsSettings.asset deleted file mode 100644 index 224050ce..00000000 --- a/MixedRemoteViewCompositor/Samples/LowLatencyMRC/Unity/ProjectSettings/UnityAdsSettings.asset +++ /dev/null @@ -1,11 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!292 &1 -UnityAdsSettings: - m_ObjectHideFlags: 0 - m_Enabled: 0 - m_InitializeOnStartup: 1 - m_TestMode: 0 - m_EnabledPlatforms: 4294967295 - m_IosGameId: - m_AndroidGameId: diff --git a/MixedRemoteViewCompositor/Samples/LowLatencyMRC/Unity/ProjectSettings/UnityConnectSettings.asset b/MixedRemoteViewCompositor/Samples/LowLatencyMRC/Unity/ProjectSettings/UnityConnectSettings.asset index cc79974a..3da14d5b 100644 --- a/MixedRemoteViewCompositor/Samples/LowLatencyMRC/Unity/ProjectSettings/UnityConnectSettings.asset +++ b/MixedRemoteViewCompositor/Samples/LowLatencyMRC/Unity/ProjectSettings/UnityConnectSettings.asset @@ -7,9 +7,12 @@ UnityConnectSettings: m_TestMode: 0 m_TestEventUrl: m_TestConfigUrl: + m_TestInitMode: 0 CrashReportingSettings: m_EventUrl: https://perf-events.cloud.unity3d.com/api/events/crashes + m_NativeEventUrl: https://perf-events.cloud.unity3d.com/symbolicate m_Enabled: 0 + m_CaptureEditorExceptions: 1 UnityPurchasingSettings: m_Enabled: 0 m_TestMode: 0 @@ -23,6 +26,9 @@ UnityConnectSettings: m_Enabled: 0 m_InitializeOnStartup: 1 m_TestMode: 0 - m_EnabledPlatforms: 4294967295 m_IosGameId: m_AndroidGameId: + m_GameIds: {} + m_GameId: + PerformanceReportingSettings: + m_Enabled: 0 diff --git a/MixedRemoteViewCompositor/Samples/LowLatencyMRC/Unity/UWP/project.json b/MixedRemoteViewCompositor/Samples/LowLatencyMRC/Unity/UWP/project.json new file mode 100644 index 00000000..c5949392 --- /dev/null +++ b/MixedRemoteViewCompositor/Samples/LowLatencyMRC/Unity/UWP/project.json @@ -0,0 +1,16 @@ +{ + "dependencies": { + "Microsoft.NETCore.UniversalWindowsPlatform": "5.0.0" + }, + "frameworks": { + "uap10.0": {} + }, + "runtimes": { + "win10-arm": {}, + "win10-arm-aot": {}, + "win10-x86": {}, + "win10-x86-aot": {}, + "win10-x64": {}, + "win10-x64-aot": {} + } +} \ No newline at end of file diff --git a/MixedRemoteViewCompositor/Samples/LowLatencyMRC/Unity/UnityPackageManager/manifest.json b/MixedRemoteViewCompositor/Samples/LowLatencyMRC/Unity/UnityPackageManager/manifest.json new file mode 100644 index 00000000..526aca60 --- /dev/null +++ b/MixedRemoteViewCompositor/Samples/LowLatencyMRC/Unity/UnityPackageManager/manifest.json @@ -0,0 +1,4 @@ +{ + "dependencies": { + } +} diff --git a/MixedRemoteViewCompositor/Samples/MRVC/Unity/Assets/AddOns/MixedRemoteViewCompositor/Plugins/WSA/x86/MixedRemoteViewCompositor.dll b/MixedRemoteViewCompositor/Samples/MRVC/Unity/Assets/AddOns/MixedRemoteViewCompositor/Plugins/WSA/x86/MixedRemoteViewCompositor.dll new file mode 100644 index 00000000..aabe436e Binary files /dev/null and b/MixedRemoteViewCompositor/Samples/MRVC/Unity/Assets/AddOns/MixedRemoteViewCompositor/Plugins/WSA/x86/MixedRemoteViewCompositor.dll differ diff --git a/MixedRemoteViewCompositor/Samples/MRVC/Unity/Assets/AddOns/MixedRemoteViewCompositor/Plugins/x64/MixedRemoteViewCompositor.dll b/MixedRemoteViewCompositor/Samples/MRVC/Unity/Assets/AddOns/MixedRemoteViewCompositor/Plugins/x64/MixedRemoteViewCompositor.dll new file mode 100644 index 00000000..1e51d4e9 Binary files /dev/null and b/MixedRemoteViewCompositor/Samples/MRVC/Unity/Assets/AddOns/MixedRemoteViewCompositor/Plugins/x64/MixedRemoteViewCompositor.dll differ diff --git a/MixedRemoteViewCompositor/Samples/MRVC/Unity/Assets/AddOns/MixedRemoteViewCompositor/Plugins/x86/MixedRemoteViewCompositor.dll b/MixedRemoteViewCompositor/Samples/MRVC/Unity/Assets/AddOns/MixedRemoteViewCompositor/Plugins/x86/MixedRemoteViewCompositor.dll new file mode 100644 index 00000000..9aab760f Binary files /dev/null and b/MixedRemoteViewCompositor/Samples/MRVC/Unity/Assets/AddOns/MixedRemoteViewCompositor/Plugins/x86/MixedRemoteViewCompositor.dll differ diff --git a/MixedRemoteViewCompositor/Source/MixedRemoteViewCompositor.sln b/MixedRemoteViewCompositor/Source/MixedRemoteViewCompositor.sln index 74f3b731..e0837212 100644 --- a/MixedRemoteViewCompositor/Source/MixedRemoteViewCompositor.sln +++ b/MixedRemoteViewCompositor/Source/MixedRemoteViewCompositor.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio 15 +VisualStudioVersion = 15.0.27004.2008 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Shared", "Shared\Shared.vcxitems", "{45D41ACC-2C3C-43D2-BC10-02AA73FFC7C7}" EndProject @@ -16,20 +16,31 @@ Global Shared\Shared.vcxitems*{60b0431f-7f25-4a1e-811c-7b7de08a4393}*SharedItemsImports = 4 EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 + Release|x64 = Release|x64 Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {0B2C8EAC-5A4A-40D4-8252-F02D90EBB5D9}.Debug|x64.ActiveCfg = Debug|Win32 {0B2C8EAC-5A4A-40D4-8252-F02D90EBB5D9}.Debug|x86.ActiveCfg = Debug|Win32 {0B2C8EAC-5A4A-40D4-8252-F02D90EBB5D9}.Debug|x86.Build.0 = Debug|Win32 + {0B2C8EAC-5A4A-40D4-8252-F02D90EBB5D9}.Release|x64.ActiveCfg = Release|Win32 + {0B2C8EAC-5A4A-40D4-8252-F02D90EBB5D9}.Release|x64.Build.0 = Release|Win32 {0B2C8EAC-5A4A-40D4-8252-F02D90EBB5D9}.Release|x86.ActiveCfg = Release|Win32 {0B2C8EAC-5A4A-40D4-8252-F02D90EBB5D9}.Release|x86.Build.0 = Release|Win32 + {60B0431F-7F25-4A1E-811C-7B7DE08A4393}.Debug|x64.ActiveCfg = Debug|Win32 {60B0431F-7F25-4A1E-811C-7B7DE08A4393}.Debug|x86.ActiveCfg = Debug|Win32 {60B0431F-7F25-4A1E-811C-7B7DE08A4393}.Debug|x86.Build.0 = Debug|Win32 + {60B0431F-7F25-4A1E-811C-7B7DE08A4393}.Release|x64.ActiveCfg = Release|Win32 + {60B0431F-7F25-4A1E-811C-7B7DE08A4393}.Release|x64.Build.0 = Release|Win32 {60B0431F-7F25-4A1E-811C-7B7DE08A4393}.Release|x86.ActiveCfg = Release|Win32 {60B0431F-7F25-4A1E-811C-7B7DE08A4393}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {E65D254E-028B-4935-B4CE-634EC6EFE4AD} + EndGlobalSection EndGlobal diff --git a/MixedRemoteViewCompositor/Source/WSA/WSA.vcxproj b/MixedRemoteViewCompositor/Source/WSA/WSA.vcxproj index 4816e0bf..36622fa3 100644 --- a/MixedRemoteViewCompositor/Source/WSA/WSA.vcxproj +++ b/MixedRemoteViewCompositor/Source/WSA/WSA.vcxproj @@ -27,13 +27,13 @@ DynamicLibrary true - v140 + v141 DynamicLibrary false true - v140 + v141 diff --git a/MixedRemoteViewCompositor/Source/WSA/~AutoRecover.WSA.vcxproj b/MixedRemoteViewCompositor/Source/WSA/~AutoRecover.WSA.vcxproj new file mode 100644 index 00000000..77a2609b --- /dev/null +++ b/MixedRemoteViewCompositor/Source/WSA/~AutoRecover.WSA.vcxproj @@ -0,0 +1,238 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {0b2c8eac-5a4a-40d4-8252-f02d90ebb5d9} + DynamicLibrary + MixedRemoteViewCompositor + en-US + 14.0 + true + Windows Store + 10.0.10586.0 + 10.0.10240.0 + 10.0 + WSA + + + + DynamicLibrary + true + v141 + + + DynamicLibrary + true + v141 + + + DynamicLibrary + false + true + v141 + + + DynamicLibrary + false + true + v141 + + + + + + + + + + + + + + + + + + + + + + + false + false + $(SolutionDir)..\Build\$(Configuration)\Plugins\WSA\$(PlatformShortName)\ + $(Configuration)\$(PlatformShortName)\ + $(SolutionName) + $(ProjectDir);$(SolutionDir)Shared\;$(SolutionDir)Shared\Common\;$(SolutionDir)Shared\Unity\;$(SolutionDir)Shared\Plugin\;$(SolutionDir)Shared\Network\;$(SolutionDir)Shared\Media\;$(IncludePath) + + + $(SolutionName) + $(ProjectDir);$(SolutionDir)Shared\;$(SolutionDir)Shared\Common\;$(SolutionDir)Shared\Unity\;$(SolutionDir)Shared\Plugin\;$(SolutionDir)Shared\Network\;$(SolutionDir)Shared\Media\;$(IncludePath) + false + false + + + false + false + $(SolutionDir)..\Build\$(Configuration)\Plugins\WSA\$(PlatformShortName)\ + $(Configuration)\$(PlatformShortName)\ + $(SolutionName) + $(ProjectDir);$(SolutionDir)Shared\;$(SolutionDir)Shared\Common\;$(SolutionDir)Shared\Unity\;$(SolutionDir)Shared\Plugin\;$(SolutionDir)Shared\Network\;$(SolutionDir)Shared\Media\;$(IncludePath) + + + $(SolutionName) + $(ProjectDir);$(SolutionDir)Shared\;$(SolutionDir)Shared\Common\;$(SolutionDir)Shared\Unity\;$(SolutionDir)Shared\Plugin\;$(SolutionDir)Shared\Network\;$(SolutionDir)Shared\Media\;$(IncludePath) + false + false + + + + Use + false + $(VCInstallDir_140)vcpackages;$(WindowsSdkDir_10)UnionMetadata;%(AdditionalUsingDirectories) + MIXEDREMOTEVIEWCOMPOSITOR_EXPORTS;%(PreprocessorDefinitions) + + + Console + false + true + $(SolutionDir)Shared\MixedRemoteViewCompositor.def + + + %(Filename).h + $(WinRT_IncludePath);%(AdditionalIncludeDirectories) + + + mkdir "$(SolutionDir)..\Samples\LowLatencyMRC\Unity\Assets\AddOns\$(SolutionName)\Plugins\WSA\$(PlatformShortName)" +copy /Y "$(TargetPath)" "$(SolutionDir)..\Samples\LowLatencyMRC\Unity\Assets\AddOns\$(SolutionName)\Plugins\WSA\$(PlatformShortName)" +REM copy /Y "$(TargetDir)$(TargetName).pdb" "$(SolutionDir)..\Unity\$(SolutionName)\Assets\AddOns\$(SolutionName)\Plugins\WSA\$(PlatformShortName)" +mkdir "$(SolutionDir)..\Samples\MRVC\Unity\Assets\AddOns\$(SolutionName)\Plugins\WSA\$(PlatformShortName)" +copy /Y "$(TargetPath)" "$(SolutionDir)..\Samples\MRVC\Unity\Assets\AddOns\$(SolutionName)\Plugins\WSA\$(PlatformShortName)" +REM copy /Y "$(TargetDir)$(TargetName).pdb" "$(SolutionDir)..\Samples\MRVC\Unity\Assets\AddOns\$(SolutionName)\Plugins\WSA\$(PlatformShortName)" + + + + + + Use + false + $(VCInstallDir_140)vcpackages;$(WindowsSdkDir_10)UnionMetadata;%(AdditionalUsingDirectories) + MIXEDREMOTEVIEWCOMPOSITOR_EXPORTS;%(PreprocessorDefinitions) + + + Console + false + true + $(SolutionDir)Shared\MixedRemoteViewCompositor.def + + + %(Filename).h + $(WinRT_IncludePath);%(AdditionalIncludeDirectories) + + + mkdir "$(SolutionDir)..\Samples\LowLatencyMRC\Unity\Assets\AddOns\$(SolutionName)\Plugins\WSA\$(PlatformShortName)" +copy /Y "$(TargetPath)" "$(SolutionDir)..\Samples\LowLatencyMRC\Unity\Assets\AddOns\$(SolutionName)\Plugins\WSA\$(PlatformShortName)" +REM copy /Y "$(TargetDir)$(TargetName).pdb" "$(SolutionDir)..\Unity\$(SolutionName)\Assets\AddOns\$(SolutionName)\Plugins\WSA\$(PlatformShortName)" +mkdir "$(SolutionDir)..\Samples\MRVC\Unity\Assets\AddOns\$(SolutionName)\Plugins\WSA\$(PlatformShortName)" +copy /Y "$(TargetPath)" "$(SolutionDir)..\Samples\MRVC\Unity\Assets\AddOns\$(SolutionName)\Plugins\WSA\$(PlatformShortName)" +REM copy /Y "$(TargetDir)$(TargetName).pdb" "$(SolutionDir)..\Samples\MRVC\Unity\Assets\AddOns\$(SolutionName)\Plugins\WSA\$(PlatformShortName)" + + + + + + Use + false + $(VCInstallDir_140)vcpackages;$(WindowsSdkDir_10)UnionMetadata;%(AdditionalUsingDirectories) + MIXEDREMOTEVIEWCOMPOSITOR_EXPORTS;%(PreprocessorDefinitions) + + + Console + false + true + $(SolutionDir)Shared\MixedRemoteViewCompositor.def + + + %(Filename).h + $(WinRT_IncludePath);%(AdditionalIncludeDirectories) + + + mkdir "$(SolutionDir)..\Samples\LowLatencyMRC\Unity\Assets\AddOns\$(SolutionName)\Plugins\WSA\$(PlatformShortName)" +copy /Y "$(TargetPath)" "$(SolutionDir)..\Samples\LowLatencyMRC\Unity\Assets\AddOns\$(SolutionName)\Plugins\WSA\$(PlatformShortName)" +REM copy /Y "$(TargetDir)$(TargetName).pdb" "$(SolutionDir)..\Unity\$(SolutionName)\Assets\AddOns\$(SolutionName)\Plugins\WSA\$(PlatformShortName)" +mkdir "$(SolutionDir)..\Samples\MRVC\Unity\Assets\AddOns\$(SolutionName)\Plugins\WSA\$(PlatformShortName)" +copy /Y "$(TargetPath)" "$(SolutionDir)..\Samples\MRVC\Unity\Assets\AddOns\$(SolutionName)\Plugins\WSA\$(PlatformShortName)" +REM copy /Y "$(TargetDir)$(TargetName).pdb" "$(SolutionDir)..\Samples\MRVC\Unity\Assets\AddOns\$(SolutionName)\Plugins\WSA\$(PlatformShortName)" + + + + + + Use + false + $(VCInstallDir_140)vcpackages;$(WindowsSdkDir_10)UnionMetadata;%(AdditionalUsingDirectories) + MIXEDREMOTEVIEWCOMPOSITOR_EXPORTS;%(PreprocessorDefinitions) + + + Console + false + true + $(SolutionDir)Shared\MixedRemoteViewCompositor.def + + + %(Filename).h + $(WinRT_IncludePath);%(AdditionalIncludeDirectories) + + + mkdir "$(SolutionDir)..\Samples\LowLatencyMRC\Unity\Assets\AddOns\$(SolutionName)\Plugins\WSA\$(PlatformShortName)" +copy /Y "$(TargetPath)" "$(SolutionDir)..\Samples\LowLatencyMRC\Unity\Assets\AddOns\$(SolutionName)\Plugins\WSA\$(PlatformShortName)" +REM copy /Y "$(TargetDir)$(TargetName).pdb" "$(SolutionDir)..\Unity\$(SolutionName)\Assets\AddOns\$(SolutionName)\Plugins\WSA\$(PlatformShortName)" +mkdir "$(SolutionDir)..\Samples\MRVC\Unity\Assets\AddOns\$(SolutionName)\Plugins\WSA\$(PlatformShortName)" +copy /Y "$(TargetPath)" "$(SolutionDir)..\Samples\MRVC\Unity\Assets\AddOns\$(SolutionName)\Plugins\WSA\$(PlatformShortName)" +REM copy /Y "$(TargetDir)$(TargetName).pdb" "$(SolutionDir)..\Samples\MRVC\Unity\Assets\AddOns\$(SolutionName)\Plugins\WSA\$(PlatformShortName)" + + + + + + Use + false + + + Console + false + false + + + + + Use + false + + + Console + false + false + + + + + + \ No newline at end of file diff --git a/MixedRemoteViewCompositor/Source/Win32/Win32.vcxproj b/MixedRemoteViewCompositor/Source/Win32/Win32.vcxproj index 5926eab4..0e75d2c1 100644 --- a/MixedRemoteViewCompositor/Source/Win32/Win32.vcxproj +++ b/MixedRemoteViewCompositor/Source/Win32/Win32.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -20,13 +20,13 @@ DynamicLibrary true - v140 + v141 Unicode DynamicLibrary false - v140 + v141 true Unicode