Skip to content

Commit dad8347

Browse files
committed
Remove material option configurability
1 parent f375917 commit dad8347

File tree

1 file changed

+7
-14
lines changed

1 file changed

+7
-14
lines changed

index.js

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -36,26 +36,26 @@ function Texture(game, opts) {
3636
var useFlatColors = opts.materialFlatColor === true;
3737
delete opts.materialFlatColor;
3838

39-
this.options = defaults(opts || {}, {
39+
this.options = {
4040
crossOrigin: 'Anonymous',
41-
materialParams: defaults(opts.materialParams || {}, {
41+
materialParams: {
4242
ambient: 0xbbbbbb,
4343
transparent: false,
44-
side: this.THREE.DoubleSide,
45-
}),
46-
materialTransparentParams: defaults(opts.materialTransparentParams || {}, {
44+
side: this.THREE.DoubleSide
45+
},
46+
materialTransparentParams: {
4747
ambient: 0xbbbbbb,
4848
transparent: true,
4949
side: this.THREE.DoubleSide,
5050
//depthWrite: false,
5151
//depthTest: false
52-
}),
52+
},
5353
materialType: this.THREE.MeshLambertMaterial,
5454
applyTextureParams: function(map) {
5555
map.magFilter = self.THREE.NearestFilter;
5656
map.minFilter = self.THREE.LinearMipMapLinearFilter;
5757
}
58-
});
58+
};
5959

6060
// create a canvas for the texture atlas
6161
this.canvas = (typeof document !== 'undefined') ? document.createElement('canvas') : {};
@@ -390,13 +390,6 @@ function ext(name) {
390390
return (String(name).indexOf('.') !== -1) ? name : name + '.png';
391391
}
392392

393-
function defaults(obj) {
394-
[].slice.call(arguments, 1).forEach(function(from) {
395-
if (from) for (var k in from) if (obj[k] == null) obj[k] = from[k];
396-
});
397-
return obj;
398-
}
399-
400393
function each(arr, it, done) {
401394
var count = 0;
402395
arr.forEach(function(a) {

0 commit comments

Comments
 (0)