Merge pull request #27 from chenzlabs/ar-raycaster-pass-in-xy

AR raycaster pass in xy
chenzlabs · Mar 23, 2018 · 868ee9c · 868ee9c
2 parents 1b8d1c5 + 3e048e7
commit 868ee9c
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 4 deletions.
diff --git a/dist/aframe-ar.js b/dist/aframe-ar.js
@@ -1133,7 +1133,13 @@
 	  hitAR: function () {
 	    var whichar = this.checkWhichAR();
 	    if (!whichar || !whichar.arDisplay) { return []; }
-	    return whichar.hitAR(this.data.x, this.data.y, this.data.el, this.el);
+	    var x = this.data.x;
+	    var y = this.data.y;
+	    if (arguments.length >= 2) {
+	      x = arguments[0];
+	      y = arguments[1];
+	    }
+	    return whichar.hitAR(x, y, this.data.el, this.el);
 	  },
 
 	  checkWhichAR: function () {

diff --git a/dist/aframe-ar.min.js b/dist/aframe-ar.min.js
diff --git a/dist/aframe-three-ar.js b/dist/aframe-three-ar.js
@@ -1133,7 +1133,13 @@
 	  hitAR: function () {
 	    var whichar = this.checkWhichAR();
 	    if (!whichar || !whichar.arDisplay) { return []; }
-	    return whichar.hitAR(this.data.x, this.data.y, this.data.el, this.el);
+	    var x = this.data.x;
+	    var y = this.data.y;
+	    if (arguments.length >= 2) {
+	      x = arguments[0];
+	      y = arguments[1];
+	    }
+	    return whichar.hitAR(x, y, this.data.el, this.el);
 	  },
 
 	  checkWhichAR: function () {

diff --git a/src/ar-raycaster.js b/src/ar-raycaster.js
@@ -35,7 +35,13 @@ AFRAME.registerComponent('ar-raycaster', {
   hitAR: function () {
     var whichar = this.checkWhichAR();
     if (!whichar || !whichar.arDisplay) { return []; }
-    return whichar.hitAR(this.data.x, this.data.y, this.data.el, this.el);
+    var x = this.data.x;
+    var y = this.data.y;
+    if (arguments.length >= 2) {
+      x = arguments[0];
+      y = arguments[1];
+    }
+    return whichar.hitAR(x, y, this.data.el, this.el);
   },
 
   checkWhichAR: function () {