From 49e88e6a02c54df882693951f8d62880104bd301 Mon Sep 17 00:00:00 2001 From: Bernard Kwok Date: Wed, 11 Sep 2024 13:36:40 -0400 Subject: [PATCH] Revert "Package sample files using http and data references." This reverts commit 63a4ac1d01944f1f4cace8157de0cbf25fc348e8. --- .../resources/Materials/data_image.mtlx | 27 ------------------ .../resources/Materials/web_image.mtlx | 28 ------------------- javascript/MaterialXView/webpack.config.js | 10 ------- 3 files changed, 65 deletions(-) delete mode 100644 javascript/MaterialXView/resources/Materials/data_image.mtlx delete mode 100644 javascript/MaterialXView/resources/Materials/web_image.mtlx diff --git a/javascript/MaterialXView/resources/Materials/data_image.mtlx b/javascript/MaterialXView/resources/Materials/data_image.mtlx deleted file mode 100644 index ee2ddfbdff..0000000000 --- a/javascript/MaterialXView/resources/Materials/data_image.mtlx +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/javascript/MaterialXView/resources/Materials/web_image.mtlx b/javascript/MaterialXView/resources/Materials/web_image.mtlx deleted file mode 100644 index b6e704b228..0000000000 --- a/javascript/MaterialXView/resources/Materials/web_image.mtlx +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/javascript/MaterialXView/webpack.config.js b/javascript/MaterialXView/webpack.config.js index 6371675189..cb5e40230f 100644 --- a/javascript/MaterialXView/webpack.config.js +++ b/javascript/MaterialXView/webpack.config.js @@ -35,18 +35,9 @@ dirent = fs.readdirSync(openPbrMaterials).filter( let openMaterials = dirent .map((fileName) => ({ name: fileName, value: `${openPbrMaterialsBaseURL}/${fileName}` })); -const localMaterials = "./resources/Materials/"; -const localMaterialsBaseURL = "Materials/Examples/Local"; -dirent = fs.readdirSync(localMaterials).filter( - function (file) { if (file.lastIndexOf(".mtlx") > -1) return file; } -) -let locMaterials = dirent - .map((fileName) => ({ name: fileName, value: `${localMaterialsBaseURL}/${fileName}` })); - materials = materials.concat(usdMaterials); materials = materials.concat(gltfMaterials); materials = materials.concat(openMaterials); -materials = materials.concat(locMaterials); const geometryFiles = "../../resources/Geometry"; const geometryFilesURL = "Geometry"; @@ -90,7 +81,6 @@ module.exports = { { from: usdSurfaceMaterials, to: usdSurfaceMaterialsBaseURL }, { from: gltfPbrMaterials, to: gltfPbrMaterialsBaseURL }, { from: openPbrMaterials, to: openPbrMaterialsBaseURL }, - { from: localMaterials, to: localMaterialsBaseURL }, { from: "../build/bin/JsMaterialXCore.wasm" }, { from: "../build/bin/JsMaterialXCore.js" }, { from: "../build/bin/JsMaterialXGenShader.wasm" },