djsundog/obj2gltf
1
0
Fork 0
mirror of https://github.com/CesiumGS/obj2gltf.git synced 2024-11-23 16:44:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into fix-negative-indices

Browse Source
This commit is contained in:
Tom Fili 2019-06-26 13:57:50 -04:00
commit abddf4bda4
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/createGltf.js
View File

@ -274,7 +274,7 @@ function cloneMaterial(material, removeTextures) {
} }
const clonedObject = {}; const clonedObject = {};
for (const name in material) { for (const name in material) {
if (material.hasOwnProperty(name)) { if (Object.prototype.hasOwnProperty.call(material, name)) {
clonedObject[name] = cloneMaterial(material[name], removeTextures); clonedObject[name] = cloneMaterial(material[name], removeTextures);
} }
} }
@ -283,7 +283,7 @@ function cloneMaterial(material, removeTextures) {
function resolveTextures(gltf, material) { function resolveTextures(gltf, material) {
for (const name in material) { for (const name in material) {
if (material.hasOwnProperty(name)) { if (Object.prototype.hasOwnProperty.call(material, name)) {
const property = material[name]; const property = material[name];
if (property instanceof Texture) { if (property instanceof Texture) {
material[name] = getTexture(gltf, property); material[name] = getTexture(gltf, property);

32
package.json
View File

@ -26,25 +26,25 @@
"node": ">=4.0.0" "node": ">=4.0.0"
}, },
"dependencies": { "dependencies": {
"bluebird": "^3.5.3", "bluebird": "^3.5.5",
"cesium": "^1.55.0", "cesium": "^1.58.1",
"fs-extra": "^7.0.1", "fs-extra": "^8.0.1",
"jpeg-js": "^0.3.4", "jpeg-js": "^0.3.5",
"mime": "^2.4.0", "mime": "^2.4.4",
"pngjs": "^3.3.3", "pngjs": "^3.4.0",
"yargs": "^13.2.2" "yargs": "^13.2.4"
}, },
"devDependencies": { "devDependencies": {
"cloc": "^2.4.0", "cloc": "^2.5.0",
"coveralls": "^3.0.3", "coveralls": "^3.0.4",
"eslint": "^5.15.1", "eslint": "^6.0.0",
"eslint-config-cesium": "^6.0.1", "eslint-config-cesium": "^7.0.0",
"gulp": "^4.0.0", "gulp": "^4.0.2",
"jasmine": "^3.3.1", "jasmine": "^3.4.0",
"jasmine-spec-reporter": "^4.2.1", "jasmine-spec-reporter": "^4.2.1",
"jsdoc": "^3.5.5", "jsdoc": "^3.6.2",
"nyc": "^13.3.0", "nyc": "^14.1.1",
"open": "^6.0.0", "open": "^6.3.0",
"requirejs": "^2.3.6" "requirejs": "^2.3.6"
}, },
"scripts": { "scripts": {