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

Style tweaks

This commit is contained in:
Sean Lilley 2016-07-22 18:21:09 -07:00
parent ca7f0cca45
commit e5f5970018
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/obj.js
View File

@ -9,7 +9,6 @@ var path = require('path');
var loadImage = require('./image'); var loadImage = require('./image');
var Material = require('./mtl'); var Material = require('./mtl');
var Cartesian3 = Cesium.Cartesian3; var Cartesian3 = Cesium.Cartesian3;
var defined = Cesium.defined; var defined = Cesium.defined;
@ -279,15 +278,16 @@ function getImages(inputPath, materials) {
} }
promises.push(loadImage(imagePath)); promises.push(loadImage(imagePath));
} }
return Promise.all(promises).then(function(imageInfoArray) { return Promise.all(promises)
var imageInfoArrayLength = imageInfoArray.length; .then(function(imageInfoArray) {
for (var j = 0; j < imageInfoArrayLength; j++) { var imageInfoArrayLength = imageInfoArray.length;
var image = images[j]; for (var j = 0; j < imageInfoArrayLength; j++) {
var imageInfo = imageInfoArray[j]; var image = images[j];
imagesInfo[image] = imageInfo; var imageInfo = imageInfoArray[j];
} imagesInfo[image] = imageInfo;
return imagesInfo; }
}); return imagesInfo;
});
} }
function getMaterials(mtlPath, hasMaterialGroups) { function getMaterials(mtlPath, hasMaterialGroups) {