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

Naming changes to be more like master

This commit is contained in:
Sean Lilley 2018-11-01 00:33:13 -04:00
parent 376d228ae0
commit 3ca2822690
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/loadObj.js
View File

@ -439,9 +439,9 @@ function getMtlPaths(mtllibLine) {
function finishLoading(nodes, mtlPaths, objPath, usesMaterials, options) { function finishLoading(nodes, mtlPaths, objPath, usesMaterials, options) {
nodes = cleanNodes(nodes); nodes = cleanNodes(nodes);
if (nodes.length === 0) { if (nodes.length === 0) {
return Promise.reject(new RuntimeError(objPath + ' does not have any geometry data')); throw new RuntimeError(objPath + ' does not have any geometry data');
} }
return loadMaterials(mtlPaths, objPath, options) return loadMtls(mtlPaths, objPath, options)
.then(function(materials) { .then(function(materials) {
if (Object.keys(materials).length > 0 && !usesMaterials) { if (Object.keys(materials).length > 0 && !usesMaterials) {
assignDefaultMaterial(nodes, materials); assignDefaultMaterial(nodes, materials);
@ -467,7 +467,7 @@ function outsideDirectory(file, directory) {
return (path.relative(directory, file).indexOf('..') === 0); return (path.relative(directory, file).indexOf('..') === 0);
} }
function loadMaterials(mtlPaths, objPath, options) { function loadMtls(mtlPaths, objPath, options) {
var objDirectory = path.dirname(objPath); var objDirectory = path.dirname(objPath);
var materials = {}; var materials = {};