Fix minor issues

Author: fernandojsg

examples/basic/index.html

@@ -56,6 +56,7 @@
       changeTask: { label: 'Change task' },
       logdefault: { label: 'Test Log' },
       logtask1: { label: 'Test Log Task 1' },
+      logtask2: { label: 'Test Log Task 2' },
       lefthand: { label: 'Left hand' },
       righthand: { label: 'Right hand' },
       longpress: { label: 'Long press' },
@@ -86,10 +87,10 @@
         },
         'vive-controls': {
           'grip.down': 'changeTask',
-          'trackpad.down': 'logdefault',
+          'trackpad.down': 'logtask1',
           'trackpad.doubletouch': 'doubletouch',
           'trackpad.doublepress': 'doublepress',
-          //'trackpad.longpress': 'longpress',
+          // Activators for down, up, touchstart and touchend are optionals you can just write the event without the .
           'trackpaddpadleftdown': 'dpadleft',
           'trackpaddpadright.longpress': 'dpadrightlong'
         },
@@ -106,19 +107,19 @@
       },
       task2: {
         'vive-controls': {
-          'trigger.down': 'logtask1',
+          'trigger.down': 'logtask2',
           'grip.down': 'changeTask'
         },
         'oculus-touch-controls': {
-          'trigger.down': 'logtask1',
+          'trigger.down': 'logtask2',
           'abutton.down': 'changeTask'
         },
         'windows-motion-controls': {
-          'trigger.down': 'logtask1',
+          'trigger.down': 'logtask2',
           'grip.down': 'changeTask'
         },
         keyboard: {
-          'y_up': 'logtask1',
+          'y_up': 'logtask2',
           'c_up': 'changeTask'
         }
       }
@@ -159,7 +160,7 @@
       logEvent(event);
     });
 
-    var events = ['dpadleft', 'dpadrightlong', 'dpad', 'logtask1', 'logdefault', 'righthand', 'lefthand', 'doubletouch', 'doublepress', 'longpress'];
+    var events = ['dpadleft', 'dpadrightlong', 'dpad', 'logtask1', 'logtask2', 'logdefault', 'righthand', 'lefthand', 'doubletouch', 'doublepress', 'longpress'];
     for (var i = 0; i < events.length; i++) {
       scene.addEventListener(events[i], function(event) { 
         logEvent(event); 

src/activators/doublepress.js

@@ -20,7 +20,7 @@ DoublePress.prototype = {
     }
   },
 
-  destroy () {
+  removeListeners () {
     this.el.removeEventListener(this.eventName, this.onButtonDown);
   }
 }

src/behaviours/dpad.js

@@ -9,27 +9,13 @@ function DPad (el, buttonName) {
   this.el = el;
 };
 
-const angleToDirection = function(angle) {
-  angle = (angle * THREE.Math.RAD2DEG + 180 + 45) % 360;
-  if (angle > 0 && angle < 90) {
-    return "down";
-  } else if (angle >= 90 && angle < 180) {
-    return "left";
-  } else if (angle >= 180 && angle < 270) {
-    return "up";
-  } else {
-    return "right";
-  }
-};
-
 DPad.prototype = {
   onAxisMove: function(event) {
     this.lastPos = event.detail.axis;
   },
 
   onButtonPresed: function (event) {
     const [x, y] = this.lastPos;
-    //const { upEvents, centerZone } = this.data;
     const state = 'trackpadup'.includes(event.type) ? "up" : "down";
     var centerZone = 0.5;
     const direction =
@@ -40,14 +26,32 @@ DPad.prototype = {
           : angleToDirection(Math.atan2(x, y));
 
     this.el.emit(`${this.buttonName}dpad${direction}${state}`);
-    console.log(`${this.buttonName}dpad${direction}${state}`);
 
     if (state === "down") {
       this.lastDirection = direction;
     } else {
       delete this.lastDirection;
     }
+  },
+
+  removeListeners: function () {
+    el.removeEventListener('trackpaddown', this.onButtonPresed);
+    el.removeEventListener('trackpadup', this.onButtonPresed);
+    el.removeEventListener('axismove', this.onAxisMove);
+  }
+};
+
+const angleToDirection = function (angle) {
+  angle = (angle * THREE.Math.RAD2DEG + 180 + 45) % 360;
+  if (angle > 0 && angle < 90) {
+    return "down";
+  } else if (angle >= 90 && angle < 180) {
+    return "left";
+  } else if (angle >= 180 && angle < 270) {
+    return "up";
+  } else {
+    return "right";
   }
 };
 
-AFRAME.registerInputBehaviour('dpad', DPad);
+AFRAME.registerInputBehaviour('dpad', DPad);