Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
also apply newly set materials to obj-model recursively
  • Loading branch information
ngokevin committed Mar 7, 2019
commit 44450b67073af902b09c08f589140a38e3d267c0
32 changes: 22 additions & 10 deletions src/components/obj-model.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,19 @@ module.exports.Component = registerComponent('obj-model', {
},

init: function () {
var self = this;

this.model = null;
this.objLoader = new THREE.OBJLoader();
this.mtlLoader = new THREE.MTLLoader(this.objLoader.manager);
// Allow cross-origin images to be loaded.
this.mtlLoader.crossOrigin = '';

this.el.addEventListener('componentinitialized', function (evt) {
if (!self.model) { return; }
if (evt.detail.name !== 'material') { return; }
self.applyMaterial();
});
},

update: function () {
Expand Down Expand Up @@ -70,19 +78,23 @@ module.exports.Component = registerComponent('obj-model', {

// .OBJ only.
objLoader.load(objUrl, function loadObjOnly (objModel) {
// Apply material.
var material = el.components.material;
if (material) {
objModel.traverse(function (child) {
if (child instanceof THREE.Mesh) {
child.material = material.material;
}
});
}

self.model = objModel;
self.applyMaterial();
el.setObject3D('mesh', objModel);
el.emit('model-loaded', {format: 'obj', model: objModel});
});
},

/**
* Apply material from material component recursively.
*/
applyMaterial: function () {
var material = this.el.components.material;
if (!material) { return; }
this.model.traverse(function (child) {
if (child instanceof THREE.Mesh) {
child.material = material.material;
}
});
}
});
14 changes: 14 additions & 0 deletions tests/components/obj-model.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -86,4 +86,18 @@ suite('obj-model', function () {
});
el.setAttribute('obj-model', 'obj', '#obj');
});

test('can load .OBJ with reset material', function (done) {
var el = this.el;
el.setAttribute('material', 'color', 'red');
el.addEventListener('object3dset', () => {
el.removeAttribute('material');
el.setAttribute('material', 'color', 'blue');
setTimeout(() => {
assert.equal(el.getObject3D('mesh').children[0].material.color.b, 1);
done();
});
});
el.setAttribute('obj-model', 'obj', '#obj');
});
});