Update to v1.10.2

* Improvement - [ViveInput] Add new procedure vibration API (only works with SteamVR v2) ```csharp using HTC.UnityPlugin.Vive; ViveInput.TriggerHapticVibrationEx<TRole>( TRole role, float durationSeconds = 0.01f, float frequency = 85f, float amplitude = 0.125f, float startSecondsFromNow = 0f) ``` * Bug Fix - [ViveInput] Fix issue that TriggerHapticPulse is not working - [Utility] Fix bug in IndexedSet indexer setter. - [WaveVRModule] Fix VIU example freezes after launched - [OculusVRModule] Fix OculusVRModule not recognizing GearVR or OculusGO correctly - [ExternalCamera] Fix not working with SteamVR v2 - [ExternalCamera] Fix SteamVR_ExternalCamera setting sceneResolutionScale incorrectly in some cases - [ExternalCamera] Fix potential RenderTexture created by SteamVR_ExternalCamera having incorrect ColorSpace
JeffBail · Jan 23, 2019 · 054041e · 054041e
2 parents cdf181b + 5ab7326
commit 054041e
Show file tree

Hide file tree

Showing 140 changed files with 625 additions and 172 deletions.
diff --git a/Assets/HTC.UnityPlugin/ColliderEvent/ColliderEventCaster.cs b/Assets/HTC.UnityPlugin/ColliderEvent/ColliderEventCaster.cs
@@ -1,4 +1,4 @@
-//========= Copyright 2016-2018, HTC Corporation. All rights reserved. ===========
+//========= Copyright 2016-2019, HTC Corporation. All rights reserved. ===========
 
 using HTC.UnityPlugin.Utility;
 using System.Collections.Generic;

diff --git a/Assets/HTC.UnityPlugin/ColliderEvent/ColliderEventData.cs b/Assets/HTC.UnityPlugin/ColliderEvent/ColliderEventData.cs
@@ -1,4 +1,4 @@
-//========= Copyright 2016-2018, HTC Corporation. All rights reserved. ===========
+//========= Copyright 2016-2019, HTC Corporation. All rights reserved. ===========
 
 using HTC.UnityPlugin.Utility;
 using UnityEngine;

diff --git a/Assets/HTC.UnityPlugin/ColliderEvent/ColliderEventInterfaces.cs b/Assets/HTC.UnityPlugin/ColliderEvent/ColliderEventInterfaces.cs
@@ -1,4 +1,4 @@
-//========= Copyright 2016-2018, HTC Corporation. All rights reserved. ===========
+//========= Copyright 2016-2019, HTC Corporation. All rights reserved. ===========
 
 using UnityEngine.EventSystems;
 

diff --git a/Assets/HTC.UnityPlugin/ColliderEvent/ExecuteColliderEvents.cs b/Assets/HTC.UnityPlugin/ColliderEvent/ExecuteColliderEvents.cs
@@ -1,4 +1,4 @@
-//========= Copyright 2016-2018, HTC Corporation. All rights reserved. ===========
+//========= Copyright 2016-2019, HTC Corporation. All rights reserved. ===========
 
 using UnityEngine.EventSystems;
 

diff --git a/Assets/HTC.UnityPlugin/Pointer3D/ExecutePointer3DEvents.cs b/Assets/HTC.UnityPlugin/Pointer3D/ExecutePointer3DEvents.cs
@@ -1,4 +1,4 @@
-//========= Copyright 2016-2018, HTC Corporation. All rights reserved. ===========
+//========= Copyright 2016-2019, HTC Corporation. All rights reserved. ===========
 
 using UnityEngine.EventSystems;
 

diff --git a/Assets/HTC.UnityPlugin/Pointer3D/Pointer3DEventData.cs b/Assets/HTC.UnityPlugin/Pointer3D/Pointer3DEventData.cs
@@ -1,4 +1,4 @@
-//========= Copyright 2016-2018, HTC Corporation. All rights reserved. ===========
+//========= Copyright 2016-2019, HTC Corporation. All rights reserved. ===========
 
 using UnityEngine;
 using UnityEngine.EventSystems;

diff --git a/Assets/HTC.UnityPlugin/Pointer3D/Pointer3DEventInterfaces.cs b/Assets/HTC.UnityPlugin/Pointer3D/Pointer3DEventInterfaces.cs
@@ -1,4 +1,4 @@
-//========= Copyright 2016-2018, HTC Corporation. All rights reserved. ===========
+//========= Copyright 2016-2019, HTC Corporation. All rights reserved. ===========
 
 using UnityEngine.EventSystems;
 

diff --git a/Assets/HTC.UnityPlugin/Pointer3D/Pointer3DInputModule.cs b/Assets/HTC.UnityPlugin/Pointer3D/Pointer3DInputModule.cs
@@ -1,4 +1,4 @@
-//========= Copyright 2016-2018, HTC Corporation. All rights reserved. ===========
+//========= Copyright 2016-2019, HTC Corporation. All rights reserved. ===========
 
 using HTC.UnityPlugin.Utility;
 using System;

diff --git a/Assets/HTC.UnityPlugin/Pointer3D/RaySegmentGenerator/Base/BaseRaySegmentGenerator.cs b/Assets/HTC.UnityPlugin/Pointer3D/RaySegmentGenerator/Base/BaseRaySegmentGenerator.cs
@@ -1,4 +1,4 @@
-//========= Copyright 2016-2018, HTC Corporation. All rights reserved. ===========
+//========= Copyright 2016-2019, HTC Corporation. All rights reserved. ===========
 
 using UnityEngine;
 

diff --git a/Assets/HTC.UnityPlugin/Pointer3D/RaySegmentGenerator/Base/IRaySegmentGenerator.cs b/Assets/HTC.UnityPlugin/Pointer3D/RaySegmentGenerator/Base/IRaySegmentGenerator.cs
@@ -1,4 +1,4 @@
-//========= Copyright 2016-2018, HTC Corporation. All rights reserved. ===========
+//========= Copyright 2016-2019, HTC Corporation. All rights reserved. ===========
 
 using UnityEngine;
 

diff --git a/Assets/HTC.UnityPlugin/Pointer3D/RaySegmentGenerator/DefaultGenerator.cs b/Assets/HTC.UnityPlugin/Pointer3D/RaySegmentGenerator/DefaultGenerator.cs
@@ -1,4 +1,4 @@
-//========= Copyright 2016-2018, HTC Corporation. All rights reserved. ===========
+//========= Copyright 2016-2019, HTC Corporation. All rights reserved. ===========
 
 using System;
 using UnityEngine;

diff --git a/Assets/HTC.UnityPlugin/Pointer3D/RaySegmentGenerator/ProjectileGenerator.cs b/Assets/HTC.UnityPlugin/Pointer3D/RaySegmentGenerator/ProjectileGenerator.cs
@@ -1,4 +1,4 @@
-//========= Copyright 2016-2018, HTC Corporation. All rights reserved. ===========
+//========= Copyright 2016-2019, HTC Corporation. All rights reserved. ===========
 
 using UnityEngine;
 using HTC.UnityPlugin.Utility;

diff --git a/Assets/HTC.UnityPlugin/Pointer3D/RaySegmentGenerator/ProjectionGenerator.cs b/Assets/HTC.UnityPlugin/Pointer3D/RaySegmentGenerator/ProjectionGenerator.cs
@@ -1,4 +1,4 @@
-//========= Copyright 2016-2018, HTC Corporation. All rights reserved. ===========
+//========= Copyright 2016-2019, HTC Corporation. All rights reserved. ===========
 
 using UnityEngine;
 

diff --git a/Assets/HTC.UnityPlugin/Pointer3D/RaycastMethod/Base/BaseRaycastMethod.cs b/Assets/HTC.UnityPlugin/Pointer3D/RaycastMethod/Base/BaseRaycastMethod.cs
@@ -1,4 +1,4 @@
-//========= Copyright 2016-2018, HTC Corporation. All rights reserved. ===========
+//========= Copyright 2016-2019, HTC Corporation. All rights reserved. ===========
 
 using System.Collections.Generic;
 using UnityEngine;

diff --git a/Assets/HTC.UnityPlugin/Pointer3D/RaycastMethod/Base/IRaycastMethod.cs b/Assets/HTC.UnityPlugin/Pointer3D/RaycastMethod/Base/IRaycastMethod.cs
@@ -1,4 +1,4 @@
-//========= Copyright 2016-2018, HTC Corporation. All rights reserved. ===========
+//========= Copyright 2016-2019, HTC Corporation. All rights reserved. ===========
 
 using System.Collections.Generic;
 using UnityEngine;

diff --git a/Assets/HTC.UnityPlugin/Pointer3D/RaycastMethod/CanvasRaycastMethod.cs b/Assets/HTC.UnityPlugin/Pointer3D/RaycastMethod/CanvasRaycastMethod.cs
@@ -1,4 +1,4 @@
-//========= Copyright 2016-2018, HTC Corporation. All rights reserved. ===========
+//========= Copyright 2016-2019, HTC Corporation. All rights reserved. ===========
 
 using HTC.UnityPlugin.Utility;
 using System.Collections.Generic;

diff --git a/Assets/HTC.UnityPlugin/Pointer3D/RaycastMethod/CanvasRaycastTarget.cs b/Assets/HTC.UnityPlugin/Pointer3D/RaycastMethod/CanvasRaycastTarget.cs
@@ -1,4 +1,4 @@
-//========= Copyright 2016-2018, HTC Corporation. All rights reserved. ===========
+//========= Copyright 2016-2019, HTC Corporation. All rights reserved. ===========
 
 using UnityEngine;
 using UnityEngine.EventSystems;

diff --git a/Assets/HTC.UnityPlugin/Pointer3D/RaycastMethod/GraphicRaycastMethod.cs b/Assets/HTC.UnityPlugin/Pointer3D/RaycastMethod/GraphicRaycastMethod.cs
@@ -1,4 +1,4 @@
-//========= Copyright 2016-2018, HTC Corporation. All rights reserved. ===========
+//========= Copyright 2016-2019, HTC Corporation. All rights reserved. ===========
 
 using System.Collections.Generic;
 using UnityEngine;

diff --git a/Assets/HTC.UnityPlugin/Pointer3D/RaycastMethod/Physics2DRaycastMethod.cs b/Assets/HTC.UnityPlugin/Pointer3D/RaycastMethod/Physics2DRaycastMethod.cs
@@ -1,4 +1,4 @@
-//========= Copyright 2016-2018, HTC Corporation. All rights reserved. ===========
+//========= Copyright 2016-2019, HTC Corporation. All rights reserved. ===========
 
 using System.Collections.Generic;
 using UnityEngine;

diff --git a/Assets/HTC.UnityPlugin/Pointer3D/RaycastMethod/PhysicsRaycastMethod.cs b/Assets/HTC.UnityPlugin/Pointer3D/RaycastMethod/PhysicsRaycastMethod.cs
@@ -1,4 +1,4 @@
-//========= Copyright 2016-2018, HTC Corporation. All rights reserved. ===========
+//========= Copyright 2016-2019, HTC Corporation. All rights reserved. ===========
 
 using System.Collections.Generic;
 using UnityEngine;

diff --git a/Assets/HTC.UnityPlugin/Pointer3D/Raycaster/Base/BaseFallbackCamRaycaster.cs b/Assets/HTC.UnityPlugin/Pointer3D/Raycaster/Base/BaseFallbackCamRaycaster.cs
@@ -1,4 +1,4 @@
-//========= Copyright 2016-2018, HTC Corporation. All rights reserved. ===========
+//========= Copyright 2016-2019, HTC Corporation. All rights reserved. ===========
 
 using System;
 using UnityEngine;

diff --git a/Assets/HTC.UnityPlugin/Pointer3D/Raycaster/Base/BaseMultiMethodRaycaster.cs b/Assets/HTC.UnityPlugin/Pointer3D/Raycaster/Base/BaseMultiMethodRaycaster.cs
@@ -1,4 +1,4 @@
-//========= Copyright 2016-2018, HTC Corporation. All rights reserved. ===========
+//========= Copyright 2016-2019, HTC Corporation. All rights reserved. ===========
 
 using HTC.UnityPlugin.Utility;
 using System;

diff --git a/Assets/HTC.UnityPlugin/Pointer3D/Raycaster/Pointer3DRaycaster.cs b/Assets/HTC.UnityPlugin/Pointer3D/Raycaster/Pointer3DRaycaster.cs
@@ -1,4 +1,4 @@
-//========= Copyright 2016-2018, HTC Corporation. All rights reserved. ===========
+//========= Copyright 2016-2019, HTC Corporation. All rights reserved. ===========
 
 using HTC.UnityPlugin.Utility;
 using System;

diff --git a/Assets/HTC.UnityPlugin/Pointer3D/StandaloneRaycaster/StandaloneEventData.cs b/Assets/HTC.UnityPlugin/Pointer3D/StandaloneRaycaster/StandaloneEventData.cs
@@ -1,4 +1,4 @@
-//========= Copyright 2016-2018, HTC Corporation. All rights reserved. ===========
+//========= Copyright 2016-2019, HTC Corporation. All rights reserved. ===========
 
 using UnityEngine;
 using UnityEngine.EventSystems;

diff --git a/Assets/HTC.UnityPlugin/Pointer3D/StandaloneRaycaster/StandaloneRaycaster.cs b/Assets/HTC.UnityPlugin/Pointer3D/StandaloneRaycaster/StandaloneRaycaster.cs
@@ -1,4 +1,4 @@
-//========= Copyright 2016-2018, HTC Corporation. All rights reserved. ===========
+//========= Copyright 2016-2019, HTC Corporation. All rights reserved. ===========
 
 using UnityEngine;
 using UnityEngine.EventSystems;

diff --git a/Assets/HTC.UnityPlugin/PoseTracker/Base/BasePoseModifier.cs b/Assets/HTC.UnityPlugin/PoseTracker/Base/BasePoseModifier.cs
@@ -1,4 +1,4 @@
-//========= Copyright 2016-2018, HTC Corporation. All rights reserved. ===========
+//========= Copyright 2016-2019, HTC Corporation. All rights reserved. ===========
 
 using HTC.UnityPlugin.Utility;
 using System;

diff --git a/Assets/HTC.UnityPlugin/PoseTracker/Base/BasePoseTracker.cs b/Assets/HTC.UnityPlugin/PoseTracker/Base/BasePoseTracker.cs
@@ -1,4 +1,4 @@
-//========= Copyright 2016-2018, HTC Corporation. All rights reserved. ===========
+//========= Copyright 2016-2019, HTC Corporation. All rights reserved. ===========
 
 using HTC.UnityPlugin.Utility;
 using System;

diff --git a/Assets/HTC.UnityPlugin/PoseTracker/Base/IPoseModifier.cs b/Assets/HTC.UnityPlugin/PoseTracker/Base/IPoseModifier.cs
@@ -1,4 +1,4 @@
-//========= Copyright 2016-2018, HTC Corporation. All rights reserved. ===========
+//========= Copyright 2016-2019, HTC Corporation. All rights reserved. ===========
 
 using HTC.UnityPlugin.Utility;
 using System;

diff --git a/Assets/HTC.UnityPlugin/PoseTracker/Base/IPoseTracker.cs b/Assets/HTC.UnityPlugin/PoseTracker/Base/IPoseTracker.cs
@@ -1,4 +1,4 @@
-//========= Copyright 2016-2018, HTC Corporation. All rights reserved. ===========
+//========= Copyright 2016-2019, HTC Corporation. All rights reserved. ===========
 
 namespace HTC.UnityPlugin.PoseTracker
 {

diff --git a/Assets/HTC.UnityPlugin/PoseTracker/Editor/PoseEaserEditor.cs b/Assets/HTC.UnityPlugin/PoseTracker/Editor/PoseEaserEditor.cs
@@ -1,4 +1,4 @@
-//========= Copyright 2016-2018, HTC Corporation. All rights reserved. ===========
+//========= Copyright 2016-2019, HTC Corporation. All rights reserved. ===========
 
 using UnityEditor;
 using UnityEngine;

diff --git a/Assets/HTC.UnityPlugin/PoseTracker/Editor/PoseFreezerEditor.cs b/Assets/HTC.UnityPlugin/PoseTracker/Editor/PoseFreezerEditor.cs
@@ -1,4 +1,4 @@
-//========= Copyright 2016-2018, HTC Corporation. All rights reserved. ===========
+//========= Copyright 2016-2019, HTC Corporation. All rights reserved. ===========
 
 using UnityEditor;
 using UnityEngine;

diff --git a/Assets/HTC.UnityPlugin/PoseTracker/Pose.cs b/Assets/HTC.UnityPlugin/PoseTracker/Pose.cs
@@ -1,4 +1,4 @@
-//========= Copyright 2016-2018, HTC Corporation. All rights reserved. ===========
+//========= Copyright 2016-2019, HTC Corporation. All rights reserved. ===========
 
 using HTC.UnityPlugin.Utility;
 using System;

diff --git a/Assets/HTC.UnityPlugin/PoseTracker/PoseModifiers/PoseEaser.cs b/Assets/HTC.UnityPlugin/PoseTracker/PoseModifiers/PoseEaser.cs
@@ -1,4 +1,4 @@
-//========= Copyright 2016-2018, HTC Corporation. All rights reserved. ===========
+//========= Copyright 2016-2019, HTC Corporation. All rights reserved. ===========
 
 using HTC.UnityPlugin.Utility;
 using UnityEngine;

diff --git a/Assets/HTC.UnityPlugin/PoseTracker/PoseModifiers/PoseFreezer.cs b/Assets/HTC.UnityPlugin/PoseTracker/PoseModifiers/PoseFreezer.cs
@@ -1,4 +1,4 @@
-//========= Copyright 2016-2018, HTC Corporation. All rights reserved. ===========
+//========= Copyright 2016-2019, HTC Corporation. All rights reserved. ===========
 
 using HTC.UnityPlugin.Utility;
 using UnityEngine;

diff --git a/Assets/HTC.UnityPlugin/PoseTracker/PoseModifiers/PoseStablizer.cs b/Assets/HTC.UnityPlugin/PoseTracker/PoseModifiers/PoseStablizer.cs
@@ -1,4 +1,4 @@
-//========= Copyright 2016-2018, HTC Corporation. All rights reserved. ===========
+//========= Copyright 2016-2019, HTC Corporation. All rights reserved. ===========
 
 using HTC.UnityPlugin.Utility;
 using UnityEngine;

diff --git a/Assets/HTC.UnityPlugin/PoseTracker/PoseTracker.cs b/Assets/HTC.UnityPlugin/PoseTracker/PoseTracker.cs
@@ -1,4 +1,4 @@
-//========= Copyright 2016-2018, HTC Corporation. All rights reserved. ===========
+//========= Copyright 2016-2019, HTC Corporation. All rights reserved. ===========
 
 using HTC.UnityPlugin.Utility;
 using UnityEngine;

diff --git a/Assets/HTC.UnityPlugin/Utility/Attribute/CustomOrderedEnumAttribute.cs b/Assets/HTC.UnityPlugin/Utility/Attribute/CustomOrderedEnumAttribute.cs
@@ -1,4 +1,4 @@
-//========= Copyright 2016-2018, HTC Corporation. All rights reserved. ===========
+//========= Copyright 2016-2019, HTC Corporation. All rights reserved. ===========
 
 using System;
 using UnityEngine;

diff --git a/Assets/HTC.UnityPlugin/Utility/Attribute/Editor/CustomOrderedEnumAttributeDrawer.cs b/Assets/HTC.UnityPlugin/Utility/Attribute/Editor/CustomOrderedEnumAttributeDrawer.cs
@@ -1,4 +1,4 @@
-//========= Copyright 2016-2018, HTC Corporation. All rights reserved. ===========
+//========= Copyright 2016-2019, HTC Corporation. All rights reserved. ===========
 
 using System;
 using System.Linq;

diff --git a/Assets/HTC.UnityPlugin/Utility/Attribute/Editor/FlagsFromEnumAttributeDrawer.cs b/Assets/HTC.UnityPlugin/Utility/Attribute/Editor/FlagsFromEnumAttributeDrawer.cs
@@ -1,4 +1,4 @@
-//========= Copyright 2016-2018, HTC Corporation. All rights reserved. ===========
+//========= Copyright 2016-2019, HTC Corporation. All rights reserved. ===========
 
 using System.Collections.Generic;
 using UnityEditor;

diff --git a/Assets/HTC.UnityPlugin/Utility/Attribute/FlagsFromEnumAttribute.cs b/Assets/HTC.UnityPlugin/Utility/Attribute/FlagsFromEnumAttribute.cs
@@ -1,4 +1,4 @@
-//========= Copyright 2016-2018, HTC Corporation. All rights reserved. ===========
+//========= Copyright 2016-2019, HTC Corporation. All rights reserved. ===========
 
 using System;
 using UnityEngine;

diff --git a/Assets/HTC.UnityPlugin/Utility/ChangeProp.cs b/Assets/HTC.UnityPlugin/Utility/ChangeProp.cs
@@ -1,4 +1,4 @@
-//========= Copyright 2016-2018, HTC Corporation. All rights reserved. ===========
+//========= Copyright 2016-2019, HTC Corporation. All rights reserved. ===========
 
 using System;
 using System.Collections.Generic;

diff --git a/Assets/HTC.UnityPlugin/Utility/Container/IndexedSet.cs b/Assets/HTC.UnityPlugin/Utility/Container/IndexedSet.cs
@@ -1,4 +1,4 @@
-//========= Copyright 2016-2018, HTC Corporation. All rights reserved. ===========
+//========= Copyright 2016-2019, HTC Corporation. All rights reserved. ===========
 
 using System;
 using System.Collections;
@@ -70,7 +70,7 @@ public T this[int index]
                 T item = m_List[index];
                 m_Dictionary.Remove(item);
                 m_List[index] = value;
-                m_Dictionary.Add(item, index);
+                m_Dictionary.Add(value, index);
             }
         }
 
@@ -193,4 +193,4 @@ public ReadOnlyCollection<T> AsReadOnly()
             return m_List.AsReadOnly();
         }
     }
-}
+}
diff --git a/Assets/HTC.UnityPlugin/Utility/Container/IndexedTable.cs b/Assets/HTC.UnityPlugin/Utility/Container/IndexedTable.cs
@@ -1,4 +1,4 @@
-//========= Copyright 2016-2018, HTC Corporation. All rights reserved. ===========
+//========= Copyright 2016-2019, HTC Corporation. All rights reserved. ===========
 
 using System;
 using System.Collections;

diff --git a/Assets/HTC.UnityPlugin/Utility/Container/OrderedIndexedSet.cs b/Assets/HTC.UnityPlugin/Utility/Container/OrderedIndexedSet.cs
@@ -1,4 +1,4 @@
-//========= Copyright 2016-2018, HTC Corporation. All rights reserved. ===========
+//========= Copyright 2016-2019, HTC Corporation. All rights reserved. ===========
 
 namespace HTC.UnityPlugin.Utility
 {

diff --git a/Assets/HTC.UnityPlugin/Utility/Container/OrderedIndexedTable.cs b/Assets/HTC.UnityPlugin/Utility/Container/OrderedIndexedTable.cs
@@ -1,4 +1,4 @@
-//========= Copyright 2016-2018, HTC Corporation. All rights reserved. ===========
+//========= Copyright 2016-2019, HTC Corporation. All rights reserved. ===========
 
 using System.Collections.Generic;
 

diff --git a/Assets/HTC.UnityPlugin/Utility/ContainerPool/DictionaryPool.cs b/Assets/HTC.UnityPlugin/Utility/ContainerPool/DictionaryPool.cs
@@ -1,4 +1,4 @@
-//========= Copyright 2016-2018, HTC Corporation. All rights reserved. ===========
+//========= Copyright 2016-2019, HTC Corporation. All rights reserved. ===========
 
 using System.Collections.Generic;
 

diff --git a/Assets/HTC.UnityPlugin/Utility/ContainerPool/IndexedSetPool.cs b/Assets/HTC.UnityPlugin/Utility/ContainerPool/IndexedSetPool.cs
@@ -1,4 +1,4 @@
-//========= Copyright 2016-2018, HTC Corporation. All rights reserved. ===========
+//========= Copyright 2016-2019, HTC Corporation. All rights reserved. ===========
 
 namespace HTC.UnityPlugin.Utility
 {

diff --git a/Assets/HTC.UnityPlugin/Utility/ContainerPool/ListPool.cs b/Assets/HTC.UnityPlugin/Utility/ContainerPool/ListPool.cs
@@ -1,4 +1,4 @@
-//========= Copyright 2016-2018, HTC Corporation. All rights reserved. ===========
+//========= Copyright 2016-2019, HTC Corporation. All rights reserved. ===========
 
 using System.Collections.Generic;
 

diff --git a/Assets/HTC.UnityPlugin/Utility/ContainerPool/ObjectPool.cs b/Assets/HTC.UnityPlugin/Utility/ContainerPool/ObjectPool.cs
@@ -1,4 +1,4 @@
-//========= Copyright 2016-2018, HTC Corporation. All rights reserved. ===========
+//========= Copyright 2016-2019, HTC Corporation. All rights reserved. ===========
 
 using System;
 using System.Collections.Generic;

diff --git a/Assets/HTC.UnityPlugin/Utility/EnumUtils.cs b/Assets/HTC.UnityPlugin/Utility/EnumUtils.cs
@@ -1,4 +1,4 @@
-//========= Copyright 2016-2018, HTC Corporation. All rights reserved. ===========
+//========= Copyright 2016-2019, HTC Corporation. All rights reserved. ===========
 
 using System;
 using System.Collections.Generic;

diff --git a/Assets/HTC.UnityPlugin/Utility/RigidPose.cs b/Assets/HTC.UnityPlugin/Utility/RigidPose.cs
@@ -1,4 +1,4 @@
-//========= Copyright 2016-2018, HTC Corporation. All rights reserved. ===========
+//========= Copyright 2016-2019, HTC Corporation. All rights reserved. ===========
 
 using System;
 using UnityEngine;

diff --git a/Assets/HTC.UnityPlugin/Utility/SingletonBehaviour.cs b/Assets/HTC.UnityPlugin/Utility/SingletonBehaviour.cs
@@ -1,4 +1,4 @@
-//========= Copyright 2016-2018, HTC Corporation. All rights reserved. ===========
+//========= Copyright 2016-2019, HTC Corporation. All rights reserved. ===========
 
 using System;
 using UnityEngine;

diff --git a/Assets/HTC.UnityPlugin/VRModule/Editor/VRModuleManagerEditor.cs b/Assets/HTC.UnityPlugin/VRModule/Editor/VRModuleManagerEditor.cs
@@ -1,4 +1,4 @@
-//========= Copyright 2016-2018, HTC Corporation. All rights reserved. ===========
+//========= Copyright 2016-2019, HTC Corporation. All rights reserved. ===========
 
 using System;
 using System.Collections.Generic;

diff --git a/Assets/HTC.UnityPlugin/VRModule/Modules/Editor/UnityEngineVRModuleEditor.cs b/Assets/HTC.UnityPlugin/VRModule/Modules/Editor/UnityEngineVRModuleEditor.cs
@@ -1,4 +1,4 @@
-//========= Copyright 2016-2018, HTC Corporation. All rights reserved. ===========
+//========= Copyright 2016-2019, HTC Corporation. All rights reserved. ===========
 
 using HTC.UnityPlugin.Utility;
 using UnityEditor;

diff --git a/Assets/HTC.UnityPlugin/VRModule/Modules/GoogleVRModule.cs b/Assets/HTC.UnityPlugin/VRModule/Modules/GoogleVRModule.cs
@@ -1,4 +1,4 @@
-//========= Copyright 2016-2018, HTC Corporation. All rights reserved. ===========
+//========= Copyright 2016-2019, HTC Corporation. All rights reserved. ===========
 
 #if VIU_GOOGLEVR && UNITY_5_6_OR_NEWER
 

diff --git a/Assets/HTC.UnityPlugin/VRModule/Modules/OculusVRModule.cs b/Assets/HTC.UnityPlugin/VRModule/Modules/OculusVRModule.cs
@@ -1,4 +1,4 @@
-//========= Copyright 2016-2018, HTC Corporation. All rights reserved. ===========
+//========= Copyright 2016-2019, HTC Corporation. All rights reserved. ===========
 
 #if VIU_OCULUSVR
 using UnityEngine;
@@ -141,7 +141,8 @@ public override void BeforeRenderUpdate()
                 // update device connected state
                 if (!prevState.isConnected)
                 {
-                    var ovrProductName = OVRPlugin.productName;
+                    var platform = OVRPlugin.GetSystemHeadsetType();
+                    var ovrProductName = platform.ToString();
                     var deviceClass = s_node2class[(int)node];
 
                     currState.isConnected = true;
@@ -160,15 +161,24 @@ public override void BeforeRenderUpdate()
                             currState.deviceModel = VRModuleDeviceModel.OculusSensor;
                             break;
                         case VRModuleDeviceClass.Controller:
-                            switch (ovrProductName)
+                            switch (platform)
                             {
-                                case "Oculus Go":
+                                case OVRPlugin.SystemHeadset.Oculus_Go:
                                     currState.deviceModel = VRModuleDeviceModel.OculusGoController;
                                     break;
-                                case "Gear VR":
+
+                                case OVRPlugin.SystemHeadset.GearVR_R320:
+                                case OVRPlugin.SystemHeadset.GearVR_R321:
+                                case OVRPlugin.SystemHeadset.GearVR_R322:
+                                case OVRPlugin.SystemHeadset.GearVR_R323:
+                                case OVRPlugin.SystemHeadset.GearVR_R324:
+                                case OVRPlugin.SystemHeadset.GearVR_R325:
                                     currState.deviceModel = VRModuleDeviceModel.OculusGearVrController;
                                     break;
-                                case "Oculus Rift":
+
+                                case OVRPlugin.SystemHeadset.Rift_DK1:
+                                case OVRPlugin.SystemHeadset.Rift_DK2:
+                                case OVRPlugin.SystemHeadset.Rift_CV1:
                                 default:
                                     switch (node)
                                     {
@@ -288,4 +298,4 @@ public override void BeforeRenderUpdate()
         }
 #endif
     }
-}
+}