emit use events even when empty handed

poeticAndroid · Nov 8, 2021 · 19d2167 · 19d2167
1 parent 82b789f
commit 19d2167
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@ Essential game components for [A-Frame](https://aframe.io/)!
 <html>
  <head>
  <script src="https://aframe.io/releases/1.2.0/aframe.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/a-game@0.36.0/dist/a-game.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/a-game@0.37.0/dist/a-game.min.js"></script>
  </head>
  <body>
  <a-scene physics>

diff --git a/dist/a-game.js b/dist/a-game.js
@@ -2,7 +2,7 @@
 module.exports={
  "name": "a-game",
  "title": "A-Game",
- "version": "0.36.0",
+ "version": "0.36.1",
  "description": "game components for A-Frame",
  "homepage": "https://github.com/poeticAndroid/a-game/blob/master/README.md",
  "main": "index.js",
@@ -12,7 +12,7 @@ module.exports={
  "build": "npm run clean && foreach -g src/*.js -x \"browserify #{path} -o dist/#{name}.js\" && npm run minify",
  "watch": "npm run clean && foreach -g src/*.js -C -x \"watchify #{path} -d -o dist/#{name}.js\"",
  "minify": "foreach -g dist/*.js -C -x \"minify #{path} > dist/#{name}.min.js\"",
- "bump": "npm version minor --no-git-tag-version",
+ "bump": "npm version patch --no-git-tag-version",
  "gitadd": "git add package*.json dist/*.js"
  },
  "pre-commit": [
@@ -45,7 +45,7 @@ require("./libs/ensureElement")
 require("./libs/touchGestures")
 require("./libs/betterRaycaster")
 
-setTimeout(() => {
+addEventListener('DOMContentLoaded', e => {
  document.body.addEventListener("swipeup", e => {
  document.body.requestFullscreen()
  })
@@ -529,6 +529,8 @@ AFRAME.registerComponent("grabbing", {
  this[_hand]._lastClick = this[_hand]._lastButton
  this.emit("press", this[_hand].glove, this[_hand]._lastClick, { button: button })
  this[_hand]._lastClick.addState("pressed")
+ } else {
+ this.emit("usedown", this[_hand].glove, this[_hand].grabbed, { button: button })
  }
  },
  useUp(hand = "head", button = 0) {
@@ -541,6 +543,8 @@ AFRAME.registerComponent("grabbing", {
  this.emit("unpress", this[_hand].glove, this[_hand]._lastClick)
  this[_hand]._lastClick.removeState("pressed")
  this[_hand]._lastClick = null
+ } else {
+ this.emit("useup", this[_hand].glove, this[_hand].grabbed, { button: button })
  }
  },
  moveHeadHand(pz = 0, rx = 0, ry = 0, rz = 0) {

diff --git a/dist/a-game.min.js b/dist/a-game.min.js
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
  "name": "a-game",
  "title": "A-Game",
- "version": "0.36.0",
+ "version": "0.36.1",
  "description": "game components for A-Frame",
  "homepage": "https://github.com/poeticAndroid/a-game/blob/master/README.md",
  "main": "index.js",
@@ -11,7 +11,7 @@
  "build": "npm run clean && foreach -g src/*.js -x \"browserify #{path} -o dist/#{name}.js\" && npm run minify",
  "watch": "npm run clean && foreach -g src/*.js -C -x \"watchify #{path} -d -o dist/#{name}.js\"",
  "minify": "foreach -g dist/*.js -C -x \"minify #{path} > dist/#{name}.min.js\"",
- "bump": "npm version minor --no-git-tag-version",
+ "bump": "npm version patch --no-git-tag-version",
  "gitadd": "git add package*.json dist/*.js"
  },
  "pre-commit": [

diff --git a/src/a-game.js b/src/a-game.js
@@ -4,7 +4,7 @@ require("./libs/ensureElement")
 require("./libs/touchGestures")
 require("./libs/betterRaycaster")
 
-setTimeout(() => {
+addEventListener('DOMContentLoaded', e => {
  document.body.addEventListener("swipeup", e => {
  document.body.requestFullscreen()
  })

diff --git a/src/components/grabbing.js b/src/components/grabbing.js
@@ -455,6 +455,8 @@ AFRAME.registerComponent("grabbing", {
  this[_hand]._lastClick = this[_hand]._lastButton
  this.emit("press", this[_hand].glove, this[_hand]._lastClick, { button: button })
  this[_hand]._lastClick.addState("pressed")
+ } else {
+ this.emit("usedown", this[_hand].glove, this[_hand].grabbed, { button: button })
  }
  },
  useUp(hand = "head", button = 0) {
@@ -467,6 +469,8 @@ AFRAME.registerComponent("grabbing", {
  this.emit("unpress", this[_hand].glove, this[_hand]._lastClick)
  this[_hand]._lastClick.removeState("pressed")
  this[_hand]._lastClick = null
+ } else {
+ this.emit("useup", this[_hand].glove, this[_hand].grabbed, { button: button })
  }
  },
  moveHeadHand(pz = 0, rx = 0, ry = 0, rz = 0) {