Skip to content

Commit 9fd5ada

Browse files
committed
Remove xtend
1 parent 323f98d commit 9fd5ada

File tree

4 files changed

+7
-11
lines changed

4 files changed

+7
-11
lines changed

lib/descriptor.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
*
55
* @module glsl-js/lib/descriptor
66
*/
7-
var extend = require('xtend/mutable');
87
var types = require('./types');
98
var pick = require('pick-by-alias');
109

@@ -35,12 +34,12 @@ function Descriptor (str, options) {
3534

3635
//take over existing info
3736
if (str instanceof String) {
38-
extend(descriptor, pick(str, ['type', 'components', 'visible', 'complexity', 'include', 'optimize']));
37+
Object.assign(descriptor, pick(str, ['type', 'components', 'visible', 'complexity', 'include', 'optimize']));
3938
}
4039

4140
//take over options
4241
if (options) {
43-
extend(descriptor, pick(options, ['type', 'components', 'visible', 'complexity', 'include', 'optimize']))
42+
Object.assign(descriptor, pick(options, ['type', 'components', 'visible', 'complexity', 'include', 'optimize']))
4443
}
4544

4645
//in case of undefined complexity we should opt out for average value

lib/index.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ var Emitter = require('events')
1313
var inherits = require('inherits')
1414
var assert = require('assert')
1515
var parse = require('./parse')
16-
var extend = require('xtend/mutable')
1716
var builtins = require('./builtins')
1817
var types = require('./types')
1918
var operators = require('./operators')
@@ -33,7 +32,7 @@ var swizzleRE = /^[xyzwstpdrgba]{1,4}$/
3332
function GLSL (options) {
3433
if (!(this instanceof GLSL)) return new GLSL(options)
3534

36-
extend(this, options)
35+
Object.assign(this, options)
3736

3837
this.reset()
3938

@@ -260,7 +259,7 @@ GLSL.prototype.optimizeDescriptor = function (descriptor) {
260259
//expand array, if complexity is ok
261260
if (descriptor.components && descriptor.components.length > 1) {
262261
var include = descriptor.components.map(function (c) { return c.include;}, this).filter(Boolean)
263-
return Descriptor(`[${descriptor.components.join(', ')}]`, extend(descriptor, {
262+
return Descriptor(`[${descriptor.components.join(', ')}]`, Object.assign(descriptor, {
264263
include: include,
265264
complexity: complexity
266265
}))
@@ -1368,7 +1367,7 @@ GLSL.prototype.variable = function (ident, data, scope) {
13681367
this.scopes[scope][ident] = {}
13691368
}
13701369

1371-
var variable = extend(this.scopes[scope][ident], data)
1370+
var variable = Object.assign(this.scopes[scope][ident], data)
13721371

13731372
//preset default value for a variable, if undefined
13741373
if (data.value == null) {

package-lock.json

Lines changed: 1 addition & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@
1010
"glsl-tokenizer": "^2.1.5",
1111
"inherits": "^2.0.1",
1212
"pick-by-alias": "^1.2.0",
13-
"prepr": "^1.1.2",
14-
"xtend": "^4.0.1"
13+
"prepr": "^1.1.2"
1514
},
1615
"devDependencies": {
1716
"almost-equal": "^1.1.0",

0 commit comments

Comments
 (0)