From 0f233fc784bfc85de2343c09afea386e10ccf6c7 Mon Sep 17 00:00:00 2001
From: johnshaughnessy <johnfshaughnessy@gmail.com>
Date: Fri, 9 Nov 2018 10:42:14 -0800
Subject: [PATCH] Cleanup
---
.../userinput/bindings/keyboard-mouse-user.js | 6 ----
.../userinput/bindings/oculus-touch-user.js | 28 +++++++------------
src/systems/userinput/bindings/vive-user.js | 22 +++++++--------
.../userinput/devices/app-aware-mouse.js | 3 +-
src/systems/userinput/paths.js | 1 -
src/systems/userinput/resolve-action-sets.js | 8 +-----
src/systems/userinput/sets.js | 1 -
src/systems/userinput/userinput-debug.js | 2 +-
src/systems/userinput/userinput.js | 2 +-
9 files changed, 25 insertions(+), 48 deletions(-)
diff --git a/src/systems/userinput/bindings/keyboard-mouse-user.js b/src/systems/userinput/bindings/keyboard-mouse-user.js
index 53f1f2362..9e42e5511 100644
--- a/src/systems/userinput/bindings/keyboard-mouse-user.js
+++ b/src/systems/userinput/bindings/keyboard-mouse-user.js
@@ -341,12 +341,6 @@ export const keyboardMouseUserBindings = addSetsToBindings({
dest: { value: paths.noop },
xform: xforms.noop,
priority: 1000
- },
- {
- src: { value: "/device/keyboard/l" },
- dest: { value: paths.actions.logDebugFrame },
- xform: xforms.rising,
- priority: 1100
}
]
});
diff --git a/src/systems/userinput/bindings/oculus-touch-user.js b/src/systems/userinput/bindings/oculus-touch-user.js
index dcf391419..275be0dfe 100644
--- a/src/systems/userinput/bindings/oculus-touch-user.js
+++ b/src/systems/userinput/bindings/oculus-touch-user.js
@@ -72,6 +72,16 @@ const rightTriggerPressed2 = v("rightTriggerPressed2");
export const oculusTouchUserBindings = addSetsToBindings({
[sets.global]: [
+ {
+ src: [ensureFrozenViaButtons, ensureFrozenViaKeyboard],
+ dest: { value: paths.actions.ensureFrozen },
+ xform: xforms.any
+ },
+ {
+ src: [thawViaButtons, thawViaKeyboard],
+ dest: { value: paths.actions.thaw },
+ xform: xforms.any
+ },
{
src: {
value: leftButton("grip").pressed
@@ -781,30 +791,12 @@ export const oculusTouchUserBindings = addSetsToBindings({
],
[sets.rightHandHoveringOnNothing]: [],
- [sets.globalPost]: [
- {
- src: [ensureFrozenViaButtons, ensureFrozenViaKeyboard],
- dest: { value: paths.actions.ensureFrozen },
- xform: xforms.any
- },
- {
- src: [thawViaButtons, thawViaKeyboard],
- dest: { value: paths.actions.thaw },
- xform: xforms.any
- }
- ],
[sets.inputFocused]: [
{
src: { value: "/device/keyboard" },
dest: { value: paths.noop },
xform: xforms.noop,
priority: 1000
- },
- {
- src: { value: "/device/keyboard/l" },
- dest: { value: paths.actions.logDebugFrame },
- xform: xforms.rising,
- priority: 1100
}
]
});
diff --git a/src/systems/userinput/bindings/vive-user.js b/src/systems/userinput/bindings/vive-user.js
index 014c04853..e3a8e5d39 100644
--- a/src/systems/userinput/bindings/vive-user.js
+++ b/src/systems/userinput/bindings/vive-user.js
@@ -87,6 +87,16 @@ const leftGripFallingWhileHoldingPen = v("leftGripFallingWhileHoldingPen");
export const viveUserBindings = addSetsToBindings({
[sets.global]: [
+ {
+ src: [ensureFrozenViaDpad, ensureFrozenViaKeyboard],
+ dest: { value: paths.actions.ensureFrozen },
+ xform: xforms.any
+ },
+ {
+ src: [thawViaDpad, thawViaKeyboard],
+ dest: { value: paths.actions.thaw },
+ xform: xforms.any
+ },
{
src: {
value: lButton("grip").pressed
@@ -938,17 +948,5 @@ export const viveUserBindings = addSetsToBindings({
xform: xforms.falling,
priority: 3
}
- ],
- [sets.globalPost]: [
- {
- src: [ensureFrozenViaDpad, ensureFrozenViaKeyboard],
- dest: { value: paths.actions.ensureFrozen },
- xform: xforms.any
- },
- {
- src: [thawViaDpad, thawViaKeyboard],
- dest: { value: paths.actions.thaw },
- xform: xforms.any
- }
]
});
diff --git a/src/systems/userinput/devices/app-aware-mouse.js b/src/systems/userinput/devices/app-aware-mouse.js
index de5f4acec..4ceb23763 100644
--- a/src/systems/userinput/devices/app-aware-mouse.js
+++ b/src/systems/userinput/devices/app-aware-mouse.js
@@ -32,6 +32,7 @@ export class AppAwareMouseDevice {
}
const buttonLeft = frame[paths.device.mouse.buttonLeft];
+ const buttonRight = frame[paths.device.mouse.buttonRight];
if (buttonLeft && !this.prevButtonLeft) {
const rawIntersections = [];
this.cursorController.raycaster.intersectObjects(this.cursorController.targets, true, rawIntersections);
@@ -50,7 +51,7 @@ export class AppAwareMouseDevice {
this.clickedOnAnything = false;
}
- if (!this.clickedOnAnything && buttonLeft) {
+ if ((!this.clickedOnAnything && buttonLeft) || buttonRight) {
frame[paths.device.smartMouse.cameraDelta] = frame[paths.device.mouse.movementXY];
}
diff --git a/src/systems/userinput/paths.js b/src/systems/userinput/paths.js
index 7f38c58cb..d29de9885 100644
--- a/src/systems/userinput/paths.js
+++ b/src/systems/userinput/paths.js
@@ -1,7 +1,6 @@
export const paths = {};
paths.noop = "/noop";
paths.actions = {};
-paths.actions.log = "/actions/log";
paths.actions.toggleScreenShare = "/actions/toggleScreenShare";
paths.actions.snapRotateLeft = "/actions/snapRotateLeft";
paths.actions.snapRotateRight = "/actions/snapRotateRight";
diff --git a/src/systems/userinput/resolve-action-sets.js b/src/systems/userinput/resolve-action-sets.js
index 5c2a38869..7ec2d1440 100644
--- a/src/systems/userinput/resolve-action-sets.js
+++ b/src/systems/userinput/resolve-action-sets.js
@@ -98,24 +98,18 @@ export function resolveActionSets() {
cursorHand.has("hover-start") &&
cursorHand.get("hover-start").matches(".pen, .pen *");
const cursorHoldingInteractable =
- cursorController.enabled &&
!rightHandTeleporting &&
cursorHand.has("grab-start") &&
cursorHand.get("grab-start").matches(".interactable, .interactable *");
const cursorHoldingPen =
- cursorController.enabled &&
- !rightHandTeleporting &&
- cursorHand.has("grab-start") &&
- cursorHand.get("grab-start").matches(".pen, .pen *");
+ !rightHandTeleporting && cursorHand.has("grab-start") && cursorHand.get("grab-start").matches(".pen, .pen *");
const cursorHoldingCamera =
- cursorController.enabled &&
!rightTeleporter.active &&
cursorHand.has("grab-start") &&
cursorHand.get("grab-start").matches(".icamera, .icamera *");
const cursorHoveringOnNothing =
- cursorController.enabled &&
!rightHandTeleporting &&
!rightHandHovering &&
!rightHandGrabbing &&
diff --git a/src/systems/userinput/sets.js b/src/systems/userinput/sets.js
index 293179f1b..e29d0489e 100644
--- a/src/systems/userinput/sets.js
+++ b/src/systems/userinput/sets.js
@@ -25,4 +25,3 @@ sets.leftHandHoldingPen = "leftHandHoldingPen";
sets.leftHandHoldingCamera = "leftHandHoldingCamera";
sets.leftHandHoldingInteractable = "leftHandHoldingInteractable";
sets.leftHandHoveringOnNothing = "leftHandHoveringOnNothing";
-sets.globalPost = "globalPost";
diff --git a/src/systems/userinput/userinput-debug.js b/src/systems/userinput/userinput-debug.js
index 73e30e3db..20cdb4560 100644
--- a/src/systems/userinput/userinput-debug.js
+++ b/src/systems/userinput/userinput-debug.js
@@ -7,7 +7,7 @@ AFRAME.registerSystem("userinput-debug", {
return;
}
const userinput = AFRAME.scenes[0].systems.userinput;
- if (userinput.get(paths.actions.logDebugFrame) || userinput.get(paths.actions.log)) {
+ if (userinput.get(paths.actions.logDebugFrame)) {
console.log(userinput);
console.log("sorted", userinput.sortedBindings);
console.log("actives", userinput.actives);
diff --git a/src/systems/userinput/userinput.js b/src/systems/userinput/userinput.js
index bea1f9b7d..c813552c6 100644
--- a/src/systems/userinput/userinput.js
+++ b/src/systems/userinput/userinput.js
@@ -156,7 +156,7 @@ AFRAME.registerSystem("userinput", {
init() {
this.frame = {};
- this.activeSets = new Set([sets.global, sets.globalPost]);
+ this.activeSets = new Set([sets.global]);
this.pendingSetChanges = [];
this.xformStates = new Map();
this.activeDevices = new Set([new MouseDevice(), new AppAwareMouseDevice(), new KeyboardDevice(), new HudDevice()]);
--
GitLab