diff --git a/Assets/AssetStoreTools/Editor/AssetStoreTools.dll b/Assets/AssetStoreTools/Editor/AssetStoreTools.dll index d4facd6c..eac2c2ea 100644 Binary files a/Assets/AssetStoreTools/Editor/AssetStoreTools.dll and b/Assets/AssetStoreTools/Editor/AssetStoreTools.dll differ diff --git a/Assets/AssetStoreTools/Editor/AssetStoreToolsExtra.dll b/Assets/AssetStoreTools/Editor/AssetStoreToolsExtra.dll index d1951bea..1baa66b8 100644 Binary files a/Assets/AssetStoreTools/Editor/AssetStoreToolsExtra.dll and b/Assets/AssetStoreTools/Editor/AssetStoreToolsExtra.dll differ diff --git a/Assets/LeapMotion/DemoResources/Scripts/RecordingControls.cs b/Assets/LeapMotion/DemoResources/Scripts/RecordingControls.cs index e7aa515a..e562661f 100644 --- a/Assets/LeapMotion/DemoResources/Scripts/RecordingControls.cs +++ b/Assets/LeapMotion/DemoResources/Scripts/RecordingControls.cs @@ -1,11 +1,11 @@ using UnityEngine; -using System.Collections; +using UnityEngine.UI; public class RecordingControls : MonoBehaviour { [Multiline] public string header; - public GUIText controlsGui; - public GUIText recordingGui; + public Text controlsGui; + public Text recordingGui; public KeyCode beginRecordingKey = KeyCode.R; public KeyCode endRecordingKey = KeyCode.R; diff --git a/Assets/LeapMotion/Materials/Sources/Shaders/Toony-Basic.shader b/Assets/LeapMotion/Materials/Sources/Shaders/Toony-Basic.shader index 557be9b1..5a95dd9c 100644 --- a/Assets/LeapMotion/Materials/Sources/Shaders/Toony-Basic.shader +++ b/Assets/LeapMotion/Materials/Sources/Shaders/Toony-Basic.shader @@ -1,3 +1,5 @@ +// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)' + Shader "Toon/Basic" { Properties { _Color ("Main Color", Color) = (.5,.5,.5,1) @@ -39,7 +41,7 @@ Shader "Toon/Basic" { v2f vert (appdata v) { v2f o; - o.pos = mul (UNITY_MATRIX_MVP, v.vertex); + o.pos = UnityObjectToClipPos (v.vertex); o.texcoord = TRANSFORM_TEX(v.texcoord, _MainTex); o.cubenormal = mul (UNITY_MATRIX_MV, float4(v.normal,0)); return o; diff --git a/Assets/LeapMotion/Materials/Sources/Shaders/Toony-BasicOutline.shader b/Assets/LeapMotion/Materials/Sources/Shaders/Toony-BasicOutline.shader index 5e3be418..12f31f3d 100644 --- a/Assets/LeapMotion/Materials/Sources/Shaders/Toony-BasicOutline.shader +++ b/Assets/LeapMotion/Materials/Sources/Shaders/Toony-BasicOutline.shader @@ -1,3 +1,5 @@ +// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)' + Shader "Toon/Basic Outline" { Properties { _Color ("Main Color", Color) = (.5,.5,.5,1) @@ -25,7 +27,7 @@ Shader "Toon/Basic Outline" { v2f vert(appdata v) { v2f o; - o.pos = mul(UNITY_MATRIX_MVP, v.vertex); + o.pos = UnityObjectToClipPos(v.vertex); float3 norm = mul ((float3x3)UNITY_MATRIX_IT_MV, v.normal); float2 offset = TransformViewToProjection(norm.xy); diff --git a/Assets/LeapMotion/Prefabs/PluginLeapNotice.prefab b/Assets/LeapMotion/Prefabs/PluginLeapNotice.prefab index 1e3c274c..553cd585 100644 Binary files a/Assets/LeapMotion/Prefabs/PluginLeapNotice.prefab and b/Assets/LeapMotion/Prefabs/PluginLeapNotice.prefab differ diff --git a/Assets/LeapMotion/Resources/ImageHandHighlight.shader b/Assets/LeapMotion/Resources/ImageHandHighlight.shader index 0d7aed0a..def0849b 100644 --- a/Assets/LeapMotion/Resources/ImageHandHighlight.shader +++ b/Assets/LeapMotion/Resources/ImageHandHighlight.shader @@ -1,3 +1,5 @@ +// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)' + Shader "LeapMotion/Passthrough/ImageHandHighlight" { Properties { _Color ("Color", Color) = (0.165,0.337,0.578,1.0) @@ -50,7 +52,7 @@ Shader "LeapMotion/Passthrough/ImageHandHighlight" { frag_in vert(appdata v) { frag_in o; - o.vertex = mul(UNITY_MATRIX_MVP, v.vertex); + o.vertex = UnityObjectToClipPos(v.vertex); float3 norm = mul ((float3x3)UNITY_MATRIX_IT_MV, v.normal); o.vertex.xy += TransformViewToProjection(norm.xy) * _Extrude; diff --git a/Assets/LeapMotion/Resources/PassthroughBackground.shader b/Assets/LeapMotion/Resources/PassthroughBackground.shader index d0332300..cc8203ff 100644 --- a/Assets/LeapMotion/Resources/PassthroughBackground.shader +++ b/Assets/LeapMotion/Resources/PassthroughBackground.shader @@ -1,4 +1,6 @@ -Shader "LeapMotion/Passthrough/Background" { +// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)' + +Shader "LeapMotion/Passthrough/Background" { SubShader { Tags {"Queue"="Background" "IgnoreProjector"="True"} @@ -26,7 +28,7 @@ frag_in vert(appdata_img v){ frag_in o; - o.position = mul(UNITY_MATRIX_MVP, v.vertex); + o.position = UnityObjectToClipPos(v.vertex); o.screenPos = LeapGetWarpedScreenPos(o.position); return o; } diff --git a/Assets/LeapMotion/Resources/PassthroughForeground.shader b/Assets/LeapMotion/Resources/PassthroughForeground.shader index 15801d6b..d80e438f 100644 --- a/Assets/LeapMotion/Resources/PassthroughForeground.shader +++ b/Assets/LeapMotion/Resources/PassthroughForeground.shader @@ -1,4 +1,6 @@ -Shader "LeapMotion/Passthrough/Foreground" { +// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)' + +Shader "LeapMotion/Passthrough/Foreground" { Properties { } @@ -29,7 +31,7 @@ frag_in vert(appdata_img v){ frag_in o; - o.position = mul(UNITY_MATRIX_MVP, v.vertex); + o.position = UnityObjectToClipPos(v.vertex); o.screenPos = LeapGetWarpedScreenPos(o.position); return o; } diff --git a/Assets/LeapMotion/Resources/ThresholdOverlay.shader b/Assets/LeapMotion/Resources/ThresholdOverlay.shader index 779e854d..58213ead 100644 --- a/Assets/LeapMotion/Resources/ThresholdOverlay.shader +++ b/Assets/LeapMotion/Resources/ThresholdOverlay.shader @@ -1,4 +1,6 @@ -Shader "LeapMotion/Passthrough/ThresholdOverlay" { +// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)' + +Shader "LeapMotion/Passthrough/ThresholdOverlay" { Properties { _Min ("Min Brightness", Range(0, 1)) = 0.1 _Max ("Max Brightness", Range(0, 1)) = 0.3 @@ -34,7 +36,7 @@ frag_in vert(appdata_img v){ frag_in o; - o.position = mul(UNITY_MATRIX_MVP, v.vertex); + o.position = UnityObjectToClipPos(v.vertex); o.screenPos = LeapGetWarpedScreenPos(o.position); return o; } diff --git a/Assets/LeapMotion/Scenes/AllHandModels.unity b/Assets/LeapMotion/Scenes/AllHandModels.unity index 670d8cd0..1d0f74e2 100644 Binary files a/Assets/LeapMotion/Scenes/AllHandModels.unity and b/Assets/LeapMotion/Scenes/AllHandModels.unity differ diff --git a/Assets/LeapMotion/Scenes/CubeWave.unity b/Assets/LeapMotion/Scenes/CubeWave.unity index b105b06d..69e43f36 100644 Binary files a/Assets/LeapMotion/Scenes/CubeWave.unity and b/Assets/LeapMotion/Scenes/CubeWave.unity differ diff --git a/Assets/LeapMotion/Scenes/Kaleidoscope.unity b/Assets/LeapMotion/Scenes/Kaleidoscope.unity index 4b4b3cf8..0f6f4cd7 100644 Binary files a/Assets/LeapMotion/Scenes/Kaleidoscope.unity and b/Assets/LeapMotion/Scenes/Kaleidoscope.unity differ diff --git a/Assets/LeapMotion/Scenes/RecordAndPlayback.unity b/Assets/LeapMotion/Scenes/RecordAndPlayback.unity index 84801705..e88ddacb 100644 Binary files a/Assets/LeapMotion/Scenes/RecordAndPlayback.unity and b/Assets/LeapMotion/Scenes/RecordAndPlayback.unity differ diff --git a/Assets/LeapMotion/Scenes/TooDarkToSee.unity b/Assets/LeapMotion/Scenes/TooDarkToSee.unity index e95b7494..dd2ab15f 100644 Binary files a/Assets/LeapMotion/Scenes/TooDarkToSee.unity and b/Assets/LeapMotion/Scenes/TooDarkToSee.unity differ diff --git a/Assets/LeapMotion/Scripts/Utils/DisconnectionNotice.cs b/Assets/LeapMotion/Scripts/Utils/DisconnectionNotice.cs index 51e09150..4d0947fb 100644 --- a/Assets/LeapMotion/Scripts/Utils/DisconnectionNotice.cs +++ b/Assets/LeapMotion/Scripts/Utils/DisconnectionNotice.cs @@ -5,12 +5,11 @@ \******************************************************************************/ using UnityEngine; -using System.Collections; using Leap; /** * Tracks the connection state of the Leap Motion hardware. If the device is unplugged - * or otherwise not detected, the script fades in a GUITexture object which should communicate + * or otherwise not detected, the script fades in an Image which should communicate * the problem to the user. */ public class DisconnectionNotice : MonoBehaviour { @@ -23,8 +22,13 @@ public class DisconnectionNotice : MonoBehaviour { public AnimationCurve fade; /** A delay before beginning the fade-in effect. */ public int waitFrames = 10; + + /** An alternative image to use when the hardware is embedded in a keyboard or laptop. */ + public UnityEngine.UI.Image mainImage; + /** An alternative image to use when the hardware is embedded in a keyboard or laptop. */ - public Texture2D embeddedReplacementImage; + public Sprite embeddedReplacementImage; + /** The fully on texture tint color. */ public Color onColor = Color.white; @@ -38,7 +42,7 @@ void Start() { } void SetAlpha(float alpha) { - GetComponent().color = Color.Lerp(Color.clear, onColor, alpha); + mainImage.color = Color.Lerp(Color.clear, onColor, alpha); } /** The connection state of the controller. */ @@ -56,7 +60,7 @@ bool IsEmbedded() { void Update() { if (embeddedReplacementImage != null && IsEmbedded()) { - GetComponent().texture = embeddedReplacementImage; + mainImage.sprite = embeddedReplacementImage; } if (IsConnected()) diff --git a/Assets/LeapMotion/Scripts/Utils/FitHeightToScreen.cs b/Assets/LeapMotion/Scripts/Utils/FitHeightToScreen.cs index a9ab66f3..a3627972 100644 --- a/Assets/LeapMotion/Scripts/Utils/FitHeightToScreen.cs +++ b/Assets/LeapMotion/Scripts/Utils/FitHeightToScreen.cs @@ -5,15 +5,14 @@ \******************************************************************************/ using UnityEngine; -using System.Collections; public class FitHeightToScreen : MonoBehaviour { void Awake() { - float width_height_ratio = GetComponent().texture.width / GetComponent().texture.height; + float width_height_ratio = GetComponent().rect.width / GetComponent().rect.width; float width = width_height_ratio * Screen.height; float x_offset = (Screen.width - width) / 2.0f; - GetComponent().pixelInset = new Rect(x_offset, 0.0f, width, Screen.height); + GetComponent().SetClipRect(new Rect(x_offset, 0.0f, width, Screen.height), true); } } diff --git a/Assets/LeapMotion/Scripts/Utils/StretchToScreen.cs b/Assets/LeapMotion/Scripts/Utils/StretchToScreen.cs index 9595e5ed..e1aea812 100644 --- a/Assets/LeapMotion/Scripts/Utils/StretchToScreen.cs +++ b/Assets/LeapMotion/Scripts/Utils/StretchToScreen.cs @@ -5,12 +5,10 @@ \******************************************************************************/ using UnityEngine; -using System.Collections; public class StretchToScreen : MonoBehaviour { void Awake() { - GetComponent().pixelInset = new Rect(0.0f, 0.0f, Screen.width, Screen.height); + GetComponent().SetClipRect(new Rect(0.0f, 0.0f, Screen.width, Screen.height), true); } -} - +} \ No newline at end of file diff --git a/Assets/LeapMotion/Textures/EnableEmbeddedLeapNotice.png.meta b/Assets/LeapMotion/Textures/EnableEmbeddedLeapNotice.png.meta index b05ba4f7..75b1f91a 100644 --- a/Assets/LeapMotion/Textures/EnableEmbeddedLeapNotice.png.meta +++ b/Assets/LeapMotion/Textures/EnableEmbeddedLeapNotice.png.meta @@ -1,47 +1,116 @@ fileFormatVersion: 2 guid: ebc61a8ce70eb495494d1209ae9dbf43 TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 2 + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 + sRGBTexture: 1 linearTexture: 0 - correctGamma: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 - heightScale: .25 + heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 grayScaleToAlpha: 0 - generateCubemap: 0 + generateCubemap: 6 + cubemapConvolution: 0 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 1024 textureSettings: + serializedVersion: 2 filterMode: -1 aniso: -1 - mipBias: -1 - wrapMode: -1 - nPOTScale: 1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 0 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - alphaIsTransparency: 0 - textureType: -1 - buildTargetSettings: [] + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 1 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: + serializedVersion: 2 sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/LeapMotion/Textures/PluginLeapNotice.png.meta b/Assets/LeapMotion/Textures/PluginLeapNotice.png.meta index a3719e7e..d9f4fd74 100644 --- a/Assets/LeapMotion/Textures/PluginLeapNotice.png.meta +++ b/Assets/LeapMotion/Textures/PluginLeapNotice.png.meta @@ -1,47 +1,116 @@ fileFormatVersion: 2 guid: d9f2440b0c0a7447b8409e9ff6041121 TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 2 + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 + sRGBTexture: 1 linearTexture: 0 - correctGamma: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 - heightScale: .25 + heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 grayScaleToAlpha: 0 - generateCubemap: 0 + generateCubemap: 6 + cubemapConvolution: 0 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: + serializedVersion: 2 filterMode: -1 aniso: -1 - mipBias: -1 - wrapMode: -1 - nPOTScale: 1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 0 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - alphaIsTransparency: 0 - textureType: -1 - buildTargetSettings: [] + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 1 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: + serializedVersion: 2 sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/LeapMotion/Widgets/Shaders/SelfIllumAlpha.shader b/Assets/LeapMotion/Widgets/Shaders/SelfIllumAlpha.shader index d6ea82ce..f5d50fe4 100644 --- a/Assets/LeapMotion/Widgets/Shaders/SelfIllumAlpha.shader +++ b/Assets/LeapMotion/Widgets/Shaders/SelfIllumAlpha.shader @@ -1,4 +1,6 @@ -Shader "SelfIllumAlpha" { +// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)' + +Shader "SelfIllumAlpha" { Properties { _Color ("Main Color", Color) = (1,1,1,1) _MainTex ("Texture", 2D) = "white" { } @@ -31,7 +33,7 @@ SubShader { v2f vert (appdata_base v) { v2f o; - o.pos = mul (UNITY_MATRIX_MVP, v.vertex); + o.pos = UnityObjectToClipPos (v.vertex); o.uv = TRANSFORM_TEX (v.texcoord, _MainTex); return o; } diff --git a/Assets/LeapMotion/Widgets/Textures/DatePickerBorderSprite.png.meta b/Assets/LeapMotion/Widgets/Textures/DatePickerBorderSprite.png.meta index dbccc6f4..e3124194 100644 --- a/Assets/LeapMotion/Widgets/Textures/DatePickerBorderSprite.png.meta +++ b/Assets/LeapMotion/Widgets/Textures/DatePickerBorderSprite.png.meta @@ -1,33 +1,42 @@ fileFormatVersion: 2 guid: 98a9ddf13b05841cc967678d0dcaad7f TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 2 + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 1 + sRGBTexture: 1 linearTexture: 0 - correctGamma: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 - heightScale: .25 + heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 grayScaleToAlpha: 0 - generateCubemap: 0 + generateCubemap: 6 + cubemapConvolution: 0 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 1024 textureSettings: + serializedVersion: 2 filterMode: -1 aniso: 16 - mipBias: -1 - wrapMode: 1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -35,13 +44,49 @@ TextureImporter: spriteExtrude: 1 spriteMeshType: 1 alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 120, y: 120, z: 120, w: 120} + spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 + spriteBorder: {x: 120, y: 120, z: 120, w: 120} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 alphaIsTransparency: 1 + spriteTessellationDetail: -1 textureType: 8 - buildTargetSettings: [] + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 1 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: + serializedVersion: 2 sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/LeapMotion/Widgets/Textures/WidgetButtonBorder.png.meta b/Assets/LeapMotion/Widgets/Textures/WidgetButtonBorder.png.meta index 1df82b90..4ef821b1 100644 --- a/Assets/LeapMotion/Widgets/Textures/WidgetButtonBorder.png.meta +++ b/Assets/LeapMotion/Widgets/Textures/WidgetButtonBorder.png.meta @@ -1,33 +1,42 @@ fileFormatVersion: 2 guid: 6b0b076b24e324bcea48d435c8a502d2 TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 2 + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 0 + sRGBTexture: 1 linearTexture: 0 - correctGamma: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 - heightScale: .25 + heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 grayScaleToAlpha: 0 - generateCubemap: 0 + generateCubemap: 6 + cubemapConvolution: 0 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 1024 textureSettings: + serializedVersion: 2 filterMode: -1 aniso: -1 - mipBias: -1 - wrapMode: 1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -35,13 +44,49 @@ TextureImporter: spriteExtrude: 1 spriteMeshType: 1 alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 110, y: 110, z: 110, w: 110} + spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 + spriteBorder: {x: 110, y: 110, z: 110, w: 110} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 alphaIsTransparency: 1 + spriteTessellationDetail: -1 textureType: 8 - buildTargetSettings: [] + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 1 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: + serializedVersion: 2 sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/LeapMotionVR/Scripts/LeapVRTemporalWarping.cs b/Assets/LeapMotionVR/Scripts/LeapVRTemporalWarping.cs index 4c4061b1..af3f662b 100644 --- a/Assets/LeapMotionVR/Scripts/LeapVRTemporalWarping.cs +++ b/Assets/LeapMotionVR/Scripts/LeapVRTemporalWarping.cs @@ -196,7 +196,7 @@ protected void Start() { protected void Update() { if (Input.GetKeyDown(recenter)) { - InputTracking.Recenter(); + UnityEngine.XR.InputTracking.Recenter(); } // Manual Time Alignment @@ -231,8 +231,8 @@ private void updateHistory() { long leapNow = HandController.Main.GetLeapController().Now(); _history.Add(new TransformData() { leapTime = leapNow, - localPosition = InputTracking.GetLocalPosition(VRNode.CenterEye), - localRotation = InputTracking.GetLocalRotation(VRNode.CenterEye) + localPosition = UnityEngine.XR.InputTracking.GetLocalPosition(UnityEngine.XR.XRNode.CenterEye), + localRotation = UnityEngine.XR.InputTracking.GetLocalRotation(UnityEngine.XR.XRNode.CenterEye) }); // Reduce history length @@ -247,8 +247,8 @@ private void updateTemporalWarping() { return; } - Vector3 currCenterPos = _trackingAnchor.TransformPoint(InputTracking.GetLocalPosition(VRNode.CenterEye)); - Quaternion currCenterRot = _trackingAnchor.rotation * InputTracking.GetLocalRotation(VRNode.CenterEye); + Vector3 currCenterPos = _trackingAnchor.TransformPoint(UnityEngine.XR.InputTracking.GetLocalPosition(UnityEngine.XR.XRNode.CenterEye)); + Quaternion currCenterRot = _trackingAnchor.rotation * UnityEngine.XR.InputTracking.GetLocalRotation(UnityEngine.XR.XRNode.CenterEye); //Get the transform at the time when the latest image was captured long rewindTime = HandController.Main.GetFrame().Timestamp; diff --git a/Assets/OVR/Moonlight/Editor/OVRMoonlightLoader.cs b/Assets/OVR/Moonlight/Editor/OVRMoonlightLoader.cs index dfb97cff..b679c38e 100644 --- a/Assets/OVR/Moonlight/Editor/OVRMoonlightLoader.cs +++ b/Assets/OVR/Moonlight/Editor/OVRMoonlightLoader.cs @@ -82,11 +82,11 @@ private static void EnforceBundleId() if (!PlayerSettings.virtualRealitySupported) return; - if (PlayerSettings.bundleIdentifier == "" || PlayerSettings.bundleIdentifier == "com.Company.ProductName") + if (PlayerSettings.applicationIdentifier == "" || PlayerSettings.applicationIdentifier == "com.Company.ProductName") { string defaultBundleId = "com.oculus.UnitySample"; - Debug.LogWarning("\"" + PlayerSettings.bundleIdentifier + "\" is not a valid bundle identifier. Defaulting to \"" + defaultBundleId + "\"."); - PlayerSettings.bundleIdentifier = defaultBundleId; + Debug.LogWarning("\"" + PlayerSettings.applicationIdentifier + "\" is not a valid bundle identifier. Defaulting to \"" + defaultBundleId + "\"."); + PlayerSettings.applicationIdentifier = defaultBundleId; } } } diff --git a/Assets/OVR/Moonlight/Scripts/OVRDebugHeadController.cs b/Assets/OVR/Moonlight/Scripts/OVRDebugHeadController.cs index f4b5ccc2..c3b79f7a 100644 --- a/Assets/OVR/Moonlight/Scripts/OVRDebugHeadController.cs +++ b/Assets/OVR/Moonlight/Scripts/OVRDebugHeadController.cs @@ -91,7 +91,7 @@ void Update () transform.position += fwdMove + strafeMove; } - if ( !VR.VRDevice.isPresent && ( AllowYawLook || AllowPitchLook ) ) + if ( !UnityEngine.XR.XRDevice.isPresent && ( AllowYawLook || AllowPitchLook ) ) { Quaternion r = transform.rotation; if ( AllowYawLook ) diff --git a/Assets/OVR/Moonlight/Scripts/OVROverlay.cs b/Assets/OVR/Moonlight/Scripts/OVROverlay.cs index 5f03da5e..d036b956 100644 --- a/Assets/OVR/Moonlight/Scripts/OVROverlay.cs +++ b/Assets/OVR/Moonlight/Scripts/OVROverlay.cs @@ -105,8 +105,8 @@ void OnRenderObject () Transform camPose = Camera.current.transform; Matrix4x4 modelToCamera = camPose.worldToLocalMatrix * transform.localToWorldMatrix; - Vector3 headPos = VR.InputTracking.GetLocalPosition(VR.VRNode.Head); - Quaternion headOrt = VR.InputTracking.GetLocalRotation(VR.VRNode.Head); + Vector3 headPos = UnityEngine.XR.InputTracking.GetLocalPosition(UnityEngine.XR.XRNode.Head); + Quaternion headOrt = UnityEngine.XR.InputTracking.GetLocalRotation(UnityEngine.XR.XRNode.Head); Matrix4x4 cameraToStart = Matrix4x4.TRS(headPos, headOrt, Vector3.one); Matrix4x4 modelToStart = cameraToStart * modelToCamera; diff --git a/Assets/OVR/Moonlight/Scripts/OVRPlatformMenu.cs b/Assets/OVR/Moonlight/Scripts/OVRPlatformMenu.cs index 5f9e2bc3..ef5d24f0 100644 --- a/Assets/OVR/Moonlight/Scripts/OVRPlatformMenu.cs +++ b/Assets/OVR/Moonlight/Scripts/OVRPlatformMenu.cs @@ -170,7 +170,7 @@ eBackButtonAction HandleBackButtonState() /// void Awake() { - if (!VR.VRDevice.isPresent) + if (!UnityEngine.XR.XRDevice.isPresent) { enabled = false; return; diff --git a/Assets/OVR/Moonlight/Scripts/Utils/OVRDebugGraph.cs b/Assets/OVR/Moonlight/Scripts/Utils/OVRDebugGraph.cs index bf770d2a..d1655b99 100644 --- a/Assets/OVR/Moonlight/Scripts/Utils/OVRDebugGraph.cs +++ b/Assets/OVR/Moonlight/Scripts/Utils/OVRDebugGraph.cs @@ -50,7 +50,7 @@ public enum DebugPerfMode /// void Start() { - if (!VR.VRDevice.isPresent) + if (!UnityEngine.XR.XRDevice.isPresent) { enabled = false; return; diff --git a/Assets/OVR/Moonlight/Scripts/Utils/OVRModeParms.cs b/Assets/OVR/Moonlight/Scripts/Utils/OVRModeParms.cs index 63f6848b..836f4134 100644 --- a/Assets/OVR/Moonlight/Scripts/Utils/OVRModeParms.cs +++ b/Assets/OVR/Moonlight/Scripts/Utils/OVRModeParms.cs @@ -41,7 +41,7 @@ public class OVRModeParms : MonoBehaviour /// void Start() { - if (!VR.VRDevice.isPresent) + if (!UnityEngine.XR.XRDevice.isPresent) { enabled = false; return; diff --git a/Assets/OVR/Moonlight/Shaders/OVRColorRampAlpha.shader b/Assets/OVR/Moonlight/Shaders/OVRColorRampAlpha.shader index e1a69515..9eb645f8 100644 --- a/Assets/OVR/Moonlight/Shaders/OVRColorRampAlpha.shader +++ b/Assets/OVR/Moonlight/Shaders/OVRColorRampAlpha.shader @@ -1,3 +1,5 @@ +// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)' + Shader "OVRColorRampAlpa" { Properties { _Color ("Main Color", Color ) = (1,1,1,1) @@ -43,7 +45,7 @@ Category { v2f vert(appdata_t v) { v2f o; - o.vertex = mul(UNITY_MATRIX_MVP, v.vertex); + o.vertex = UnityObjectToClipPos(v.vertex); o.color = v.color; o.texcoord = TRANSFORM_TEX(v.texcoord,_MainTex); return o; diff --git a/Assets/OVR/Moonlight/Shaders/Unlit Crosshair.shader b/Assets/OVR/Moonlight/Shaders/Unlit Crosshair.shader index 31286d18..b4ffb402 100644 --- a/Assets/OVR/Moonlight/Shaders/Unlit Crosshair.shader +++ b/Assets/OVR/Moonlight/Shaders/Unlit Crosshair.shader @@ -1,3 +1,5 @@ +// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)' + // Unlit alpha-blended shader. // - no lighting // - no lightmap support @@ -59,7 +61,7 @@ Shader "Unlit/Crosshair" { v2f vert (appdata_t v) { v2f o; - o.vertex = mul(UNITY_MATRIX_MVP, v.vertex); + o.vertex = UnityObjectToClipPos(v.vertex); o.texcoord = TRANSFORM_TEX(v.texcoord, _MainTex); o.color = v.color; return o; diff --git a/Assets/OVR/Scripts/OVRCameraRig.cs b/Assets/OVR/Scripts/OVRCameraRig.cs index f2eae7a9..64b24256 100644 --- a/Assets/OVR/Scripts/OVRCameraRig.cs +++ b/Assets/OVR/Scripts/OVRCameraRig.cs @@ -126,14 +126,14 @@ private void UpdateAnchors() OVRPose tracker = OVRManager.tracker.GetPose(0d); trackerAnchor.localRotation = tracker.orientation; - centerEyeAnchor.localRotation = VR.InputTracking.GetLocalRotation(VR.VRNode.CenterEye); - leftEyeAnchor.localRotation = monoscopic ? centerEyeAnchor.localRotation : VR.InputTracking.GetLocalRotation(VR.VRNode.LeftEye); - rightEyeAnchor.localRotation = monoscopic ? centerEyeAnchor.localRotation : VR.InputTracking.GetLocalRotation(VR.VRNode.RightEye); + centerEyeAnchor.localRotation = UnityEngine.XR.InputTracking.GetLocalRotation(UnityEngine.XR.XRNode.CenterEye); + leftEyeAnchor.localRotation = monoscopic ? centerEyeAnchor.localRotation : UnityEngine.XR.InputTracking.GetLocalRotation(UnityEngine.XR.XRNode.LeftEye); + rightEyeAnchor.localRotation = monoscopic ? centerEyeAnchor.localRotation : UnityEngine.XR.InputTracking.GetLocalRotation(UnityEngine.XR.XRNode.RightEye); trackerAnchor.localPosition = tracker.position; - centerEyeAnchor.localPosition = VR.InputTracking.GetLocalPosition(VR.VRNode.CenterEye); - leftEyeAnchor.localPosition = monoscopic ? centerEyeAnchor.localPosition : VR.InputTracking.GetLocalPosition(VR.VRNode.LeftEye); - rightEyeAnchor.localPosition = monoscopic ? centerEyeAnchor.localPosition : VR.InputTracking.GetLocalPosition(VR.VRNode.RightEye); + centerEyeAnchor.localPosition = UnityEngine.XR.InputTracking.GetLocalPosition(UnityEngine.XR.XRNode.CenterEye); + leftEyeAnchor.localPosition = monoscopic ? centerEyeAnchor.localPosition : UnityEngine.XR.InputTracking.GetLocalPosition(UnityEngine.XR.XRNode.LeftEye); + rightEyeAnchor.localPosition = monoscopic ? centerEyeAnchor.localPosition : UnityEngine.XR.InputTracking.GetLocalPosition(UnityEngine.XR.XRNode.RightEye); if (UpdatedAnchors != null) { @@ -147,13 +147,13 @@ public void EnsureGameObjectIntegrity() trackingSpace = ConfigureRootAnchor(trackingSpaceName); if (leftEyeAnchor == null) - leftEyeAnchor = ConfigureEyeAnchor(trackingSpace, VR.VRNode.LeftEye); + leftEyeAnchor = ConfigureEyeAnchor(trackingSpace, UnityEngine.XR.XRNode.LeftEye); if (centerEyeAnchor == null) - centerEyeAnchor = ConfigureEyeAnchor(trackingSpace, VR.VRNode.CenterEye); + centerEyeAnchor = ConfigureEyeAnchor(trackingSpace, UnityEngine.XR.XRNode.CenterEye); if (rightEyeAnchor == null) - rightEyeAnchor = ConfigureEyeAnchor(trackingSpace, VR.VRNode.RightEye); + rightEyeAnchor = ConfigureEyeAnchor(trackingSpace, UnityEngine.XR.XRNode.RightEye); if (trackerAnchor == null) trackerAnchor = ConfigureTrackerAnchor(trackingSpace); @@ -210,9 +210,9 @@ private Transform ConfigureRootAnchor(string name) return root; } - private Transform ConfigureEyeAnchor(Transform root, VR.VRNode eye) + private Transform ConfigureEyeAnchor(Transform root, UnityEngine.XR.XRNode eye) { - string eyeName = (eye == VR.VRNode.CenterEye) ? "Center" : (eye == VR.VRNode.LeftEye) ? "Left" : "Right"; + string eyeName = (eye == UnityEngine.XR.XRNode.CenterEye) ? "Center" : (eye == UnityEngine.XR.XRNode.LeftEye) ? "Left" : "Right"; string name = eyeName + eyeAnchorName; Transform anchor = transform.Find(root.name + "/" + name); diff --git a/Assets/OVR/Scripts/OVRDisplay.cs b/Assets/OVR/Scripts/OVRDisplay.cs index e5e7000b..70b3cf71 100644 --- a/Assets/OVR/Scripts/OVRDisplay.cs +++ b/Assets/OVR/Scripts/OVRDisplay.cs @@ -98,7 +98,7 @@ public void Update() /// public void RecenterPose() { - VR.InputTracking.Recenter(); + UnityEngine.XR.InputTracking.Recenter(); if (RecenteredPose != null) { @@ -112,7 +112,7 @@ public void RecenterPose() public Vector3 acceleration { get { - if (!VR.VRDevice.isPresent) + if (!UnityEngine.XR.XRDevice.isPresent) return Vector3.zero; OVRPose ret = OVRPlugin.GetEyeAcceleration(OVRPlugin.Eye.None).ToOVRPose(); @@ -126,7 +126,7 @@ public Vector3 acceleration public Vector3 angularVelocity { get { - if (!VR.VRDevice.isPresent) + if (!UnityEngine.XR.XRDevice.isPresent) return Vector3.zero; OVRPose ret = OVRPlugin.GetEyeVelocity(OVRPlugin.Eye.None).ToOVRPose(); @@ -137,7 +137,7 @@ public Vector3 angularVelocity /// /// Gets the resolution and field of view for the given eye. /// - public EyeRenderDesc GetEyeRenderDesc(VR.VRNode eye) + public EyeRenderDesc GetEyeRenderDesc(UnityEngine.XR.XRNode eye) { return eyeDescs[(int)eye]; } @@ -148,7 +148,7 @@ public EyeRenderDesc GetEyeRenderDesc(VR.VRNode eye) public LatencyData latency { get { - if (!VR.VRDevice.isPresent) + if (!UnityEngine.XR.XRDevice.isPresent) return new LatencyData(); string latency = OVRPlugin.latency; @@ -171,13 +171,13 @@ public LatencyData latency private void UpdateTextures() { - ConfigureEyeDesc(VR.VRNode.LeftEye); - ConfigureEyeDesc(VR.VRNode.RightEye); + ConfigureEyeDesc(UnityEngine.XR.XRNode.LeftEye); + ConfigureEyeDesc(UnityEngine.XR.XRNode.RightEye); } - private void ConfigureEyeDesc(VR.VRNode eye) + private void ConfigureEyeDesc(UnityEngine.XR.XRNode eye) { - if (!VR.VRDevice.isPresent) + if (!UnityEngine.XR.XRDevice.isPresent) return; OVRPlugin.Sizei size = OVRPlugin.GetEyeTextureSize((OVRPlugin.Eye)eye); diff --git a/Assets/OVR/Scripts/OVRManager.cs b/Assets/OVR/Scripts/OVRManager.cs index f6cbb36d..356b68df 100644 --- a/Assets/OVR/Scripts/OVRManager.cs +++ b/Assets/OVR/Scripts/OVRManager.cs @@ -103,7 +103,7 @@ public static OVRProfile profile public static bool isHSWDisplayed { get { - if (!VR.VRDevice.isPresent) + if (!UnityEngine.XR.XRDevice.isPresent) return false; return OVRPlugin.hswVisible; @@ -115,7 +115,7 @@ public static bool isHSWDisplayed /// public static void DismissHSWDisplay() { - if (!VR.VRDevice.isPresent) + if (!UnityEngine.XR.XRDevice.isPresent) return; OVRPlugin.DismissHSW(); @@ -127,14 +127,14 @@ public static void DismissHSWDisplay() public bool chromatic { get { - if (!VR.VRDevice.isPresent) + if (!UnityEngine.XR.XRDevice.isPresent) return false; return OVRPlugin.chromatic; } set { - if (!VR.VRDevice.isPresent) + if (!UnityEngine.XR.XRDevice.isPresent) return; OVRPlugin.chromatic = value; @@ -147,14 +147,14 @@ public bool chromatic public bool monoscopic { get { - if (!VR.VRDevice.isPresent) + if (!UnityEngine.XR.XRDevice.isPresent) return true; return OVRPlugin.monoscopic; } set { - if (!VR.VRDevice.isPresent) + if (!UnityEngine.XR.XRDevice.isPresent) return; OVRPlugin.monoscopic = value; @@ -167,14 +167,14 @@ public bool monoscopic public bool queueAhead { get { - if (!VR.VRDevice.isPresent) + if (!UnityEngine.XR.XRDevice.isPresent) return false; return (OVRPlugin.queueAheadFraction != 0f); } set { - if (!VR.VRDevice.isPresent) + if (!UnityEngine.XR.XRDevice.isPresent) return; OVRPlugin.queueAheadFraction = (value) ? 0.25f : 0f; @@ -189,7 +189,7 @@ public bool queueAhead public static float batteryLevel { get { - if (!VR.VRDevice.isPresent) + if (!UnityEngine.XR.XRDevice.isPresent) return 1f; return OVRPlugin.batteryLevel; @@ -204,7 +204,7 @@ public static float batteryLevel public static float batteryTemperature { get { - if (!VR.VRDevice.isPresent) + if (!UnityEngine.XR.XRDevice.isPresent) return 0f; return OVRPlugin.batteryTemperature; @@ -219,7 +219,7 @@ public static float batteryTemperature public static int batteryStatus { get { - if (!VR.VRDevice.isPresent) + if (!UnityEngine.XR.XRDevice.isPresent) return -1; return (int)OVRPlugin.batteryStatus; @@ -233,7 +233,7 @@ public static int batteryStatus public static float volumeLevel { get { - if (!VR.VRDevice.isPresent) + if (!UnityEngine.XR.XRDevice.isPresent) return 0f; return OVRPlugin.systemVolume; @@ -353,13 +353,13 @@ private void Update() } // Dispatch any events. - if (HMDLost != null && wasHmdPresent && !VR.VRDevice.isPresent) + if (HMDLost != null && wasHmdPresent && !UnityEngine.XR.XRDevice.isPresent) HMDLost(); - if (HMDAcquired != null && !wasHmdPresent && VR.VRDevice.isPresent) + if (HMDAcquired != null && !wasHmdPresent && UnityEngine.XR.XRDevice.isPresent) HMDAcquired(); - wasHmdPresent = VR.VRDevice.isPresent; + wasHmdPresent = UnityEngine.XR.XRDevice.isPresent; if (TrackingLost != null && wasPositionTracked && !tracker.isPositionTracked) TrackingLost(); @@ -426,7 +426,7 @@ public void ReturnToLauncher() public static void PlatformUIConfirmQuit() { - if (!VR.VRDevice.isPresent) + if (!UnityEngine.XR.XRDevice.isPresent) return; OVRPlugin.ShowUI(OVRPlugin.PlatformUI.ConfirmQuit); @@ -434,7 +434,7 @@ public static void PlatformUIConfirmQuit() public static void PlatformUIGlobalMenu() { - if (!VR.VRDevice.isPresent) + if (!UnityEngine.XR.XRDevice.isPresent) return; OVRPlugin.ShowUI(OVRPlugin.PlatformUI.GlobalMenu); diff --git a/Assets/OVR/Scripts/OVRProfile.cs b/Assets/OVR/Scripts/OVRProfile.cs index 360bc509..9ac997d6 100644 --- a/Assets/OVR/Scripts/OVRProfile.cs +++ b/Assets/OVR/Scripts/OVRProfile.cs @@ -156,7 +156,7 @@ private void SetFromSystem() locale = jniOvr.CallStatic("getProfileLocale"); #endif - if (VR.VRDevice.isPresent) + if (UnityEngine.XR.XRDevice.isPresent) { ipd = OVRPlugin.ipd; eyeHeight = OVRPlugin.eyeHeight; diff --git a/Assets/OVR/Scripts/OVRTracker.cs b/Assets/OVR/Scripts/OVRTracker.cs index 17c87b01..43dd0b3e 100644 --- a/Assets/OVR/Scripts/OVRTracker.cs +++ b/Assets/OVR/Scripts/OVRTracker.cs @@ -54,7 +54,7 @@ public struct Frustum public bool isPresent { get { - if (!VR.VRDevice.isPresent) + if (!UnityEngine.XR.XRDevice.isPresent) return false; return OVRPlugin.positionSupported; @@ -77,14 +77,14 @@ public bool isPositionTracked public bool isEnabled { get { - if (!VR.VRDevice.isPresent) + if (!UnityEngine.XR.XRDevice.isPresent) return false; return OVRPlugin.position; } set { - if (!VR.VRDevice.isPresent) + if (!UnityEngine.XR.XRDevice.isPresent) return; OVRPlugin.position = value; @@ -97,7 +97,7 @@ public bool isEnabled public Frustum frustum { get { - if (!VR.VRDevice.isPresent) + if (!UnityEngine.XR.XRDevice.isPresent) return new Frustum(); return OVRPlugin.GetTrackerFrustum(OVRPlugin.Tracker.Default).ToFrustum(); @@ -109,7 +109,7 @@ public Frustum frustum /// public OVRPose GetPose(double predictionTime) { - if (!VR.VRDevice.isPresent) + if (!UnityEngine.XR.XRDevice.isPresent) return OVRPose.identity; var p = OVRPlugin.GetTrackerPose(OVRPlugin.Tracker.Default).ToOVRPose(); diff --git a/Assets/OVR/Scripts/Util/OVRDebugInfo.cs b/Assets/OVR/Scripts/Util/OVRDebugInfo.cs index 44a766ba..5ba9f71e 100644 --- a/Assets/OVR/Scripts/Util/OVRDebugInfo.cs +++ b/Assets/OVR/Scripts/Util/OVRDebugInfo.cs @@ -364,7 +364,7 @@ void UpdateEyeDepthOffset() /// void UpdateFOV() { - OVRDisplay.EyeRenderDesc eyeDesc = OVRManager.display.GetEyeRenderDesc(VR.VRNode.LeftEye); + OVRDisplay.EyeRenderDesc eyeDesc = OVRManager.display.GetEyeRenderDesc(UnityEngine.XR.XRNode.LeftEye); strFOV = System.String.Format("FOV (deg): {0:F3}", eyeDesc.fov.y); } @@ -373,10 +373,10 @@ void UpdateFOV() /// void UpdateResolutionEyeTexture() { - OVRDisplay.EyeRenderDesc leftEyeDesc = OVRManager.display.GetEyeRenderDesc(VR.VRNode.LeftEye); - OVRDisplay.EyeRenderDesc rightEyeDesc = OVRManager.display.GetEyeRenderDesc(VR.VRNode.RightEye); + OVRDisplay.EyeRenderDesc leftEyeDesc = OVRManager.display.GetEyeRenderDesc(UnityEngine.XR.XRNode.LeftEye); + OVRDisplay.EyeRenderDesc rightEyeDesc = OVRManager.display.GetEyeRenderDesc(UnityEngine.XR.XRNode.RightEye); - float scale = VR.VRSettings.renderScale; + float scale = UnityEngine.XR.XRSettings.eyeTextureResolutionScale; float w = (int)(scale * (float)(leftEyeDesc.resolution.x + rightEyeDesc.resolution.x)); float h = (int)(scale * (float)Mathf.Max(leftEyeDesc.resolution.y, rightEyeDesc.resolution.y)); diff --git a/Assets/OVR/Scripts/Util/OVRSceneSampleController.cs b/Assets/OVR/Scripts/Util/OVRSceneSampleController.cs index 396cbc8f..543d6a72 100644 --- a/Assets/OVR/Scripts/Util/OVRSceneSampleController.cs +++ b/Assets/OVR/Scripts/Util/OVRSceneSampleController.cs @@ -118,7 +118,7 @@ void Start() Cursor.visible = false; Cursor.lockState = CursorLockMode.Locked; #else - Screen.showCursor = false; + Cursor.visible = false; Screen.lockCursor = true; #endif } @@ -153,7 +153,7 @@ void Update() Screen.fullScreen = !Screen.fullScreen; if (Input.GetKeyDown(KeyCode.M)) - VR.VRSettings.showDeviceView = !VR.VRSettings.showDeviceView; + UnityEngine.XR.XRSettings.showDeviceView = !UnityEngine.XR.XRSettings.showDeviceView; #if !UNITY_ANDROID || UNITY_EDITOR // Escape Application diff --git a/Assets/OVR/Scripts/Util/OVRTrackerBounds.cs b/Assets/OVR/Scripts/Util/OVRTrackerBounds.cs index 723ed906..bf9c2eb4 100644 --- a/Assets/OVR/Scripts/Util/OVRTrackerBounds.cs +++ b/Assets/OVR/Scripts/Util/OVRTrackerBounds.cs @@ -152,8 +152,8 @@ void Update () // Transform point into volume space OVRPose headPose; - headPose.position = VR.InputTracking.GetLocalPosition(VR.VRNode.Head); - headPose.orientation = VR.InputTracking.GetLocalRotation(VR.VRNode.Head); + headPose.position = UnityEngine.XR.InputTracking.GetLocalPosition(UnityEngine.XR.XRNode.Head); + headPose.orientation = UnityEngine.XR.InputTracking.GetLocalRotation(UnityEngine.XR.XRNode.Head); Vector3 localPos = trackerMat.inverse.MultiplyPoint(headPose.position); diff --git a/Assets/OVR/Textures/UIBackground.psd.meta b/Assets/OVR/Textures/UIBackground.psd.meta index d089f1fc..3930563e 100644 --- a/Assets/OVR/Textures/UIBackground.psd.meta +++ b/Assets/OVR/Textures/UIBackground.psd.meta @@ -1,32 +1,42 @@ fileFormatVersion: 2 guid: 3b18dccbdca599d45bc0f2a8a234b503 TextureImporter: - serializedVersion: 2 + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 0 + sRGBTexture: 1 linearTexture: 0 - correctGamma: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 - heightScale: .25 + heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 grayScaleToAlpha: 0 - generateCubemap: 0 + generateCubemap: 6 + cubemapConvolution: 0 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 1024 textureSettings: + serializedVersion: 2 filterMode: -1 aniso: 1 - mipBias: -1 - wrapMode: 1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -34,13 +44,49 @@ TextureImporter: spriteExtrude: 1 spriteMeshType: 1 alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 alphaIsTransparency: 1 + spriteTessellationDetail: -1 textureType: 8 - buildTargetSettings: [] + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 1 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: + serializedVersion: 2 sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] spritePackingTag: + pSDRemoveMatte: 1 + pSDShowRemoveMatteOption: 1 userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/UnityAnalyticsManager.asset b/ProjectSettings/ClusterInputManager.asset similarity index 78% rename from ProjectSettings/UnityAnalyticsManager.asset rename to ProjectSettings/ClusterInputManager.asset index e3dbe997..8c185fe9 100644 Binary files a/ProjectSettings/UnityAnalyticsManager.asset and b/ProjectSettings/ClusterInputManager.asset differ diff --git a/ProjectSettings/EditorSettings.asset b/ProjectSettings/EditorSettings.asset index 30abd60b..4fb6b62f 100644 Binary files a/ProjectSettings/EditorSettings.asset and b/ProjectSettings/EditorSettings.asset differ diff --git a/ProjectSettings/PresetManager.asset b/ProjectSettings/PresetManager.asset new file mode 100644 index 00000000..e65627b9 Binary files /dev/null and b/ProjectSettings/PresetManager.asset differ diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index b11ab9b5..d53ff41f 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 5.2.2f1 -m_StandardAssetsVersion: 0 +m_EditorVersion: 2019.4.11f1 +m_EditorVersionWithRevision: 2019.4.11f1 (2d9804dddde7) diff --git a/ProjectSettings/UnityConnectSettings.asset b/ProjectSettings/UnityConnectSettings.asset new file mode 100644 index 00000000..940908fd Binary files /dev/null and b/ProjectSettings/UnityConnectSettings.asset differ diff --git a/ProjectSettings/UnityAdsSettings.asset b/ProjectSettings/VFXManager.asset similarity index 76% rename from ProjectSettings/UnityAdsSettings.asset rename to ProjectSettings/VFXManager.asset index e6070fc5..3a228cde 100644 Binary files a/ProjectSettings/UnityAdsSettings.asset and b/ProjectSettings/VFXManager.asset differ diff --git a/ProjectSettings/XRSettings.asset b/ProjectSettings/XRSettings.asset new file mode 100644 index 00000000..482590c1 --- /dev/null +++ b/ProjectSettings/XRSettings.asset @@ -0,0 +1,10 @@ +{ + "m_SettingKeys": [ + "VR Device Disabled", + "VR Device User Alert" + ], + "m_SettingValues": [ + "False", + "False" + ] +} \ No newline at end of file