Autoregister all components. Fixes c-frame#67.

README.md

@@ -77,25 +77,15 @@ npm install --save aframe-extras
 ```
 
 ```javascript
-// custom-extras.js
-
-var extras = require('aframe-extras');
-
-// Register a single component.
-AFRAME.registerComponent('checkpoint', extras.misc.checkpoint);
-
-// Register a particular package, and its dependencies.
-extras.controls.registerAll();
-
-// Register everything.
-extras.registerAll();
+// index.js
+require('aframe-extras');
 ```
 
 Once installed, you'll need to compile your JavaScript using something like [Browserify](http://browserify.org/) or [Webpack](http://webpack.github.io/). Example:
 
 ```bash
 npm install -g browserify
-browserify custom-extras.js -o bundle.js
+browserify index.js -o bundle.js
 ```
 
 `bundle.js` may then be included in your page. See [here](http://browserify.org/#middle-section) for a better introduction to Browserify.

browser.js

@@ -1,2 +1,2 @@
 window.AFRAME = require('aframe');
-require('./').registerAll();
+require('./');

index.js

@@ -1,15 +1,5 @@
-module.exports = {
-  controls:    require('./src/controls'),
-  loaders:     require('./src/loaders'),
-  misc:        require('./src/misc'),
-  pathfinding: require('./src/pathfinding'),
-  primitives:  require('./src/primitives'),
-
-  registerAll: function () {
-    this.controls.registerAll();
-    this.loaders.registerAll();
-    this.misc.registerAll();
-    this.pathfinding.registerAll();
-    this.primitives.registerAll();
-  }
-};
+require('./src/controls');
+require('./src/loaders');
+require('./src/misc');
+require('./src/pathfinding');
+require('./src/primitives');

scripts/build.js

@@ -23,7 +23,7 @@ const writeStream = fs.createWriteStream(path.join(BUILD_DIR, fileName));
 const readStream = new Readable();
 readStream.push([
   'window.AFRAME = require("aframe");',
-  'window.AFRAME.extras = require("./").registerAll();'
+  'require("./");'
 ].join('\n'));
 readStream.push(null);
 browserify()

scripts/dist.js

@@ -16,14 +16,14 @@ const streams = {};
 
 // Full build.
 const stream = new Readable();
-stream.push(`require('./').registerAll();`);
+stream.push(`require('./');`);
 stream.push(null);
 streams['aframe-extras.js'] = stream;
 
 // Individual packages.
 PACKAGES.forEach((name) => {
   const stream = new Readable();
-  stream.push(`require('./src/${name}').registerAll();`);
+  stream.push(`require('./src/${name}');`);
   stream.push(null);
   streams[`aframe-extras.${name}.js`] = stream;
 });
@@ -32,7 +32,7 @@ PACKAGES.forEach((name) => {
 COMPONENTS.forEach((name => {
   const stream = new Readable(),
       basename = path.basename(name);
-  stream.push(`AFRAME.registerComponent('${basename}', require('./src/${name}'));`);
+  stream.push(`require('./src/${name}');`);
   stream.push(null);
   stream._isComponent = true;
   streams[`${basename}.js`] = stream;

src/controls/checkpoint-controls.js

@@ -1,6 +1,6 @@
 var EPS = 0.1;
 
-module.exports = {
+module.exports = AFRAME.registerComponent('checkpoint-controls', {
   schema: {
     enabled: {default: true},
     mode: {default: 'teleport', oneOf: ['teleport', 'animate']},
@@ -80,4 +80,4 @@ module.exports = {
     targetPosition.add(this.checkpoint.components.checkpoint.getOffset());
     offset.copy(targetPosition).sub(position);
   }
-};
+});

src/controls/gamepad-controls.js

@@ -12,7 +12,7 @@ var GamepadButton = require('../../lib/GamepadButton'),
 
 var JOYSTICK_EPS = 0.2;
 
-module.exports = {
+module.exports = AFRAME.registerComponent('gamepad-controls', {
 
   /*******************************************************************
    * Statics
@@ -244,4 +244,4 @@ module.exports = {
   getID: function () {
     return this.getGamepad().id;
   }
-};
+});

src/controls/hmd-controls.js

@@ -1,7 +1,7 @@
 var radToDeg = THREE.Math.radToDeg,
     isMobile = AFRAME.utils.device.isMobile();
 
-module.exports = {
+module.exports = AFRAME.registerComponent('hmd-controls', {
   schema: {
     enabled: {default: true},
     standing: {default: true}
@@ -74,7 +74,7 @@ module.exports = {
     position.setFromMatrixPosition(dolly.matrix);
     return position;
   }
-};
+});
 
 function isNullVector (vector) {
   return vector.x === 0 && vector.y === 0 && vector.z === 0;

src/controls/index.js

@@ -1,25 +1,7 @@
-module.exports = {
-  'checkpoint-controls': require('./checkpoint-controls'),
-  'gamepad-controls':    require('./gamepad-controls'),
-  'hmd-controls':        require('./hmd-controls'),
-  'keyboard-controls':   require('./keyboard-controls'),
-  'mouse-controls':      require('./mouse-controls'),
-  'touch-controls':      require('./touch-controls'),
-  'universal-controls':  require('./universal-controls'),
-
-  registerAll: function (AFRAME) {
-    if (this._registered) return;
-
-    AFRAME = AFRAME || window.AFRAME;
-
-    if (!AFRAME.components['checkpoint-controls'])  AFRAME.registerComponent('checkpoint-controls', this['checkpoint-controls']);
-    if (!AFRAME.components['gamepad-controls'])     AFRAME.registerComponent('gamepad-controls',    this['gamepad-controls']);
-    if (!AFRAME.components['hmd-controls'])         AFRAME.registerComponent('hmd-controls',        this['hmd-controls']);
-    if (!AFRAME.components['keyboard-controls'])    AFRAME.registerComponent('keyboard-controls',   this['keyboard-controls']);
-    if (!AFRAME.components['mouse-controls'])       AFRAME.registerComponent('mouse-controls',      this['mouse-controls']);
-    if (!AFRAME.components['touch-controls'])       AFRAME.registerComponent('touch-controls',      this['touch-controls']);
-    if (!AFRAME.components['universal-controls'])   AFRAME.registerComponent('universal-controls',  this['universal-controls']);
-
-    this._registered = true;
-  }
-};
+require('./checkpoint-controls');
+require('./gamepad-controls');
+require('./hmd-controls');
+require('./keyboard-controls');
+require('./mouse-controls');
+require('./touch-controls');
+require('./universal-controls');

src/controls/keyboard-controls.js

@@ -25,7 +25,7 @@ var KeyboardEvent = window.KeyboardEvent;
  * to the entity when pressing the keys.
  * @param {bool} [enabled=true] - To completely enable or disable the controls
  */
-module.exports = {
+module.exports = AFRAME.registerComponent('keyboard-controls', {
   schema: {
     enabled:           { default: true },
     debug:             { default: false }
@@ -150,4 +150,4 @@ module.exports = {
     return proxyControls && proxyControls.isConnected();
   }
 
-};
+});

src/controls/mouse-controls.js

@@ -5,7 +5,7 @@ document.exitPointerLock = document.exitPointerLock || document.mozExitPointerLo
  *
  * Based on: https://github.com/aframevr/aframe/pull/1056
  */
-module.exports = {
+module.exports = AFRAME.registerComponent('mouse-controls', {
   schema: {
     enabled: { default: true },
     pointerlockEnabled: { default: true },
@@ -145,4 +145,4 @@ module.exports = {
   onPointerLockError: function () {
     this.pointerLocked = false;
   }
-};
+});

src/controls/touch-controls.js

@@ -1,4 +1,7 @@
-module.exports = {
+/**
+ * Touch-to-move-forward controls for mobile.
+ */
+module.exports = AFRAME.registerComponent('touch-controls', {
   schema: {
     enabled: { default: true }
   },
@@ -65,4 +68,4 @@ module.exports = {
     this.isMoving = false;
     e.preventDefault();
   }
-};
+});

src/controls/universal-controls.js

@@ -8,7 +8,7 @@ var COMPONENT_SUFFIX = '-controls',
     MAX_DELTA = 0.2, // ms
     PI_2 = Math.PI / 2;
 
-module.exports = {
+module.exports = AFRAME.registerComponent('universal-controls', {
 
   /*******************************************************************
    * Schema
@@ -215,4 +215,4 @@ module.exports = {
 
     if (AFRAME.components.velocity) this.el.setAttribute('velocity', velocity);
   }
-};
+});

src/loaders/animation-mixer.js

@@ -11,7 +11,7 @@ var LoopMode = {
  * skeletal or morph animations through THREE.AnimationMixer.
  * See: https://threejs.org/docs/?q=animation#Reference/Animation/AnimationMixer
  */
-module.exports = {
+module.exports = AFRAME.registerComponent('animation-mixer', {
   schema: {
     clip:  {default: '*'},
     duration: {default: 0},
@@ -104,7 +104,7 @@ module.exports = {
   tick: function (t, dt) {
     if (this.mixer && !isNaN(dt)) this.mixer.update(dt / 1000);
   }
-};
+});
 
 /**
  * Creates a RegExp from the given string, converting asterisks to .* expressions,

src/loaders/fbx-model.js

@@ -5,7 +5,7 @@ THREE.FBXLoader = require('../../lib/FBXLoader');
  *
  * Loader for FBX format. Supports ASCII, but *not* binary, models.
  */
-module.exports = {
+module.exports = AFRAME.registerComponent('fbx-model', {
   schema: {
     src:         { type: 'asset' },
     crossorigin: { default: '' }
@@ -35,4 +35,4 @@ module.exports = {
   remove: function () {
     if (this.model) this.el.removeObject3D('mesh');
   }
-};
+});

src/loaders/gltf-model-legacy.js

@@ -6,7 +6,7 @@ var LOADER_SRC = 'https://rawgit.com/mrdoob/three.js/r86/examples/js/loaders/GLT
  * Legacy loader for glTF 1.0 models.
  * Asynchronously loads THREE.GLTFLoader from rawgit.
  */
-module.exports = {
+module.exports = AFRAME.registerComponent('gltf-model-legacy', {
   schema: {type: 'model'},
 
   init: function () {
@@ -41,7 +41,7 @@ module.exports = {
     if (!this.model) { return; }
     this.el.removeObject3D('mesh');
   }
-};
+});
 
 var loadLoader = (function () {
   var promise;

src/loaders/index.js

@@ -1,49 +1,6 @@
-module.exports = {
-  'animation-mixer': require('./animation-mixer'),
-  'fbx-model': require('./fbx-model'),
-  'gltf-model-legacy': require('./gltf-model-legacy'),
-  'json-model': require('./json-model'),
-  'object-model': require('./object-model'),
-  'ply-model': require('./ply-model'),
-
-  registerAll: function (AFRAME) {
-    if (this._registered) return;
-
-    AFRAME = AFRAME || window.AFRAME;
-
-    // THREE.AnimationMixer
-    if (!AFRAME.components['animation-mixer']) {
-      AFRAME.registerComponent('animation-mixer', this['animation-mixer']);
-    }
-
-    // THREE.PlyLoader
-    if (!AFRAME.systems['ply-model']) {
-      AFRAME.registerSystem('ply-model', this['ply-model'].System);
-    }
-    if (!AFRAME.components['ply-model']) {
-      AFRAME.registerComponent('ply-model', this['ply-model'].Component);
-    }
-
-    // THREE.FBXLoader
-    if (!AFRAME.components['fbx-model']) {
-      AFRAME.registerComponent('fbx-model', this['fbx-model']);
-    }
-
-    // THREE.GLTFLoader
-    if (!AFRAME.components['gltf-model-legacy']) {
-      AFRAME.registerComponent('gltf-model-legacy', this['gltf-model-legacy']);
-    }
-
-    // THREE.JsonLoader
-    if (!AFRAME.components['json-model']) {
-      AFRAME.registerComponent('json-model', this['json-model']);
-    }
-
-    // THREE.ObjectLoader
-    if (!AFRAME.components['object-model']) {
-      AFRAME.registerComponent('object-model', this['object-model']);
-    }
-
-    this._registered = true;
-  }
-};
+require('./animation-mixer');
+require('./fbx-model');
+require('./gltf-model-legacy');
+require('./json-model');
+require('./object-model');
+require('./ply-model');

src/loaders/json-model.js

@@ -10,7 +10,7 @@
  *
  * See: https://clara.io/learn/user-guide/data_exchange/threejs_export
  */
-module.exports = {
+module.exports = AFRAME.registerComponent('json-model', {
   schema: {
     src:         { type: 'asset' },
     crossorigin: { default: '' }
@@ -55,4 +55,4 @@ module.exports = {
   remove: function () {
     if (this.model) this.el.removeObject3D('mesh');
   }
-};
+});

src/loaders/object-model.js

@@ -10,7 +10,7 @@
  *
  * See: https://clara.io/learn/user-guide/data_exchange/threejs_export
  */
-module.exports = {
+module.exports = AFRAME.registerComponent('object-model', {
   schema: {
     src:         { type: 'asset' },
     crossorigin: { default: '' }
@@ -50,4 +50,4 @@ module.exports = {
   remove: function () {
     if (this.model) this.el.removeObject3D('mesh');
   }
-};
+});

src/loaders/ply-model.js

@@ -10,7 +10,7 @@ THREE.PLYLoader = require('../../lib/PLYLoader');
  *
  * @member cache - Promises that resolve geometries keyed by `src`.
  */
-module.exports.System = {
+module.exports.System = AFRAME.registerSystem('ply-model', {
   init: function () {
     this.cache = {};
   },
@@ -34,9 +34,9 @@ module.exports.System = {
     });
     return cache[src];
   },
-};
+});
 
-module.exports.Component = {
+module.exports.Component = AFRAME.registerComponent('ply-model', {
   schema: {
     skipCache: {type: 'boolean', default: false},
     src: {type: 'asset'}
@@ -67,7 +67,7 @@ module.exports.Component = {
   remove: function () {
     if (this.model) { this.el.removeObject3D('mesh'); }
   }
-};
+});
 
 function createModel (geometry) {
   return new THREE.Mesh(geometry, new THREE.MeshPhongMaterial({