Merge pull request #1006 from ngokevin/r74

bump three.js to r74 stable (fixes #919)

Author: dmarcos

package.json

@@ -33,7 +33,7 @@
     "present": "0.0.6",
     "request-interval": "^1.0.0",
     "style-attr": "^1.0.2",
-    "three-dev": "^0.74.0-beta8",
+    "three": "^0.74.0",
     "tween.js": "^15.0.0",
     "webvr-polyfill": "borismus/webvr-polyfill#3f47796"
   },

src/index.js

@@ -40,7 +40,7 @@ require('./extras/declarative-events/');
 require('./extras/primitives/');
 
 console.log('A-Frame Version:', pkg.version);
-console.log('three-dev Version:', pkg.dependencies['three-dev']);
+console.log('three Version:', pkg.dependencies['three']);
 console.log('WebVR Polyfill Version:', pkg.dependencies['webvr-polyfill']);
 
 module.exports = window.AFRAME = {

src/lib/three.js

@@ -1,4 +1,4 @@
-var THREE = global.THREE = require('three-dev');
+var THREE = global.THREE = require('three');
 
 // Allow cross-origin images to be loaded.
 
@@ -19,11 +19,11 @@ if (THREE.Cache) {
 }
 
 // TODO: Eventually include these only if they are needed by a component.
-require('../../node_modules/three-dev/examples/js/loaders/OBJLoader');  // THREE.OBJLoader
-require('../../node_modules/three-dev/examples/js/loaders/MTLLoader');  // THREE.MTLLoader
-require('../../node_modules/three-dev/examples/js/loaders/ColladaLoader');  // THREE.ColladaLoader
+require('../../node_modules/three/examples/js/loaders/OBJLoader');  // THREE.OBJLoader
+require('../../node_modules/three/examples/js/loaders/MTLLoader');  // THREE.MTLLoader
+require('../../node_modules/three/examples/js/loaders/ColladaLoader');  // THREE.ColladaLoader
 require('../../vendor/Raycaster');  // THREE.Raycaster
-require('../../node_modules/three-dev/examples/js/controls/VRControls');  // THREE.VRControls
-require('../../node_modules/three-dev/examples/js/effects/VREffect');  // THREE.VREffect
+require('../../node_modules/three/examples/js/controls/VRControls');  // THREE.VRControls
+require('../../node_modules/three/examples/js/effects/VREffect');  // THREE.VREffect
 
 module.exports = THREE;