Now ViveInputVirtualButton uses Behaviour.enable to activate

Author: lawwong

Assets/HTC.UnityPlugin/ViveInputUtility/Prefabs/ViveCurvePointers.prefab

@@ -23,6 +23,8 @@ GameObject:
   serializedVersion: 4
   m_Component:
   - 4: {fileID: 419526}
+  - 114: {fileID: 11410246}
+  - 114: {fileID: 11493210}
   m_Layer: 0
   m_Name: ViveCurvePointers
   m_TagString: Untagged
@@ -39,7 +41,6 @@ GameObject:
   m_Component:
   - 4: {fileID: 486948}
   - 114: {fileID: 11431676}
-  - 114: {fileID: 11425968}
   m_Layer: 0
   m_Name: Right
   m_TagString: Untagged
@@ -227,7 +228,6 @@ GameObject:
   m_Component:
   - 4: {fileID: 419388}
   - 114: {fileID: 11427138}
-  - 114: {fileID: 11443274}
   m_Layer: 0
   m_Name: Left
   m_TagString: Untagged
@@ -714,23 +714,23 @@ MeshFilter:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 149512}
   m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
---- !u!114 &11425968
+--- !u!114 &11410246
 MonoBehaviour:
   m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 123148}
+  m_GameObject: {fileID: 112326}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 93ab9066e8186884da64ee239717c741, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_active: 1
-  m_inputsOperator: 0
+  m_combineInputsOperator: 0
   m_inputs:
   - viveRole:
       m_roleTypeFullName: HTC.UnityPlugin.Vive.HandRole
       m_roleValueName: RightHand
+      m_roleValueInt: 0
     button: 1
   m_onVirtualPress:
     m_PersistentCalls:
@@ -790,6 +790,7 @@ MonoBehaviour:
   m_viveRole:
     m_roleTypeFullName: HTC.UnityPlugin.Vive.HandRole
     m_roleValueName: LeftHand
+    m_roleValueInt: 0
 --- !u!114 &11431676
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -804,6 +805,7 @@ MonoBehaviour:
   m_viveRole:
     m_roleTypeFullName: HTC.UnityPlugin.Vive.HandRole
     m_roleValueName: RightHand
+    m_roleValueInt: 0
 --- !u!114 &11434118
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -853,6 +855,7 @@ MonoBehaviour:
   m_viveRole:
     m_roleTypeFullName: HTC.UnityPlugin.Vive.HandRole
     m_roleValueName: LeftHand
+    m_roleValueInt: 0
   m_mouseButtonLeft: 0
   m_mouseButtonMiddle: 2
   m_mouseButtonRight: 1
@@ -876,68 +879,6 @@ MonoBehaviour:
   showOnHitOnly: 1
   hitTarget: {fileID: 0}
   hitDistance: 0
---- !u!114 &11443274
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 182204}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 93ab9066e8186884da64ee239717c741, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_active: 1
-  m_inputsOperator: 0
-  m_inputs:
-  - viveRole:
-      m_roleTypeFullName: HTC.UnityPlugin.Vive.HandRole
-      m_roleValueName: LeftHand
-    button: 1
-  m_onVirtualPress:
-    m_PersistentCalls:
-      m_Calls: []
-    m_TypeName: HTC.UnityPlugin.Vive.ViveInputVirtualButton+OutputEvent, Assembly-CSharp,
-      Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_onVirtualClick:
-    m_PersistentCalls:
-      m_Calls: []
-    m_TypeName: HTC.UnityPlugin.Vive.ViveInputVirtualButton+OutputEvent, Assembly-CSharp,
-      Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_onVirtualPressDown:
-    m_PersistentCalls:
-      m_Calls:
-      - m_Target: {fileID: 182204}
-        m_MethodName: SetActive
-        m_Mode: 6
-        m_Arguments:
-          m_ObjectArgument: {fileID: 0}
-          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
-          m_IntArgument: 0
-          m_FloatArgument: 0
-          m_StringArgument: 
-          m_BoolArgument: 1
-        m_CallState: 2
-    m_TypeName: HTC.UnityPlugin.Vive.ViveInputVirtualButton+OutputEvent, Assembly-CSharp,
-      Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_onVirtualPressUp:
-    m_PersistentCalls:
-      m_Calls:
-      - m_Target: {fileID: 182204}
-        m_MethodName: SetActive
-        m_Mode: 6
-        m_Arguments:
-          m_ObjectArgument: {fileID: 0}
-          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
-          m_IntArgument: 0
-          m_FloatArgument: 0
-          m_StringArgument: 
-          m_BoolArgument: 0
-        m_CallState: 2
-    m_TypeName: HTC.UnityPlugin.Vive.ViveInputVirtualButton+OutputEvent, Assembly-CSharp,
-      Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_toggleGameObjectOnVirtualClick: []
-  m_toggleComponentOnVirtualClick: []
 --- !u!114 &11447226
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -1000,6 +941,7 @@ MonoBehaviour:
   m_viveRole:
     m_roleTypeFullName: HTC.UnityPlugin.Vive.HandRole
     m_roleValueName: RightHand
+    m_roleValueInt: 0
   m_mouseButtonLeft: 0
   m_mouseButtonMiddle: 2
   m_mouseButtonRight: 1
@@ -1084,6 +1026,7 @@ MonoBehaviour:
   m_viveRole:
     m_roleTypeFullName: HTC.UnityPlugin.Vive.HandRole
     m_roleValueName: RightHand
+    m_roleValueInt: 0
   onIsValidChanged:
     m_PersistentCalls:
       m_Calls:
@@ -1140,6 +1083,7 @@ MonoBehaviour:
   m_viveRole:
     m_roleTypeFullName: HTC.UnityPlugin.Vive.HandRole
     m_roleValueName: LeftHand
+    m_roleValueInt: 0
   onIsValidChanged:
     m_PersistentCalls:
       m_Calls:
@@ -1195,6 +1139,68 @@ MonoBehaviour:
   segmentLength: 0.05
   raycaster: {fileID: 11451150}
   lineRenderer: {fileID: 12027144}
+--- !u!114 &11493210
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 112326}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 93ab9066e8186884da64ee239717c741, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_combineInputsOperator: 0
+  m_inputs:
+  - viveRole:
+      m_roleTypeFullName: HTC.UnityPlugin.Vive.HandRole
+      m_roleValueName: LeftHand
+      m_roleValueInt: 0
+    button: 1
+  m_onVirtualPress:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: HTC.UnityPlugin.Vive.ViveInputVirtualButton+OutputEvent, Assembly-CSharp,
+      Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_onVirtualClick:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: HTC.UnityPlugin.Vive.ViveInputVirtualButton+OutputEvent, Assembly-CSharp,
+      Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_onVirtualPressDown:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 182204}
+        m_MethodName: SetActive
+        m_Mode: 6
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 1
+        m_CallState: 2
+    m_TypeName: HTC.UnityPlugin.Vive.ViveInputVirtualButton+OutputEvent, Assembly-CSharp,
+      Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_onVirtualPressUp:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 182204}
+        m_MethodName: SetActive
+        m_Mode: 6
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
+    m_TypeName: HTC.UnityPlugin.Vive.ViveInputVirtualButton+OutputEvent, Assembly-CSharp,
+      Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_toggleGameObjectOnVirtualClick: []
+  m_toggleComponentOnVirtualClick: []
 --- !u!114 &11496304
 MonoBehaviour:
   m_ObjectHideFlags: 1

Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/ViveInput/Editor/ViveInputVirtualButtonEditor.cs

@@ -38,7 +38,6 @@ static ViveInputVirtualButtonEditor()
         protected virtual void OnEnable()
         {
             m_scriptProp = serializedObject.FindProperty("m_Script");
-            m_activateProp = serializedObject.FindProperty("m_active");
             m_logicGateProp = serializedObject.FindProperty("m_combineInputsOperator");
             m_inputsProp = serializedObject.FindProperty("m_inputs");
             m_onPressProp = serializedObject.FindProperty("m_onVirtualPress");
@@ -60,8 +59,6 @@ public override void OnInspectorGUI()
             EditorGUILayout.PropertyField(m_scriptProp);
             GUI.enabled = true;
 
-            EditorGUILayout.PropertyField(m_activateProp);
-
             if (m_inputsProp.arraySize > 1)
             {
                 EditorGUILayout.PropertyField(m_logicGateProp);