ready to be on github

Author: PureDark

CustomKeyEvents/AvatarScriptPack/CustemKeyEvent.cs

@@ -114,97 +114,114 @@ public enum WMRButton
         // Use this for initialization
         void Start()
         {
-            checkVive = true;
-            checkOculus = (KeyCode)OculusTriggerButton != (KeyCode)ViveTriggerButton;
-            checkWMR = (KeyCode)WMRTriggerButton != (KeyCode)ViveTriggerButton && (KeyCode)WMRTriggerButton != (KeyCode)OculusTriggerButton;
+            string model = XRDevice.model != null ? XRDevice.model.ToLower() : "";
+            if (model.Contains("vive"))
+            {
+                checkVive = true;
+                checkOculus = false;
+                checkWMR = false;
+            }
+            else if (model.Contains("oculus"))
+            {
+                checkVive = false;
+                checkOculus = true;
+                checkWMR = false;
+            }
+            else
+            {
+                checkVive = false;
+                checkOculus = false;
+                checkWMR = true;
+            }
         }
 
         // Update is called once per frame
         void Update()
         {
-
-            for(int i = 0; i < 3; i++)
+            KeyCode triggerButton = (checkVive)
+                                           ? (KeyCode)ViveTriggerButton
+                                           : (checkOculus)
+                                           ? (KeyCode)OculusTriggerButton
+                                           : (checkWMR)
+                                           ? (KeyCode)WMRTriggerButton
+                                           : KeyCode.None;
+            if (triggerButton == KeyCode.None)
+                return;
+            bool allowCheck = true;
+            if (triggerButton == (KeyCode)ViveButton.LeftTrigger || triggerButton == (KeyCode)ViveButton.RightTrigger)
             {
-                KeyCode triggerButton = (i == 0 && checkVive)
-                                        ? (KeyCode)ViveTriggerButton
-                                        : (i == 1 && checkOculus)
-                                        ? (KeyCode)OculusTriggerButton
-                                        : (i == 2 && checkWMR)
-                                        ? (KeyCode)WMRTriggerButton
-                                        : KeyCode.None;
-                if (triggerButton == KeyCode.None)
-                    continue;
-                bool allowCheck = true;
-                if (triggerButton == (KeyCode)ViveButton.LeftTrigger || triggerButton == (KeyCode)ViveButton.RightTrigger)
+                //float triggerValue = VRControllersInputManager.TriggerValue((triggerButton == ViveButton.LeftTrigger) ? XRNode.LeftHand : XRNode.RightHand);
+                string axisName = (triggerButton == (KeyCode)ViveButton.LeftTrigger) ? "TriggerLeftHand" : "TriggerRightHand";
+                try
                 {
-                    //float triggerValue = VRControllersInputManager.TriggerValue((triggerButton == ViveButton.LeftTrigger) ? XRNode.LeftHand : XRNode.RightHand);
-                    string axisName = (triggerButton == (KeyCode)ViveButton.LeftTrigger) ? "TriggerLeftHand" : "TriggerRightHand";
-                    try
-                    {
-                        float triggerValue = Input.GetAxis(axisName);
-                        if (triggerValue < 0.1f)
-                            allowCheck = false;
-                    }
-                    catch (Exception e)
-                    {
-                    }
+                    float triggerValue = Input.GetAxis(axisName);
+                    if (triggerValue < 0.1f)
+                        allowCheck = false;
                 }
+                catch (Exception e)
+                {
+                }
+            }
 
-                if (allowCheck && Input.GetKeyDown(triggerButton))
+            if (allowCheck && Input.GetKeyDown(triggerButton))
+            {
+                //Debug.Log(pressedKey + " is pressed");
+                checkDoubleClick = (Time.time - pressTime <= interval);
+                pressTime = Time.time;
+                OnPress();
+                checkLongClick = true;
+                checkClick = false;
+            }
+            else if (allowCheck && Input.GetKey(triggerButton))
+            {
+                //Debug.Log(pressedKey + " is hold");
+                OnHold();
+                if (checkLongClick && Time.time - pressTime >= longClickInterval)
                 {
-                    //Debug.Log(pressedKey + " is pressed");
-                    checkDoubleClick = (Time.time - pressTime <= interval);
-                    pressTime = Time.time;
-                    OnPress();
-                    checkLongClick = true;
-                    checkClick = false;
+                    checkLongClick = false;
+                    OnLongClick();
+                    longClicked = true;
                 }
-                else if (allowCheck && Input.GetKey(triggerButton))
+            }
+            else if (Input.GetKeyUp(triggerButton))
+            {
+                //Debug.Log(pressedKey + " is up");
+                releaseTime = Time.time;
+                OnRelease();
+                if (longClicked)
                 {
-                    //Debug.Log(pressedKey + " is hold");
-                    OnHold();
-                    if (checkLongClick && Time.time - pressTime >= longClickInterval)
-                    {
-                        checkLongClick = false;
-                        OnLongClick();
-                        longClicked = true;
-                    }
+                    OnReleaseAfterLongClick();
+                    longClicked = false;
                 }
-                else if (Input.GetKeyUp(triggerButton))
+                //Debug.Log("GetKeyUp : releaseTime - pressTime = " + (releaseTime - pressTime));
+                if (releaseTime - pressTime <= interval)
                 {
-                    //Debug.Log(pressedKey + " is up");
-                    releaseTime = Time.time;
-                    OnRelease();
-                    if (longClicked)
+                    if (checkDoubleClick)
                     {
-                        OnReleaseAfterLongClick();
-                        longClicked = false;
+                        OnDoubleClick();
                     }
-                    //Debug.Log("GetKeyUp : releaseTime - pressTime = " + (releaseTime - pressTime));
-                    if (releaseTime - pressTime <= interval)
+                    else
                     {
-                        if (checkDoubleClick)
-                        {
-                            OnDoubleClick();
-                        }
-                        else
-                        {
-                            checkClick = true;
-                        }
+                        checkClick = true;
                     }
                 }
-                else if (checkClick && Time.time - releaseTime > interval)
-                {
-                    checkClick = false;
-                    OnClick();
-                }
             }
-            
+            else if (checkClick && Time.time - releaseTime > interval)
+            {
+                checkClick = false;
+                OnClick();
+            }
+
         }
 
         void OnClick()
         {
             //Debug.Log("OnClick");
+            Console.WriteLine("OnClick");
+            foreach(MonoBehaviour comp in gameObject.GetComponentsInChildren<MonoBehaviour>())
+            {
+                Console.WriteLine("name: " + comp.name + " : " + comp);
+            }
             clickEvents.Invoke();
         }
 

CustomKeyEvents/AvatarScriptPack/ShapeKeyAnimation.cs

@@ -62,7 +62,6 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AvatarScriptPack\CustemKeyEvent.cs" />
-    <Compile Include="AvatarScriptPack\ShapeKeyAnimation.cs" />
     <Compile Include="Plugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="ReflectionUtil.cs" />

CustomKeyEvents/CustomKeyEvents.csproj

@@ -1,9 +1,7 @@
 using IllusionPlugin;
-using System;
 using System.IO;
 using UnityEngine;
 using UnityEngine.SceneManagement;
-using Xft;
 
 namespace CustomKeyEvents
 {