Bump A-Frame to v0.8.0 release

wmurphyrd · wmurphyrd · commit f0ad63680e13 · 2018-03-11T21:24:37.000-05:00
Fix position/scale references in machinima tests
Skip progressive-controls related machinima tests (controller
connections no longer being spoofed succesffuly by
aframe-motion-capture-components).
Update example A-Frame links
diff --git a/README.md b/README.md
@@ -83,7 +83,7 @@ Install and use by directly including the [browser files](dist):
 ```html
 <head>
   <title>Most Basic Super-Hands Example</title>
-  <script src="https://aframe.io/releases/0.7.1/aframe.min.js"></script>
+  <script src="https://aframe.io/releases/0.8.0/aframe.min.js"></script>
   <script src="//cdn.rawgit.com/donmccurdy/aframe-extras/v3.12.4/dist/aframe-extras.min.js"></script>
   <script src="https://unpkg.com/super-hands@2.1.0/dist/super-hands.min.js"></script>
 </head>
diff --git a/dist/super-hands.js b/dist/super-hands.js
@@ -1,4 +1,4 @@
-(function(){function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s}return e})()({1:[function(require,module,exports){
+(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
 'use strict';
 
 /* global AFRAME */
@@ -186,9 +186,9 @@ AFRAME.registerComponent('super-hands', {
   },
   onStretchEndButton: function (evt) {
     const stretched = this.state.get(this.STRETCH_EVENT);
-    const endEvt = { hand: this.el, buttonEvent: evt
-      // check if end event accepted
-    };if (stretched && !this.emitCancelable(stretched, this.UNSTRETCH_EVENT, endEvt)) {
+    const endEvt = { hand: this.el, buttonEvent: evt };
+    // check if end event accepted
+    if (stretched && !this.emitCancelable(stretched, this.UNSTRETCH_EVENT, endEvt)) {
       this.promoteHoveredEl(stretched);
       this.state.delete(this.STRETCH_EVENT);
       this.hover();
@@ -522,6 +522,7 @@ AFRAME.registerComponent('locomotor-auto-config', {
     if (this.data.camera) {
       if (!document.querySelector('a-camera, [camera]')) {
         let cam = document.createElement('a-camera');
+        cam.setAttribute('position', '0 1.6 0');
         this.el.appendChild(cam);
       }
     }
@@ -1121,9 +1122,9 @@ AFRAME.registerComponent('grabbable', inherit(base, {
     this.deltaPositionIsValid = false;
     this.grabDistance = undefined;
     this.grabDirection = { x: 0, y: 0, z: -1 };
-    this.grabOffset = { x: 0, y: 0, z: 0
-      // persistent object speeds up repeat setAttribute calls
-    };this.destPosition = { x: 0, y: 0, z: 0 };
+    this.grabOffset = { x: 0, y: 0, z: 0 };
+    // persistent object speeds up repeat setAttribute calls
+    this.destPosition = { x: 0, y: 0, z: 0 };
     this.deltaPosition = new THREE.Vector3();
     this.targetPosition = new THREE.Vector3();
     this.physicsInit();
diff --git a/dist/super-hands.min.js b/dist/super-hands.min.js
diff --git a/examples/build.js b/examples/build.js
@@ -1,4 +1,4 @@
-(function(){function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s}return e})()({1:[function(require,module,exports){
+(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
 'use strict';
 
 require('../index.js');
@@ -213,9 +213,9 @@ AFRAME.registerComponent('super-hands', {
   },
   onStretchEndButton: function (evt) {
     const stretched = this.state.get(this.STRETCH_EVENT);
-    const endEvt = { hand: this.el, buttonEvent: evt
-      // check if end event accepted
-    };if (stretched && !this.emitCancelable(stretched, this.UNSTRETCH_EVENT, endEvt)) {
+    const endEvt = { hand: this.el, buttonEvent: evt };
+    // check if end event accepted
+    if (stretched && !this.emitCancelable(stretched, this.UNSTRETCH_EVENT, endEvt)) {
       this.promoteHoveredEl(stretched);
       this.state.delete(this.STRETCH_EVENT);
       this.hover();
@@ -429,24 +429,26 @@ AFRAME.registerComponent('super-hands', {
     this.el.addEventListener(this.data.colliderEndEvent, this.unWatch);
     this.el.addEventListener(this.data.colliderEndEvent, this.unHover);
 
+    // binding order to keep grabEnd from triggering dragover
+    // again before dragDropEnd can delete its carried state
     this.data.grabStartButtons.forEach(b => {
       this.el.addEventListener(b, this.onGrabStartButton);
     });
-    this.data.grabEndButtons.forEach(b => {
-      this.el.addEventListener(b, this.onGrabEndButton);
-    });
     this.data.stretchStartButtons.forEach(b => {
       this.el.addEventListener(b, this.onStretchStartButton);
     });
-    this.data.stretchEndButtons.forEach(b => {
-      this.el.addEventListener(b, this.onStretchEndButton);
-    });
     this.data.dragDropStartButtons.forEach(b => {
       this.el.addEventListener(b, this.onDragDropStartButton);
     });
     this.data.dragDropEndButtons.forEach(b => {
       this.el.addEventListener(b, this.onDragDropEndButton);
     });
+    this.data.stretchEndButtons.forEach(b => {
+      this.el.addEventListener(b, this.onStretchEndButton);
+    });
+    this.data.grabEndButtons.forEach(b => {
+      this.el.addEventListener(b, this.onGrabEndButton);
+    });
   },
   unRegisterListeners: function (data) {
     data = data || this.data;
@@ -547,6 +549,7 @@ AFRAME.registerComponent('locomotor-auto-config', {
     if (this.data.camera) {
       if (!document.querySelector('a-camera, [camera]')) {
         let cam = document.createElement('a-camera');
+        cam.setAttribute('position', '0 1.6 0');
         this.el.appendChild(cam);
       }
     }
@@ -2570,9 +2573,9 @@ AFRAME.registerComponent('grabbable', inherit(base, {
     this.deltaPositionIsValid = false;
     this.grabDistance = undefined;
     this.grabDirection = { x: 0, y: 0, z: -1 };
-    this.grabOffset = { x: 0, y: 0, z: 0
-      // persistent object speeds up repeat setAttribute calls
-    };this.destPosition = { x: 0, y: 0, z: 0 };
+    this.grabOffset = { x: 0, y: 0, z: 0 };
+    // persistent object speeds up repeat setAttribute calls
+    this.destPosition = { x: 0, y: 0, z: 0 };
     this.deltaPosition = new THREE.Vector3();
     this.targetPosition = new THREE.Vector3();
     this.physicsInit();
diff --git a/examples/events/index.html b/examples/events/index.html
@@ -1,7 +1,7 @@
 <html>
   <head>
     <title>A-Frame Super Hands Component - GlobalEventHandler Integration</title>
-    <script src="https://aframe.io/releases/0.7.1/aframe.min.js"></script>
+    <script src="https://aframe.io/releases/0.8.0/aframe.min.js"></script>
     <script src="//cdn.rawgit.com/donmccurdy/aframe-extras/v3.12.4/dist/aframe-extras.min.js"></script>
     <script src="https://rawgit.com/feiss/aframe-environment-component/master/dist/aframe-environment-component.min.js"></script>
     <!-- Replace "../build.js" with the super-hands distribution to run locally:
@@ -34,7 +34,7 @@
         <img id="portals-preview" src="../assets/portals.jpg"></img>
       </a-assets>
       <a-entity progressive-controls="objects: a-box, a-torus-knot, a-link">
-        <a-camera>
+        <a-camera position="0 1.6 0">
           <a-entity class="gazecaster">
             <a-sphere radius="0.02" visible="false" shadow>
             </a-sphere>
diff --git a/examples/locomotion/index.html b/examples/locomotion/index.html
@@ -1,7 +1,7 @@
 <html>
   <head>
     <title>A-Frame Super Hands Component - Hand Locomotion</title>
-    <script src="https://aframe.io/releases/0.7.1/aframe.min.js"></script>
+    <script src="https://aframe.io/releases/0.8.0/aframe.min.js"></script>
     <script src="//cdn.rawgit.com/donmccurdy/aframe-extras/v3.12.4/dist/aframe-extras.min.js"></script>
     <script src="a-painter-loader-component.min.js"></script>
     <!-- Replace "../build.js" with the super-hands distribution to run locally:
diff --git a/examples/mouse/index.html b/examples/mouse/index.html
@@ -1,7 +1,7 @@
 <html>
   <head>
     <title>A-Frame Super Hands Component - Pointer Controls</title>
-    <script src="https://aframe.io/releases/0.7.1/aframe.min.js"></script>
+    <script src="https://aframe.io/releases/0.8.0/aframe.min.js"></script>
     <script src="https://unpkg.com/aframe-event-set-component@^4.0.0/dist/aframe-event-set-component.min.js"></script>
     <script src="https://rawgit.com/feiss/aframe-environment-component/master/dist/aframe-environment-component.min.js"></script>
     <!-- Replace "../build.js" with the super-hands distribution to run locally:
diff --git a/examples/physics/index.html b/examples/physics/index.html
@@ -1,7 +1,7 @@
 <html>
   <head>
     <title>A-Frame Super Hands Component - Vive With Physics</title>
-    <script src="https://aframe.io/releases/0.7.1/aframe.js"></script>
+    <script src="https://aframe.io/releases/0.8.0/aframe.min.js"></script>
     <script src="//cdn.rawgit.com/donmccurdy/aframe-physics-system/v2.1.0/dist/aframe-physics-system.min.js"></script>
     <script src="https://unpkg.com/aframe-event-set-component@^4.0.0/dist/aframe-event-set-component.min.js"></script>
     <script src="https://unpkg.com/aframe-physics-extras/dist/aframe-physics-extras.min.js"></script>
diff --git a/examples/portals.html b/examples/portals.html
@@ -1,7 +1,7 @@
 <html>
   <head>
     <title>A-Frame Super Hands Component - Examples Home</title>
-    <script src="https://aframe.io/releases/0.7.1/aframe.min.js"></script>
+    <script src="https://aframe.io/releases/0.8.0/aframe.min.js"></script>
     <script src="//cdn.rawgit.com/donmccurdy/aframe-extras/v3.12.4/dist/aframe-extras.min.js"></script>
     <script src="https://cdn.rawgit.com/feiss/aframe-environment-component/a33afd32/dist/aframe-environment-component.min.js"></script>
     <script src="https://unpkg.com/aframe-event-set-component@^4.0.0/dist/aframe-event-set-component.min.js"></script>
diff --git a/examples/sticky/index.html b/examples/sticky/index.html
@@ -1,7 +1,7 @@
 <html>
   <head>
     <title>A-Frame Super Hands Component - Sticky Grab</title>
-    <script src="https://aframe.io/releases/0.7.1/aframe.min.js"></script>
+    <script src="https://aframe.io/releases/0.8.0/aframe.min.js"></script>
     <script src="//cdn.rawgit.com/donmccurdy/aframe-extras/v3.12.4/dist/aframe-extras.min.js"></script>
     <script src="//cdn.rawgit.com/donmccurdy/aframe-physics-system/v2.0.0/dist/aframe-physics-system.min.js"></script>
     <script src="https://unpkg.com/aframe-event-set-component@^4.0.0/dist/aframe-event-set-component.min.js"></script>
diff --git a/examples/super-basic/index.html b/examples/super-basic/index.html
@@ -1,6 +1,6 @@
 <head>
   <title>Most Basic Super-Hands Example</title>
-  <script src="https://aframe.io/releases/0.7.1/aframe.min.js"></script>
+  <script src="https://aframe.io/releases/0.8.0/aframe.min.js"></script>
   <script src="//cdn.rawgit.com/donmccurdy/aframe-extras/v3.12.4/dist/aframe-extras.min.js"></script>
   <script src="https://unpkg.com/super-hands@2.1.0/dist/super-hands.min.js"></script>
 </head>
diff --git a/machinima_tests/super_hands/progressive-controls-machinima.test.js b/machinima_tests/super_hands/progressive-controls-machinima.test.js
@@ -2,7 +2,7 @@
 
 const machinima = require('aframe-machinima-testing')
 
-suite('progressive-controls touch interactions', function () {
+suite.skip('progressive-controls touch interactions', function () {
   setup(function (done) {
     this.timeout(0)
     machinima.setupScene('progressive-hands.html')
@@ -68,7 +68,7 @@ suite('progressive-controls touch interactions', function () {
     }
   )
 })
-suite('progressive pointer controls', function () {
+suite.skip('progressive pointer controls', function () {
   setup(function (done) {
     machinima.setupScene('progressive-laser.html')
     this.scene = document.querySelector('a-scene')
diff --git a/machinima_tests/super_hands/super-hands-machinima.test.js b/machinima_tests/super_hands/super-hands-machinima.test.js
@@ -32,8 +32,8 @@ suite('basic interactions', function () {
       assert.isFalse(this.boxGrnDn.is('hovered'))
     },
     function () {
-      this.startPos = this.boxRedUp.getAttribute('position')
-      this.startScale = this.boxRedUp.getAttribute('scale')
+      this.startPos = this.boxRedUp.getAttribute('position').clone()
+      this.startScale = this.boxRedUp.getAttribute('scale').clone()
       assert.equal(this.boxGrnUp.getAttribute('geometry').primitive, 'box')
       assert.equal(this.boxGrnDn.getAttribute('geometry').primitive, 'box')
     }
@@ -121,7 +121,7 @@ suite('Overlapped object targeting', function () {
     function () {
       assert.isAbove(this.inner.getAttribute('position').y, 2)
       assert.isBelow(this.middle.getAttribute('position').y, 0)
-      assert.deepEqual(this.outter.getAttribute('position'), {x: 0, y: 1, z: -1})
+      assert.isTrue(this.outter.getAttribute('position').equals({x: 0, y: 1, z: -1}))
     }
   )
 })
@@ -144,7 +144,7 @@ suite('Nested object targeting', function () {
     function () {
       assert.isBelow(this.inner.getAttribute('position').y, 1.5)
       assert.isBelow(this.middle.getAttribute('position').y, 0)
-      assert.deepEqual(this.outter.getAttribute('position'), {x: 0, y: 1, z: -1})
+      assert.isTrue(this.outter.getAttribute('position').equals({x: 0, y: 1, z: -1}))
     }
   )
 })
@@ -250,8 +250,8 @@ suite('Locomotion', function () {
     function () {
       this.boxGreenTop = document.getElementById('greenHigh')
       this.redBox = document.getElementById('redHigh')
-      this.startPos = this.redBox.getAttribute('position')
-      this.startScale = this.redBox.getAttribute('scale')
+      this.startPos = this.redBox.getAttribute('position').clone()
+      this.startScale = this.redBox.getAttribute('scale').clone()
     }
   )
 })
@@ -271,7 +271,7 @@ suite('camera userHeight', function () {
   })
 })
 
-suite('laser-controls grabbable', function () {
+suite.skip('laser-controls grabbable', function () {
   setup(function (done) {
     machinima.setupScene('hands-laser.html')
     this.scene = document.querySelector('a-scene')
diff --git a/misc_components/locomotor-auto-config.js b/misc_components/locomotor-auto-config.js
@@ -11,6 +11,7 @@ AFRAME.registerComponent('locomotor-auto-config', {
     if (this.data.camera) {
       if (!document.querySelector('a-camera, [camera]')) {
         let cam = document.createElement('a-camera')
+        cam.setAttribute('position', '0 1.6 0')
         this.el.appendChild(cam)
       }
     }
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
