dqn
/
FBX2glTF
mirror of https://github.com/facebookincubator/FBX2glTF.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed the npm library output path

This commit is contained in:
Benjamin MICHEL 2019-10-09 11:50:31 +02:00 committed by Pär Winzell
parent be627fa228
commit 37f992321e
1 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
npm/fbx2gltf/index.js
View File

@ -18,7 +18,7 @@ const binaries = {
/** /**
* Converts an FBX to a GTLF or GLB file. * Converts an FBX to a GTLF or GLB file.
* @param string srcFile path to the source file. * @param string srcFile path to the source file.
* @param string destFile path to the destination file. * @param string destFile path to the destination file or destination path.
* This must end in `.glb` or `.gltf` (case matters). * This must end in `.glb` or `.gltf` (case matters).
* @param string[] [opts] options to pass to the converter tool. * @param string[] [opts] options to pass to the converter tool.
* @return Promise<string> a promise that yields the full path to the converted * @return Promise<string> a promise that yields the full path to the converted
@ -33,19 +33,31 @@ function convert(srcFile, destFile, opts = []) {
throw new Error(`Unsupported OS: ${os.type()}`); throw new Error(`Unsupported OS: ${os.type()}`);
} }
let destExt; let destExt = path.extname(destFile).toLowerCase();
if (destFile.endsWith('.glb')) {
destExt = '.glb'; if (!destExt) {
opts.includes('--binary') || opts.push('--binary'); destExt = '.gltf'
} else if (destFile.endsWith('.gltf')) {
destExt = '.gltf'; const srcFilename = path.basename(srcFile, path.extname(srcFile))
} else { destFile = path.join(destFile, srcFilename + destExt)
}
if (destExt !== '.glb' && destExt !== '.gltf') {
throw new Error(`Unsupported file extension: ${destFile}`); throw new Error(`Unsupported file extension: ${destFile}`);
} }
const binary = opts.includes('--binary') || opts.includes('-b');
if (binary && destExt !== '.glb') {
destExt = '.glb';
} else if (!binary && destExt === 'glb') {
opts.push('--binary');
}
let srcPath = fs.realpathSync(srcFile); let srcPath = fs.realpathSync(srcFile);
let destDir = fs.realpathSync(path.dirname(destFile)); let destDir = fs.realpathSync(path.dirname(destFile));
let destPath = path.join(destDir, path.basename(destFile, destExt)); let destFilename = path.basename(destFile, path.extname(destFile)) + destExt;
let destPath = path.join(destDir, destFilename);
let args = opts.slice(0); let args = opts.slice(0);
args.push('--input', srcPath, '--output', destPath); args.push('--input', srcPath, '--output', destPath);
@ -72,7 +84,7 @@ function convert(srcFile, destFile, opts = []) {
reject(new Error(`Converter output:\n` + reject(new Error(`Converter output:\n` +
(output.length ? output : "<none>"))); (output.length ? output : "<none>")));
} else { } else {
resolve(destPath + destExt); resolve(destPath);
} }
}); });