Change 'defaultAttributes' to 'defaultComponents' in primitive defini…

…tions.
aframevr · ngokevin · May 23, 2016 · May 12, 2016 · May 12, 2016 · May 13, 2016
commit 6fc595c60fe7d884271d1e94f61cad13070ac761
diff --git a/src/core/.a-entity.js.swp b/src/core/.a-entity.js.swp
diff --git a/src/extras/primitives/.registerPrimitive.js.swp b/src/extras/primitives/.registerPrimitive.js.swp
diff --git a/src/extras/primitives/getMeshMixin.js b/src/extras/primitives/getMeshMixin.js
@@ -3,7 +3,7 @@
  */
 module.exports = function getMeshMixin () {
   return {
-    defaultAttributes: {
+    defaultComponents: {
       material: { }
     },
 

diff --git a/src/extras/primitives/primitives/a-box.js b/src/extras/primitives/primitives/a-box.js
@@ -3,7 +3,7 @@ var registerPrimitive = require('../registerPrimitive');
 var utils = require('../../../utils/');
 
 var boxDefinition = utils.extendDeep({}, getMeshMixin(), {
-  defaultAttributes: {
+  defaultComponents: {
     geometry: {
       primitive: 'box'
     }

diff --git a/src/extras/primitives/primitives/a-camera.js b/src/extras/primitives/primitives/a-camera.js
@@ -1,7 +1,7 @@
 var registerPrimitive = require('../registerPrimitive');
 
 registerPrimitive('a-camera', {
-  defaultAttributes: {
+  defaultComponents: {
     camera: {},
     'look-controls': {},
     'wasd-controls': {}

diff --git a/src/extras/primitives/primitives/a-circle.js b/src/extras/primitives/primitives/a-circle.js
@@ -3,7 +3,7 @@ var registerPrimitive = require('../registerPrimitive');
 var utils = require('../../../utils/');
 
 registerPrimitive('a-circle', utils.extendDeep({}, getMeshMixin(), {
-  defaultAttributes: {
+  defaultComponents: {
     geometry: {
       primitive: 'circle'
     }

diff --git a/src/extras/primitives/primitives/a-cone.js b/src/extras/primitives/primitives/a-cone.js
@@ -3,7 +3,7 @@ var registerPrimitive = require('../registerPrimitive');
 var utils = require('../../../utils/');
 
 registerPrimitive('a-cone', utils.extendDeep({}, getMeshMixin(), {
-  defaultAttributes: {
+  defaultComponents: {
     geometry: {
       primitive: 'cone'
     }

diff --git a/src/extras/primitives/primitives/a-cursor.js b/src/extras/primitives/primitives/a-cursor.js
@@ -3,7 +3,7 @@ var registerPrimitive = require('../registerPrimitive');
 var utils = require('../../../utils/');
 
 registerPrimitive('a-cursor', utils.extendDeep({}, getMeshMixin(), {
-  defaultAttributes: {
+  defaultComponents: {
     cursor: {},
     geometry: {
       primitive: 'ring',

diff --git a/src/extras/primitives/primitives/a-curvedimage.js b/src/extras/primitives/primitives/a-curvedimage.js
@@ -3,7 +3,7 @@ var registerPrimitive = require('../registerPrimitive');
 var utils = require('../../../utils/');
 
 registerPrimitive('a-curvedimage', utils.extendDeep({}, getMeshMixin(), {
-  defaultAttributes: {
+  defaultComponents: {
     geometry: {
       height: 1,
       primitive: 'cylinder',

diff --git a/src/extras/primitives/primitives/a-cylinder.js b/src/extras/primitives/primitives/a-cylinder.js
@@ -3,7 +3,7 @@ var registerPrimitive = require('../registerPrimitive');
 var utils = require('../../../utils/');
 
 registerPrimitive('a-cylinder', utils.extendDeep({}, getMeshMixin(), {
-  defaultAttributes: {
+  defaultComponents: {
     geometry: {
       primitive: 'cylinder'
     }

diff --git a/src/extras/primitives/primitives/a-image.js b/src/extras/primitives/primitives/a-image.js
@@ -3,7 +3,7 @@ var registerPrimitive = require('../registerPrimitive');
 var utils = require('../../../utils/');
 
 registerPrimitive('a-image', utils.extendDeep({}, getMeshMixin(), {
-  defaultAttributes: {
+  defaultComponents: {
     geometry: {
       primitive: 'plane'
     },

diff --git a/src/extras/primitives/primitives/a-light.js b/src/extras/primitives/primitives/a-light.js
@@ -1,7 +1,7 @@
 var registerPrimitive = require('../registerPrimitive');
 
 registerPrimitive('a-light', {
-  defaultAttributes: {
+  defaultComponents: {
     light: {}
   },
 

diff --git a/src/extras/primitives/primitives/a-model.js b/src/extras/primitives/primitives/a-model.js
@@ -5,7 +5,7 @@ var utils = require('../../../utils/');
 registerPrimitive('a-model', utils.extend({}, getMeshMixin(), {
   deprecated: '<a-model> is deprecated. Use <a-obj-model> or <a-collada-model> instead.',
 
-  defaultAttributes: {
+  defaultComponents: {
     loader: {
       format: 'collada'
     },

diff --git a/src/extras/primitives/primitives/a-plane.js b/src/extras/primitives/primitives/a-plane.js
@@ -3,7 +3,7 @@ var registerPrimitive = require('../registerPrimitive');
 var utils = require('../../../utils/');
 
 registerPrimitive('a-plane', utils.extendDeep({}, getMeshMixin(), {
-  defaultAttributes: {
+  defaultComponents: {
     geometry: {
       primitive: 'plane'
     }

diff --git a/src/extras/primitives/primitives/a-ring.js b/src/extras/primitives/primitives/a-ring.js
@@ -3,7 +3,7 @@ var registerPrimitive = require('../registerPrimitive');
 var utils = require('../../../utils/');
 
 registerPrimitive('a-ring', utils.extendDeep({}, getMeshMixin(), {
-  defaultAttributes: {
+  defaultComponents: {
     geometry: {
       primitive: 'ring'
     }

diff --git a/src/extras/primitives/primitives/a-sky.js b/src/extras/primitives/primitives/a-sky.js
@@ -3,7 +3,7 @@ var registerPrimitive = require('../registerPrimitive');
 var utils = require('../../../utils/');
 
 registerPrimitive('a-sky', utils.extendDeep({}, getMeshMixin(), {
-  defaultAttributes: {
+  defaultComponents: {
     geometry: {
       primitive: 'sphere',
       radius: 100,

diff --git a/src/extras/primitives/primitives/a-sound.js b/src/extras/primitives/primitives/a-sound.js
@@ -1,7 +1,7 @@
 var registerPrimitive = require('../registerPrimitive');
 
 registerPrimitive('a-sound', {
-  defaultAttributes: {
+  defaultComponents: {
     sound: {}
   },
 

diff --git a/src/extras/primitives/primitives/a-sphere.js b/src/extras/primitives/primitives/a-sphere.js
@@ -3,7 +3,7 @@ var registerPrimitive = require('../registerPrimitive');
 var utils = require('../../../utils/');
 
 registerPrimitive('a-sphere', utils.extendDeep({}, getMeshMixin(), {
-  defaultAttributes: {
+  defaultComponents: {
     geometry: {
       primitive: 'sphere'
     }

diff --git a/src/extras/primitives/primitives/a-torus-knot.js b/src/extras/primitives/primitives/a-torus-knot.js
@@ -3,7 +3,7 @@ var registerPrimitive = require('../registerPrimitive');
 var utils = require('../../../utils/');
 
 registerPrimitive('a-torus-knot', utils.extendDeep({}, getMeshMixin(), {
-  defaultAttributes: {
+  defaultComponents: {
     geometry: {
       primitive: 'torusKnot'
     }

diff --git a/src/extras/primitives/primitives/a-torus.js b/src/extras/primitives/primitives/a-torus.js
@@ -3,7 +3,7 @@ var registerPrimitive = require('../registerPrimitive');
 var utils = require('../../../utils/');
 
 registerPrimitive('a-torus', utils.extendDeep({}, getMeshMixin(), {
-  defaultAttributes: {
+  defaultComponents: {
     geometry: {
       primitive: 'torus'
     }

diff --git a/src/extras/primitives/primitives/a-video.js b/src/extras/primitives/primitives/a-video.js
@@ -3,7 +3,7 @@ var registerPrimitive = require('../registerPrimitive');
 var utils = require('../../../utils/');
 
 registerPrimitive('a-video', utils.extendDeep({}, getMeshMixin(), {
-  defaultAttributes: {
+  defaultComponents: {
     geometry: {
       primitive: 'plane'
     },

diff --git a/src/extras/primitives/primitives/a-videosphere.js b/src/extras/primitives/primitives/a-videosphere.js
@@ -3,7 +3,7 @@ var registerPrimitive = require('../registerPrimitive');
 var utils = require('../../../utils/');
 
 registerPrimitive('a-videosphere', utils.extendDeep({}, getMeshMixin(), {
-  defaultAttributes: {
+  defaultComponents: {
     geometry: {
       primitive: 'sphere',
       radius: 5000,

diff --git a/src/extras/primitives/registerPrimitive.js b/src/extras/primitives/registerPrimitive.js
@@ -10,10 +10,15 @@ module.exports = function registerPrimitive (name, definition) {
   name = name.toLowerCase();
   log('Registering <%s>', name);
 
+  // Deprecation warning for defaultAttributes usage.
+  if (definition.defaultAttributes) {
+    console.warn("The 'defaultAttributes' object is deprecated. Use 'defaultComponents' instead.");
+  }
+
   return registerElement(name, {
     prototype: Object.create(AEntity.prototype, {
-      defaultAttributes: {
-        value: definition.defaultAttributes || {}
+      defaultComponentsFromPrimitive: {
+        value: definition.defaultComponents || definition.defaultAttributes || {}
       },
 
       deprecated: {
@@ -66,7 +71,7 @@ module.exports = function registerPrimitive (name, definition) {
       applyDefaultComponents: {
         value: function () {
           var self = this;
-          var defaultData = this.defaultAttributes;
+          var defaultData = this.defaultComponentsFromPrimitive;
           // Apply default components.
           Object.keys(defaultData).forEach(function applyDefault (componentName) {
             var componentData = defaultData[componentName];

diff --git a/tests/extras/primitives/registerPrimitive.test.js b/tests/extras/primitives/registerPrimitive.test.js
@@ -20,7 +20,7 @@ function primitiveFactory (definition, cb) {
 suite('registerPrimitive', function () {
   test('initializes default attributes', function (done) {
     primitiveFactory({
-      defaultAttributes: {
+      defaultComponents: {
         geometry: {primitive: 'box'},
         material: {},
         position: '1 2 3'
@@ -35,7 +35,7 @@ suite('registerPrimitive', function () {
 
   test('merges defined components with default components', function (done) {
     primitiveFactory({
-      defaultAttributes: {
+      defaultComponents: {
         material: {color: '#FFF', metalness: 0.63}
       }
     }, function (el) {
@@ -51,7 +51,7 @@ suite('registerPrimitive', function () {
     var entity = helpers.entityFactory();
     var tag = 'a-test-' + primitiveId++;
     registerPrimitive(tag, {
-      defaultAttributes: {
+      defaultComponents: {
         material: {color: '#FFF'}
       },