Merge pull request #297 from chetan-set/main

Remove double quotes in the mtl and texture paths
This commit is contained in:
Sean Lilley 2023-10-09 13:03:34 -04:00 committed by GitHub
commit 37043260ce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 3 deletions

View File

@ -3,6 +3,7 @@
### 3.2.0 - 2023-??-?? ### 3.2.0 - 2023-??-??
- Added `doubleSidedMaterial` option to force materials to be rendered double sided. [#294](https://github.com/CesiumGS/obj2gltf/pull/294) - Added `doubleSidedMaterial` option to force materials to be rendered double sided. [#294](https://github.com/CesiumGS/obj2gltf/pull/294)
- Strip file paths of any enclosing double-quotes to allow the mtl/texture files to be properly parsed [#297](https://github.com/CesiumGS/obj2gltf/pull/297)
### 3.1.6 - 2023-02-10 ### 3.1.6 - 2023-02-10

View File

@ -101,6 +101,8 @@ function loadMtl(mtlPath, options) {
} }
function normalizeTexturePath(texturePath, mtlDirectory) { function normalizeTexturePath(texturePath, mtlDirectory) {
//Remove double quotes around the texture file if it exists
texturePath = texturePath.replace(/^"(.+)"$/, "$1");
// Removes texture options from texture name // Removes texture options from texture name
// Assumes no spaces in texture name // Assumes no spaces in texture name
const re = /-(bm|t|s|o|blendu|blendv|boost|mm|texres|clamp|imfchan|type)/; const re = /-(bm|t|s|o|blendu|blendv|boost|mm|texres|clamp|imfchan|type)/;

View File

@ -519,6 +519,8 @@ function loadObj(objPath, options) {
function getMtlPaths(mtllibLine) { function getMtlPaths(mtllibLine) {
// Handle paths with spaces. E.g. mtllib my material file.mtl // Handle paths with spaces. E.g. mtllib my material file.mtl
const mtlPaths = []; const mtlPaths = [];
//Remove double quotes around the mtl file if it exists
mtllibLine = mtllibLine.replace(/^"(.+)"$/, "$1");
const splits = mtllibLine.split(" "); const splits = mtllibLine.split(" ");
const length = splits.length; const length = splits.length;
let startIndex = 0; let startIndex = 0;

View File

@ -45,9 +45,9 @@
"jasmine": "^5.0.0", "jasmine": "^5.0.0",
"jasmine-spec-reporter": "^7.0.0", "jasmine-spec-reporter": "^7.0.0",
"jsdoc": "^4.0.0", "jsdoc": "^4.0.0",
"lint-staged": "^14.0.1",
"nyc": "^15.1.0", "nyc": "^15.1.0",
"prettier": "3.0.3", "prettier": "3.0.3"
"lint-staged": "^14.0.1"
}, },
"lint-staged": { "lint-staged": {
"*.(js|ts)": [ "*.(js|ts)": [