Skip to content

Commit 91a8504

Browse files
msimpsonngokevin
authored andcommitted
Change 'defaultAttributes' to 'defaultComponents' in Primitive Definitions (#1460)
* Change 'defaultAttributes' to 'defaultComponents' in primitive definitions. * Update the gitignore to ignore '.swp' files (VIM). Remove '.swp' files from the last commit.
1 parent d2f8d4c commit 91a8504

23 files changed

+32
-26
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
.DS_Store
22
.cache
3+
*.swp
34
build
45
firefox/
56
gh-pages/

‎src/extras/primitives/getMeshMixin.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*/
44
module.exports = function getMeshMixin () {
55
return {
6-
defaultAttributes: {
6+
defaultComponents: {
77
material: { }
88
},
99

‎src/extras/primitives/primitives/a-box.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ var registerPrimitive = require('../registerPrimitive');
33
var utils = require('../../../utils/');
44

55
var boxDefinition = utils.extendDeep({}, getMeshMixin(), {
6-
defaultAttributes: {
6+
defaultComponents: {
77
geometry: {
88
primitive: 'box'
99
}

‎src/extras/primitives/primitives/a-camera.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
var registerPrimitive = require('../registerPrimitive');
22

33
registerPrimitive('a-camera', {
4-
defaultAttributes: {
4+
defaultComponents: {
55
camera: {},
66
'look-controls': {},
77
'wasd-controls': {}

‎src/extras/primitives/primitives/a-circle.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ var registerPrimitive = require('../registerPrimitive');
33
var utils = require('../../../utils/');
44

55
registerPrimitive('a-circle', utils.extendDeep({}, getMeshMixin(), {
6-
defaultAttributes: {
6+
defaultComponents: {
77
geometry: {
88
primitive: 'circle'
99
}

‎src/extras/primitives/primitives/a-cone.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ var registerPrimitive = require('../registerPrimitive');
33
var utils = require('../../../utils/');
44

55
registerPrimitive('a-cone', utils.extendDeep({}, getMeshMixin(), {
6-
defaultAttributes: {
6+
defaultComponents: {
77
geometry: {
88
primitive: 'cone'
99
}

‎src/extras/primitives/primitives/a-cursor.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ var registerPrimitive = require('../registerPrimitive');
33
var utils = require('../../../utils/');
44

55
registerPrimitive('a-cursor', utils.extendDeep({}, getMeshMixin(), {
6-
defaultAttributes: {
6+
defaultComponents: {
77
cursor: {},
88
geometry: {
99
primitive: 'ring',

‎src/extras/primitives/primitives/a-curvedimage.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ var registerPrimitive = require('../registerPrimitive');
33
var utils = require('../../../utils/');
44

55
registerPrimitive('a-curvedimage', utils.extendDeep({}, getMeshMixin(), {
6-
defaultAttributes: {
6+
defaultComponents: {
77
geometry: {
88
height: 1,
99
primitive: 'cylinder',

‎src/extras/primitives/primitives/a-cylinder.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ var registerPrimitive = require('../registerPrimitive');
33
var utils = require('../../../utils/');
44

55
registerPrimitive('a-cylinder', utils.extendDeep({}, getMeshMixin(), {
6-
defaultAttributes: {
6+
defaultComponents: {
77
geometry: {
88
primitive: 'cylinder'
99
}

‎src/extras/primitives/primitives/a-image.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ var registerPrimitive = require('../registerPrimitive');
33
var utils = require('../../../utils/');
44

55
registerPrimitive('a-image', utils.extendDeep({}, getMeshMixin(), {
6-
defaultAttributes: {
6+
defaultComponents: {
77
geometry: {
88
primitive: 'plane'
99
},

0 commit comments

Comments
 (0)