mirror of
https://github.com/CesiumGS/obj2gltf.git
synced 2024-11-23 08:34:14 -05:00
Node 8 upgrade
This commit is contained in:
parent
a3c2c38a99
commit
37cf7858cc
3
.gitattributes
vendored
Normal file
3
.gitattributes
vendored
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
# Auto detect text files and perform LF normalization
|
||||||
|
* text=auto
|
||||||
|
package.json text eol=lf
|
1
.gitignore
vendored
1
.gitignore
vendored
@ -1,6 +1,7 @@
|
|||||||
# NPM
|
# NPM
|
||||||
node_modules
|
node_modules
|
||||||
npm-debug.log
|
npm-debug.log
|
||||||
|
package-lock.json
|
||||||
|
|
||||||
# WebStorm user-specific
|
# WebStorm user-specific
|
||||||
.idea/workspace.xml
|
.idea/workspace.xml
|
||||||
|
@ -7,6 +7,7 @@
|
|||||||
.eslintcache
|
.eslintcache
|
||||||
.eslintignore
|
.eslintignore
|
||||||
.eslintrc.json
|
.eslintrc.json
|
||||||
|
.gitattributes
|
||||||
.nyc_output
|
.nyc_output
|
||||||
.npmignore
|
.npmignore
|
||||||
.travis.yml
|
.travis.yml
|
||||||
|
@ -1,7 +1,6 @@
|
|||||||
language: node_js
|
language: node_js
|
||||||
node_js:
|
node_js:
|
||||||
- "4"
|
- "8"
|
||||||
- "6"
|
|
||||||
script:
|
script:
|
||||||
- npm run eslint
|
- npm run eslint
|
||||||
- npm run test -- --failTaskOnError --suppressPassed
|
- npm run test -- --failTaskOnError --suppressPassed
|
||||||
@ -9,4 +8,4 @@ script:
|
|||||||
after_success:
|
after_success:
|
||||||
## We only need to run coveralls for one node version (doesn't matter which one).
|
## We only need to run coveralls for one node version (doesn't matter which one).
|
||||||
## We also ignore publishing failures, since restarting an existing travis build would otherwise break.
|
## We also ignore publishing failures, since restarting an existing travis build would otherwise break.
|
||||||
- if node --version | grep -q ^v6 ; npm run coverage && npm run coveralls; fi
|
- if node --version | grep -q ^v8 ; npm run coverage && npm run coveralls; fi
|
||||||
|
@ -168,7 +168,7 @@ function writeEmbeddedTextures(gltf) {
|
|||||||
var textureSource = texture.source;
|
var textureSource = texture.source;
|
||||||
var textureByteLength = textureSource.length;
|
var textureByteLength = textureSource.length;
|
||||||
|
|
||||||
image.mimeType = mime.lookup(texture.extension);
|
image.mimeType = mime.getType(texture.extension);
|
||||||
image.bufferView = gltf.bufferViews.length;
|
image.bufferView = gltf.bufferViews.length;
|
||||||
gltf.bufferViews.push({
|
gltf.bufferViews.push({
|
||||||
buffer : 0,
|
buffer : 0,
|
||||||
|
13
package.json
13
package.json
@ -26,17 +26,16 @@
|
|||||||
"node": ">=4.0.0"
|
"node": ">=4.0.0"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"bluebird": "^3.5.0",
|
"bluebird": "^3.5.1",
|
||||||
"cesium": "^1.36.0",
|
"cesium": "^1.39.0",
|
||||||
"fs-extra": "^4.0.1",
|
"fs-extra": "^4.0.2",
|
||||||
"jpeg-js": "^0.3.3",
|
"jpeg-js": "^0.3.3",
|
||||||
"mime": "^1.3.6",
|
"mime": "^2.0.3",
|
||||||
"pngjs": "^3.3.0",
|
"pngjs": "^3.3.0",
|
||||||
"uuid": "^3.1.0",
|
"yargs": "^10.0.3"
|
||||||
"yargs": "^8.0.2"
|
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"coveralls": "^2.13.1",
|
"coveralls": "^3.0.0",
|
||||||
"eslint": "^4.4.1",
|
"eslint": "^4.4.1",
|
||||||
"eslint-config-cesium": "^2.0.1",
|
"eslint-config-cesium": "^2.0.1",
|
||||||
"gulp": "^3.9.1",
|
"gulp": "^3.9.1",
|
||||||
|
Loading…
Reference in New Issue
Block a user