From 7d235491ce2a703f71448763bb29a68602bad2c2 Mon Sep 17 00:00:00 2001
From: Kevin Lee <kevin@infinite-lee.com>
Date: Thu, 30 Aug 2018 17:16:50 -0700
Subject: [PATCH] fix issue where spawning pen in hud was frame behind causing
issues.
---
src/components/in-world-hud.js | 4 ++--
src/utils/action-event-handler.js | 2 ++
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/components/in-world-hud.js b/src/components/in-world-hud.js
index cdf18ee62..1bee398de 100644
--- a/src/components/in-world-hud.js
+++ b/src/components/in-world-hud.js
@@ -50,7 +50,7 @@ AFRAME.registerComponent("in-world-hud", {
this.mic.addEventListener("click", this.onMicClick);
this.freeze.addEventListener("click", this.onFreezeClick);
- this.pen.addEventListener("click", this.onPenClick);
+ this.pen.addEventListener("mousedown", this.onPenClick);
},
pause() {
@@ -59,6 +59,6 @@ AFRAME.registerComponent("in-world-hud", {
this.mic.removeEventListener("click", this.onMicClick);
this.freeze.removeEventListener("click", this.onFreezeClick);
- this.pen.removeEventListener("click", this.onPenClick);
+ this.pen.removeEventListener("mousedown", this.onPenClick);
}
});
diff --git a/src/utils/action-event-handler.js b/src/utils/action-event-handler.js
index 3faacd7d7..8d01220ee 100644
--- a/src/utils/action-event-handler.js
+++ b/src/utils/action-event-handler.js
@@ -68,6 +68,8 @@ export default class ActionEventHandler {
let scrollX = e.detail.axis[0] * SCROLL_MODIFIER;
scrollX = Math.abs(scrollX) > SCROLL_THRESHOLD ? scrollX : 0;
+ this.isCursorInteracting = this.cursor.isInteracting();
+
if (
Math.abs(scrollY) > 0 &&
(this.lastVerticalScrollTime === 0 || this.lastVerticalScrollTime + VERTICAL_SCROLL_TIMEOUT < Date.now())
--
GitLab