update to latest gltf2obj

Author: PrincessGod

lib/loadMtl.js

@@ -224,13 +224,26 @@ function loadMaterialTexture(material, name, textureOptions, mtlDirectory, textu
 
     var texturePromise = texturePromiseMap[texturePath];
     if (!defined(texturePromise)) {
+        var shallowPath = path.resolve(path.join(mtlDirectory, path.basename(texturePath)));
         if (options.secure && outsideDirectory(texturePath, mtlDirectory)) {
-            options.logger('Could not read texture file at ' + texturePath + ' because it is outside of the mtl directory and the secure flag is true. This texture will be ignored.');
-            texturePromise = Promise.resolve();
+            // Try looking for the texture in the same directory as the obj
+            options.logger('Texture file is outside of the mtl directory and the secure flag is true. Attempting to read the texture file from within the obj directory instead.');
+            texturePromise = loadTexture(shallowPath, textureOptions)
+                .catch(function(error) {
+                    options.logger(error.message);
+                    options.logger('Could not read texture file at ' + shallowPath + '. This texture will be ignored');
+                });
         } else {
             texturePromise = loadTexture(texturePath, textureOptions)
-                .catch(function() {
-                    options.logger('Could not read texture file at ' + texturePath + '. This texture will be ignored.');
+                .catch(function(error) {
+                    // Try looking for the texture in the same directory as the obj
+                    options.logger(error.message);
+                    options.logger('Could not read texture file at ' + texturePath + '. Attempting to read the texture file from within the obj directory instead.');
+                    return loadTexture(shallowPath, textureOptions);
+                })
+                .catch(function(error) {
+                    options.logger(error.message);
+                    options.logger('Could not read texture file at ' + shallowPath + '. This texture will be ignored.');
                 });
         }
         texturePromiseMap[texturePath] = texturePromise;

lib/loadObj.js

@@ -71,6 +71,7 @@ function loadObj(objPath, options) {
     var node;
     var mesh;
     var primitive;
+    var activeMaterial;
 
     // All nodes seen in the obj
     var nodes = [];
@@ -120,12 +121,15 @@ function loadObj(objPath, options) {
 
     function addPrimitive() {
         primitive = new Primitive();
+        primitive.material = activeMaterial;
         mesh.primitives.push(primitive);
     }
 
     function useMaterial(name) {
-        // Look to see if this material has already been used by a primitive in the mesh
         var material = getName(name);
+        activeMaterial = material;
+
+        // Look to see if this material has already been used by a primitive in the mesh
         var primitives = mesh.primitives;
         var primitivesLength = primitives.length;
         for (var i = 0; i < primitivesLength; ++i) {
@@ -136,7 +140,6 @@ function loadObj(objPath, options) {
         }
         // Add a new primitive with this material
         addPrimitive();
-        primitive.material = getName(name);
     }
 
     function getOffset(a, attributeData, components) {
@@ -329,7 +332,7 @@ function loadObj(objPath, options) {
     function isConvex(positions2D) {
         var turnDirection = getTurnDirection(positions2D[0], positions2D[1], positions2D[2]);
         for (var i=1; i < positions2D.length-2; ++i) {
-        var currentTurnDirection = getTurnDirection(positions2D[i], positions2D[i+1], positions2D[i+2]);
+            var currentTurnDirection = getTurnDirection(positions2D[i], positions2D[i+1], positions2D[i+2]);
             if (turnDirection * currentTurnDirection < 0) {
                 return false;
             }
@@ -465,7 +468,9 @@ function loadObj(objPath, options) {
                     faceUvs.push(result[2]);
                     faceNormals.push(result[3]);
                 }
-                addFace(faceVertices, facePositions, faceUvs, faceNormals);
+                if (faceVertices.length > 2) {
+                    addFace(faceVertices, facePositions, faceUvs, faceNormals);
+                }
 
                 faceVertices.length = 0;
                 facePositions.length = 0;
@@ -531,18 +536,41 @@ function finishLoading(nodes, mtlPaths, objPath, options) {
 function loadMtls(mtlPaths, objPath, options) {
     var objDirectory = path.dirname(objPath);
     var materials = [];
+
+    // Remove duplicates
+    mtlPaths = mtlPaths.filter(function(value, index, self) {
+        return self.indexOf(value) === index;
+    });
+
     return Promise.map(mtlPaths, function(mtlPath) {
         mtlPath = path.resolve(objDirectory, mtlPath);
+        var shallowPath = path.resolve(path.join(objDirectory, path.basename(mtlPath)));
         if (options.secure && outsideDirectory(mtlPath, objDirectory)) {
-            options.logger('Could not read mtl file at ' + mtlPath + ' because it is outside of the obj directory and the secure flag is true. Using default material instead.');
-            return;
+            // Try looking for the .mtl in the same directory as the obj
+            options.logger('The material file is outside of the obj directory and the secure flag is true. Attempting to read the material file from within the obj directory instead.');
+            return loadMtl(shallowPath, options)
+                .then(function(materialsInMtl) {
+                    materials = materials.concat(materialsInMtl);
+                })
+                .catch(function(error) {
+                    options.logger(error.message);
+                    options.logger('Could not read material file at ' + shallowPath + '. Using default material instead.');
+                });
         }
+
         return loadMtl(mtlPath, options)
+            .catch(function(error) {
+                // Try looking for the .mtl in the same directory as the obj
+                options.logger(error.message);
+                options.logger('Could not read material file at ' + mtlPath + '. Attempting to read the material file from within the obj directory instead.');
+                return loadMtl(shallowPath, options);
+            })
             .then(function(materialsInMtl) {
                 materials = materials.concat(materialsInMtl);
             })
-            .catch(function() {
-                options.logger('Could not read mtl file at ' + mtlPath + '. Using default material instead.');
+            .catch(function(error) {
+                options.logger(error.message);
+                options.logger('Could not read material file at ' + shallowPath + '. Using default material instead.');
             });
     }, {concurrency : 10})
         .then(function() {
@@ -615,13 +643,12 @@ function setDefaultNames(items, defaultName, usedNames) {
 }
 
 function setDefaults(nodes) {
-    var usedNodeNames = {};
-    var usedMeshNames = {};
-    setDefaultNames(nodes, 'Node', usedNodeNames);
+    var usedNames = {};
+    setDefaultNames(nodes, 'Node', usedNames);
     var nodesLength = nodes.length;
     for (var i = 0; i < nodesLength; ++i) {
         var node = nodes[i];
-        setDefaultNames(node.meshes, node.name, usedMeshNames);
+        setDefaultNames(node.meshes, node.name + '-Mesh', usedNames);
     }
 }
 

lib/outsideDirectory.js

@@ -9,6 +9,8 @@ module.exports = outsideDirectory;
  * @param {String} file Path to the file.
  * @param {String} directory Path to the directory.
  * @returns {Boolean} Whether the file is outside of the directory.
+ *
+ * @private
  */
 function outsideDirectory(file, directory) {
     return (path.relative(directory, file).indexOf('..') === 0);