From 2d441669ccb624906ff557163cf953958414e606 Mon Sep 17 00:00:00 2001
From: Kevin Lee <kevin@infinite-lee.com>
Date: Thu, 23 Aug 2018 11:51:18 -0700
Subject: [PATCH] get rid of "tertiary" input events since they're handled by
scrolling now.
---
src/hub.html | 12 ++++++------
src/input-mappings.js | 18 +++++++-----------
2 files changed, 13 insertions(+), 17 deletions(-)
diff --git a/src/hub.html b/src/hub.html
index bed2602ea..3dd02ffd4 100644
--- a/src/hub.html
+++ b/src/hub.html
@@ -196,10 +196,10 @@
hoverable
activatable__draw-hand="buttonStartEvents: secondary_hand_grab; buttonEndEvents: secondary_hand_release;"
activatable__draw-cursor="buttonStartEvents: secondary-cursor-grab; buttonEndEvents: secondary-cursor-release;"
- activatable__color-next="buttonStartEvents: tertiary_action_north, scroll_up; buttonEndEvents: thumb_up, secondary_hand_release, vertical_scroll_release; activatedState: colorNext;"
- activatable__color-prev="buttonStartEvents: tertiary_action_south, scroll_down; buttonEndEvents: thumb_up, secondary_hand_release, vertical_scroll_release; activatedState: colorPrev;"
- activatable__increase-radius="buttonStartEvents: tertiary_action_east, scroll_right; buttonEndEvents: thumb_up, secondary_hand_release, horizontal_scroll_release; activatedState: radiusUp;"
- activatable__decrease-radius="buttonStartEvents: tertiary_action_west, scroll_left; buttonEndEvents: thumb_up, secondary_hand_release, horizontal_scroll_release; activatedState: radiusDown;"
+ activatable__color-next="buttonStartEvents: next_color, scroll_up; buttonEndEvents: thumb_up, secondary_hand_release, vertical_scroll_release; activatedState: colorNext;"
+ activatable__color-prev="buttonStartEvents: previous_color, scroll_down; buttonEndEvents: thumb_up, secondary_hand_release, vertical_scroll_release; activatedState: colorPrev;"
+ activatable__increase-radius="buttonStartEvents: increase_radius, scroll_right; buttonEndEvents: thumb_up, secondary_hand_release, horizontal_scroll_release; activatedState: radiusUp;"
+ activatable__decrease-radius="buttonStartEvents: decrease_radius, scroll_left; buttonEndEvents: thumb_up, secondary_hand_release, horizontal_scroll_release; activatedState: radiusDown;"
scale="0.5 0.5 0.5"
>
<a-sphere
@@ -264,7 +264,7 @@
stretchEndButtons: primary_hand_release, secondary_hand_release;
dragDropStartButtons: hand_grab, secondary_hand_grab;
dragDropEndButtons: hand_release, secondary_hand_release;
- activateStartButtons: secondary_hand_grab, tertiary_action_north, tertiary_action_south, tertiary_action_east, tertiary_action_west, scroll_up, scroll_down, scroll_left, scroll_right;
+ activateStartButtons: secondary_hand_grab, next_color, previous_color, increase_radius, decrease_radius, scroll_up, scroll_down, scroll_left, scroll_right;
activateEndButtons: secondary_hand_release, vertical_scroll_release, horizontal_scroll_release, thumb_up;"
collision-filter="collisionForces: false"
physics-collider
@@ -304,7 +304,7 @@
stretchEndButtons: cursor-release, primary_hand_release, secondary_hand_release;
dragDropStartButtons: cursor-grab, primary_hand_grab, secondary_hand_grab;
dragDropEndButtons: cursor-release, primary_hand_release, secondary_hand_release;
- activateStartButtons: secondary-cursor-grab, secondary_hand_grab, tertiary_action_north, tertiary_action_south, tertiary_action_east, tertiary_action_west, scroll_up, scroll_down, scroll_left, scroll_right;
+ activateStartButtons: secondary-cursor-grab, secondary_hand_grab, next_color, previous_color, increase_radius, decrease_radius, scroll_up, scroll_down, scroll_left, scroll_right;
activateEndButtons: secondary-cursor-release, secondary_hand_release, vertical_scroll_release, horizontal_scroll_release, thumb_up;"
segments-height="9"
segments-width="9"
diff --git a/src/input-mappings.js b/src/input-mappings.js
index 9826f10b3..2dcd431c1 100644
--- a/src/input-mappings.js
+++ b/src/input-mappings.js
@@ -68,20 +68,18 @@ const config = {
"oculus-touch-controls": {
joystick_dpad4_west: { right: "snap_rotate_left" },
joystick_dpad4_east: { right: "snap_rotate_right" },
- joystick_dpad4_north: { right: "tertiary_action_north" },
- joystick_dpad4_south: { right: "tertiary_action_south" },
joystick_dpad4_center: { left: "action_primary_up", right: "action_primary_up" },
gripdown: ["primary_action_grab", "middle_ring_pinky_down"],
gripup: ["primary_action_release", "middle_ring_pinky_up"],
- abuttontouchstart: ["thumb_down", "tertiary_action_west"],
+ abuttontouchstart: ["thumb_down", "increase_radius"],
abuttontouchend: "thumb_up",
- bbuttontouchstart: ["thumb_down", "tertiary_action_east"],
+ bbuttontouchstart: ["thumb_down", "decrease_radius"],
bbuttontouchend: "thumb_up",
- xbuttontouchstart: ["thumb_down", "tertiary_action_west"],
+ xbuttontouchstart: ["thumb_down", "increase_radius"],
xbuttontouchend: "thumb_up",
- ybuttontouchstart: ["thumb_down", "tertiary_action_east"],
+ ybuttontouchstart: ["thumb_down", "decrease_radius"],
ybuttontouchend: "thumb_up",
- surfacetouchstart: ["thumb_down", "tertiary_action_north"],
+ surfacetouchstart: ["thumb_down", "next_color"],
surfacetouchend: "thumb_up",
thumbsticktouchstart: "thumb_down",
thumbsticktouchend: "thumb_up",
@@ -99,10 +97,8 @@ const config = {
right: "snap_rotate_right"
},
"trackpad.pressedmove": { left: "move" },
- joystick_dpad4_pressed_west_down: { left: "tertiary_action_west", right: "snap_rotate_left" },
- joystick_dpad4_pressed_east_down: { left: "tertiary_action_east", right: "snap_rotate_right" },
- trackpad_dpad4_pressed_north_down: { left: "tertiary_action_north", right: "tertiary_action_north" },
- trackpad_dpad4_pressed_south_down: { left: "tertiary_action_south", right: "tertiary_action_south" },
+ joystick_dpad4_pressed_west_down: { right: "snap_rotate_left" },
+ joystick_dpad4_pressed_east_down: { right: "snap_rotate_right" },
trackpaddown: { right: "action_primary_down" },
trackpadup: { left: "action_primary_up", right: "action_primary_up" },
menudown: "thumb_down",
--
GitLab