djsundog
/
obj2gltf
mirror of https://github.com/CesiumGS/obj2gltf.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #137 from AnalyticalGraphicsInc/update-1.0-npm-modules 

Update npm modules
This commit is contained in:
Sean Lilley 2018-03-27 14:52:56 -04:00 committed by GitHub
parent 0e11909860 7af05ec359
commit e05c01e8f4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/writeUris.js
View File

@ -113,7 +113,7 @@ function writeEmbeddedTextures(gltf) {
if (images.hasOwnProperty(id)) { if (images.hasOwnProperty(id)) {
var image = images[id]; var image = images[id];
var extras = image.extras._obj2gltf; var extras = image.extras._obj2gltf;
image.uri = 'data:' + mime.lookup(extras.extension) + ';base64,' + extras.source.toString('base64'); image.uri = 'data:' + mime.getType(extras.extension) + ';base64,' + extras.source.toString('base64');
} }
} }
} }

12
package.json
View File

@ -28,19 +28,19 @@
"dependencies": { "dependencies": {
"bluebird": "^3.5.0", "bluebird": "^3.5.0",
"cesium": "^1.35.2", "cesium": "^1.35.2",
"fs-extra": "^3.0.1", "fs-extra": "^5.0.0",
"gltf-pipeline": "^1.0.0", "gltf-pipeline": "^1.0.0",
"mime": "^1.3.6", "mime": "^2.2.0",
"pngjs": "^3.2.0", "pngjs": "^3.2.0",
"uuid": "^3.1.0", "uuid": "^3.1.0",
"yargs": "^8.0.2" "yargs": "^11.0.0"
}, },
"devDependencies": { "devDependencies": {
"coveralls": "^2.13.1", "coveralls": "^3.0.0",
"eslint": "^4.2.0", "eslint": "^4.2.0",
"eslint-config-cesium": "^2.0.1", "eslint-config-cesium": "^4.0.0",
"gulp": "^3.9.1", "gulp": "^3.9.1",
"jasmine": "^2.6.0", "jasmine": "^3.1.0",
"jasmine-spec-reporter": "^4.1.1", "jasmine-spec-reporter": "^4.1.1",
"jsdoc": "^3.5.1", "jsdoc": "^3.5.1",
"nyc": "^11.0.3", "nyc": "^11.0.3",