Skip to content

Commit

Permalink
Fix WaveVR controller stop working from last commit
Browse files Browse the repository at this point in the history
  • Loading branch information
@lawwong
lawwong committed Feb 13, 2019
1 parent 36c1d81 commit 05965ac
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 15 deletions.
33 changes: 19 additions & 14 deletions Assets/HTC.UnityPlugin/VRModule/Modules/WaveVRModule.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -194,8 +194,6 @@ private Transform FindWaveVRControllerActionsObjInChildren()
private static readonly VRModuleDeviceModel[] s_type2model;

//private bool m_hasInputFocus;
private WVR_DevicePosePair_t[] m_poses;
private WaveVR_Utils.RigidTransform[] m_posesRT;
private readonly bool[] m_index2deviceTouched = new bool[DEVICE_COUNT];
private IVRModuleDeviceStateRW m_headState;
private IVRModuleDeviceStateRW m_rightState;
Expand Down Expand Up @@ -318,21 +316,22 @@ public override void Update()

var deviceType = s_index2type[deviceIndex];
var deviceInput = WaveVR_Controller.Input(deviceType);
if (deviceInput == null)
if (deviceInput != null)
{
var systemPressed = deviceInput.GetPress(WVR_InputId.WVR_InputId_Alias1_System);
var menuPressed = deviceInput.GetPress(WVR_InputId.WVR_InputId_Alias1_Menu);
var triggerPressed = deviceInput.GetPress(WVR_InputId.WVR_InputId_Alias1_Trigger);
var digitalTriggerPressed = deviceInput.GetPress(digitalTrggerBumpID);
var gripPressed = deviceInput.GetPress(WVR_InputId.WVR_InputId_Alias1_Grip);
var touchpadPressed = deviceInput.GetPress(WVR_InputId.WVR_InputId_Alias1_Touchpad);
var dpadLeftPressed = deviceInput.GetPress(WVR_InputId.WVR_InputId_Alias1_DPad_Left);
var dpadUpPressed = deviceInput.GetPress(WVR_InputId.WVR_InputId_Alias1_DPad_Up);
var dpadRightPressed = deviceInput.GetPress(WVR_InputId.WVR_InputId_Alias1_DPad_Right);
var dpadDownPressed = deviceInput.GetPress(WVR_InputId.WVR_InputId_Alias1_DPad_Down);
currState.SetButtonPress(VRModuleRawButton.System, systemPressed);
currState.SetButtonPress(VRModuleRawButton.ApplicationMenu, menuPressed);
currState.SetButtonPress(VRModuleRawButton.Touchpad, dpadLeftPressed || dpadUpPressed || dpadRightPressed || dpadDownPressed);
currState.SetButtonPress(VRModuleRawButton.Trigger, triggerPressed | digitalTriggerPressed);
currState.SetButtonPress(VRModuleRawButton.Touchpad, touchpadPressed || dpadLeftPressed || dpadUpPressed || dpadRightPressed || dpadDownPressed);
currState.SetButtonPress(VRModuleRawButton.Trigger, triggerPressed || digitalTriggerPressed);
currState.SetButtonPress(VRModuleRawButton.Grip, gripPressed);
currState.SetButtonPress(VRModuleRawButton.DPadLeft, dpadLeftPressed);
currState.SetButtonPress(VRModuleRawButton.DPadUp, dpadUpPressed);
Expand All @@ -344,14 +343,15 @@ public override void Update()
var triggerTouched = deviceInput.GetTouch(WVR_InputId.WVR_InputId_Alias1_Trigger);
var digitalTriggerTouched = deviceInput.GetTouch(digitalTrggerBumpID);
var gripTouched = deviceInput.GetTouch(WVR_InputId.WVR_InputId_Alias1_Grip);
var touchpadTouched = deviceInput.GetTouch(WVR_InputId.WVR_InputId_Alias1_Touchpad);
var dpadLeftTouched = deviceInput.GetTouch(WVR_InputId.WVR_InputId_Alias1_DPad_Left);
var dpadUpTouched = deviceInput.GetTouch(WVR_InputId.WVR_InputId_Alias1_DPad_Up);
var dpadRightTouched = deviceInput.GetTouch(WVR_InputId.WVR_InputId_Alias1_DPad_Right);
var dpadDownTouched = deviceInput.GetTouch(WVR_InputId.WVR_InputId_Alias1_DPad_Down);
currState.SetButtonTouch(VRModuleRawButton.System, systemTouched);
currState.SetButtonTouch(VRModuleRawButton.ApplicationMenu, menuTouched);
currState.SetButtonTouch(VRModuleRawButton.Touchpad, dpadLeftTouched || dpadUpTouched || dpadRightTouched || dpadDownTouched);
currState.SetButtonTouch(VRModuleRawButton.Trigger, triggerTouched | digitalTriggerTouched);
currState.SetButtonTouch(VRModuleRawButton.Touchpad, touchpadTouched || dpadLeftTouched || dpadUpTouched || dpadRightTouched || dpadDownTouched);
currState.SetButtonTouch(VRModuleRawButton.Trigger, triggerTouched || digitalTriggerTouched);
currState.SetButtonTouch(VRModuleRawButton.Grip, gripTouched);
currState.SetButtonTouch(VRModuleRawButton.DPadLeft, dpadLeftTouched);
currState.SetButtonTouch(VRModuleRawButton.DPadUp, dpadUpTouched);
Expand Down Expand Up @@ -379,15 +379,15 @@ public void OnNewPoses(params object[] args)
{
if (WaveVR.Instance == null) { return; }

m_poses = (WVR_DevicePosePair_t[])args[0];
m_posesRT = (WaveVR_Utils.RigidTransform[])args[1];
var poses = (WVR_DevicePosePair_t[])args[0];
var posesRT = (WaveVR_Utils.RigidTransform[])args[1];

FlushDeviceState();

for (int i = 0, imax = m_poses.Length; i < imax; ++i)
for (int i = 0, imax = poses.Length; i < imax; ++i)
{
uint deviceIndex;
var deviceType = m_poses[i].type;
var deviceType = poses[i].type;
if (!TryGetAndTouchDeviceIndexByType(deviceType, out deviceIndex)) { continue; }

IVRModuleDeviceState prevState;
Expand Down Expand Up @@ -434,11 +434,11 @@ public void OnNewPoses(params object[] args)
}

// update pose
var devicePose = m_poses[i].pose;
var devicePose = poses[i].pose;
currState.velocity = new Vector3(devicePose.Velocity.v0, devicePose.Velocity.v1, -devicePose.Velocity.v2);
currState.angularVelocity = new Vector3(-devicePose.AngularVelocity.v0, -devicePose.AngularVelocity.v1, devicePose.AngularVelocity.v2);

var rigidTransform = m_posesRT[i];
var rigidTransform = posesRT[i];
currState.position = rigidTransform.pos;
currState.rotation = rigidTransform.rot;

Expand Down Expand Up @@ -531,9 +531,14 @@ private void ApplyVirtualArmAndSimulateInput(IVRModuleDeviceStateRW ctrlState, I
{
if (!ctrlState.isConnected) { return; }
if (!VIUSettings.waveVRAddVirtualArmTo3DoFController && !VIUSettings.simulateWaveVR6DofController) { return; }
if (ctrlState.position != Vector3.zero) { return; }

var deviceType = (int)s_index2type[ctrlState.deviceIndex];
#if VIU_WAVEVR_2_1_0_OR_NEWER && UNITY_EDITOR
if (!WaveVR.Instance.isSimulatorOn || WaveVR_Utils.WVR_GetDegreeOfFreedom_S() == (int)WVR_NumDoF.WVR_NumDoF_6DoF) { return; }
#else
if (Interop.WVR_GetDegreeOfFreedom((WVR_DeviceType)deviceType) == WVR_NumDoF.WVR_NumDoF_6DoF) { return; }
#endif

if (VIUSettings.simulateWaveVR6DofController)
{
if (Input.GetKeyDown(KeyCode.Alpha1)) { s_simulationMode = Simulate6DoFControllerMode.KeyboardWASD; }
Expand Down
14 changes: 14 additions & 0 deletions Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/Editor/VRPlatformSettings/WaveVRSettings.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,21 @@ public override void OnPreferenceGUI()
{
EditorGUI.indentLevel += 2;

#if VIU_WAVEVR_2_1_0_OR_NEWER
EditorGUILayout.BeginHorizontal();
EditorGUILayout.HelpBox("WaveVR Simulator will be activated in Editor Mode.", MessageType.Info);

s_warningHeight = Mathf.Max(s_warningHeight, GUILayoutUtility.GetLastRect().height);
GUILayout.BeginVertical(GUILayout.Height(s_warningHeight));
GUILayout.FlexibleSpace();
ShowUrlLinkButton("https://hub.vive.com/storage/app/doc/en-us/Simulator.html", "Usage");
GUILayout.FlexibleSpace();
GUILayout.EndVertical();

EditorGUILayout.EndHorizontal();
#else
EditorGUILayout.HelpBox("WaveVR device not supported in Editor Mode. Please run on target device.", MessageType.Info);
#endif

EditorGUI.indentLevel -= 2;
}
Expand Down
2 changes: 1 addition & 1 deletion Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/VIUVersion.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ namespace HTC.UnityPlugin.Vive
{
public static class VIUVersion
{
public static readonly Version current = new Version("1.10.2.1");
public static readonly Version current = new Version("1.10.2.2");
}
}

0 comments on commit 05965ac

Please sign in to comment.