From 1a63a57bf6d786ab8144636330ff21f868c5f6e9 Mon Sep 17 00:00:00 2001 From: Harvey Ball Date: Fri, 30 Mar 2018 09:57:27 +0100 Subject: [PATCH] fix(SDK): update Google SDK vrDeviceName The latest version of the Google VR SDK (v1.110.0 released 2017-11-08) uses the string constant "daydream" as the VRSettings.loadedDeviceName. See GoogleVR/Scripts/GvrSettings.cs This also applies to the built in Unity SDK for Daydream and for Cardboard. Co-authored-by: Ty <2926368+tnterdan@users.noreply.github.com> --- Assets/VRTK/Source/SDK/Daydream/SDK_DaydreamSystem.cs | 2 +- Assets/VRTK/Source/SDK/Unity/SDK_UnitySystem.cs | 4 ++-- Assets/VRTK/Source/SDK/Ximmerse/SDK_XimmerseSystem.cs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Assets/VRTK/Source/SDK/Daydream/SDK_DaydreamSystem.cs b/Assets/VRTK/Source/SDK/Daydream/SDK_DaydreamSystem.cs index 146d44568..d066a3795 100644 --- a/Assets/VRTK/Source/SDK/Daydream/SDK_DaydreamSystem.cs +++ b/Assets/VRTK/Source/SDK/Daydream/SDK_DaydreamSystem.cs @@ -4,7 +4,7 @@ namespace VRTK /// /// The Daydream System SDK script provides dummy functions for system functions. /// - [SDK_Description("Google Daydream (Android:Daydream)", SDK_DaydreamDefines.ScriptingDefineSymbol, "Daydream", "Android")] + [SDK_Description("Google Daydream (Android:Daydream)", SDK_DaydreamDefines.ScriptingDefineSymbol, "daydream", "Android")] public class SDK_DaydreamSystem #if VRTK_DEFINE_SDK_DAYDREAM : SDK_BaseSystem diff --git a/Assets/VRTK/Source/SDK/Unity/SDK_UnitySystem.cs b/Assets/VRTK/Source/SDK/Unity/SDK_UnitySystem.cs index 7b1d796d2..1a4fd0a56 100644 --- a/Assets/VRTK/Source/SDK/Unity/SDK_UnitySystem.cs +++ b/Assets/VRTK/Source/SDK/Unity/SDK_UnitySystem.cs @@ -6,8 +6,8 @@ namespace VRTK /// [SDK_Description("Unity (Standalone:Oculus)", null, "Oculus", "Standalone")] [SDK_Description("Unity (Standalone:OpenVR)", null, "OpenVR", "Standalone", 1)] - [SDK_Description("Unity (Android:Cardboard)", null, "Cardboard", "Android", 2)] - [SDK_Description("Unity (Android:Daydream)", null, "Daydream", "Android", 3)] + [SDK_Description("Unity (Android:Cardboard)", null, "cardboard", "Android", 2)] + [SDK_Description("Unity (Android:Daydream)", null, "daydream", "Android", 3)] [SDK_Description("Unity (Android:Oculus)", null, "Oculus", "Android", 4)] [SDK_Description("Unity (Android:OpenVR)", null, "OpenVR", "Android", 5)] public class SDK_UnitySystem : SDK_BaseSystem diff --git a/Assets/VRTK/Source/SDK/Ximmerse/SDK_XimmerseSystem.cs b/Assets/VRTK/Source/SDK/Ximmerse/SDK_XimmerseSystem.cs index ebb50b2a5..8d20c3596 100644 --- a/Assets/VRTK/Source/SDK/Ximmerse/SDK_XimmerseSystem.cs +++ b/Assets/VRTK/Source/SDK/Ximmerse/SDK_XimmerseSystem.cs @@ -5,7 +5,7 @@ namespace VRTK /// The Ximmerse System SDK script provides a bridge to the Ximmerse SDK. /// [SDK_Description("Ximmerse (Standalone:Oculus)", SDK_XimmerseDefines.ScriptingDefineSymbol, "Oculus", "Standalone")] - [SDK_Description("Ximmerse (Android:Daydream)", SDK_XimmerseDefines.ScriptingDefineSymbol, "Daydream", "Android", 1)] + [SDK_Description("Ximmerse (Android:Daydream)", SDK_XimmerseDefines.ScriptingDefineSymbol, "daydream", "Android", 1)] public class SDK_XimmerseSystem #if VRTK_DEFINE_SDK_XIMMERSE : SDK_BaseSystem