Upgrade three.js and removed wwobjloader2

Author: wrangelvid

Readme.md

@@ -626,7 +626,7 @@ might damage other software on your computer.
 1. Install [yarn](https://yarnpkg.com/en/docs/install). This should also install `node` and `npm`. Try running `yarn -v` and `npm -v` to make sure those programs are installed.
 2. Run `yarn`
     * This will read the `project.json` file and install all the necessary javascript dependencies.
-3. Run `npm run build`
+3. Run `yarn run build`
     * This will run webpack and create the bundled output in `dist/main.min.js`. The build script will also watch for changes to the MeshCat source files and regenerate the bundle whenever those source files change.
 4. Try it out! You can load the bundled `main.min.js` in your own application, or you can open up `dist/index.html` in your browser.
 

dist/main.min.js

@@ -28,38 +28,11 @@
   },
   {
     "name": "three",
-    "version": "0.163.0",
+    "version": "0.176.0",
     "author": "mrdoob",
     "repository": "https://github.com/mrdoob/three.js",
-    "source": "https://registry.npmjs.org/three/-/three-0.163.0.tgz",
+    "source": "https://registry.npmjs.org/three/-/three-0.176.0.tgz",
     "license": "MIT",
-    "licenseText": "The MIT License\n\nCopyright © 2010-2024 three.js authors\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in\nall copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\nTHE SOFTWARE.\n"
-  },
-  {
-    "name": "wtd-core",
-    "version": "3.0.0",
-    "author": "kaisalmen (https://www.kaisalmen.de)",
-    "repository": "https://github.com/kaisalmen/wtd",
-    "source": "https://registry.npmjs.org/wtd-core/-/wtd-core-3.0.0.tgz",
-    "license": "MIT",
-    "licenseText": "MIT License\n\nCopyright (c) 2021-2024 Kai Salmen\n\nPermission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the \"Software\"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n"
-  },
-  {
-    "name": "wtd-three-ext",
-    "version": "3.0.0",
-    "author": "kaisalmen (https://www.kaisalmen.de)",
-    "repository": "https://github.com/kaisalmen/wtd",
-    "source": "https://registry.npmjs.org/wtd-three-ext/-/wtd-three-ext-3.0.0.tgz",
-    "license": "MIT",
-    "licenseText": "MIT License\n\nCopyright (c) 2021-2024 Kai Salmen\n\nPermission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the \"Software\"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n"
-  },
-  {
-    "name": "wwobjloader2",
-    "version": "6.2.1",
-    "author": "kaisalmen (https://www.kaisalmen.de)",
-    "repository": "https://github.com/kaisalmen/WWOBJLoader",
-    "source": "https://registry.npmjs.org/wwobjloader2/-/wwobjloader2-6.2.1.tgz",
-    "license": "MIT",
-    "licenseText": "MIT License\n\nCopyright (c) 2016-2022 Kai Salmen\n\nPermission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the \"Software\"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n"
+    "licenseText": "The MIT License\n\nCopyright © 2010-2025 three.js authors\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in\nall copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\nTHE SOFTWARE.\n"
   }
 ]

dist/main.min.js.THIRD_PARTY_LICENSES.json

@@ -14,9 +14,8 @@
     "@msgpack/msgpack": "^2.8.0",
     "ccapture.js": "aceslowman/ccapture.js#npm-fix",
     "dat.gui": "^0.7.9",
-    "three": "^0.163.0",
+    "three": "^0.176.0",
     "three-wtm": "^1.0",
-    "wwobjloader2": "^6.2.1",
     "yarn": "^1.22.21"
   },
   "scripts": {

package.json

@@ -2,7 +2,7 @@ import * as THREE from 'three';
 var msgpack = require('@msgpack/msgpack');
 var dat = require('dat.gui').default; // TODO: why is .default needed?
 import {mergeGeometries} from 'three/examples/jsm/utils/BufferGeometryUtils.js';
-import {OBJLoader2, MtlObjBridge} from 'wwobjloader2'
+import {OBJLoader} from 'three/addons/loaders/OBJLoader.js';
 import {ColladaLoader} from 'three/examples/jsm/loaders/ColladaLoader.js';
 import {DRACOLoader} from 'three/examples/jsm/loaders/DRACOLoader.js';
 import {GLTFLoader} from 'three/examples/jsm/loaders/GLTFLoader.js';
@@ -196,7 +196,7 @@ function handle_special_geometry(geom) {
     }
     if (geom.type == "_meshfile_geometry") {
         if (geom.format == "obj") {
-            let loader = new OBJLoader2();
+            let loader = new OBJLoader();
             let obj = loader.parse(geom.data + "\n");
             let loaded_geom = merge_geometries(obj);
             loaded_geom.uuid = geom.uuid;
@@ -276,11 +276,11 @@ class ExtensibleObjectLoader extends THREE.ObjectLoader {
                 return url;
             });
             if (json.format == "obj") {
-                let loader = new OBJLoader2(manager);
+                let loader = new OBJLoader(manager);
                 if (json.mtl_library) {
                     let mtl_loader = new MTLLoader(manager);
-                    let mtl_parse_result = mtl_loader.parse(json.mtl_library + "\n", "");
-                    let materials = MtlObjBridge.addMaterialsFromMtlLoader(mtl_parse_result);
+                    let materials = mtl_loader.parse(json.mtl_library + "\n", "");
+                    materials.preload();
                     loader.setMaterials(materials);
                     this.onTextureLoad();
                 }

src/index.js

@@ -785,15 +785,10 @@ three@^0.133.1:
   resolved "https://registry.yarnpkg.com/three/-/three-0.133.1.tgz#5606f4817d67a09d9212d4ccbd6826564774f8f4"
   integrity sha512-WydohO8ll949B0FTD6MGz59Yv2Lwj8hvObg/0Heh2r42S6+tQC1WByfCNRdmG4D7+odfGod+n8JPV1I2xrboWw==
 
-three@^0.163.0, three@~0.163.0:
-  version "0.163.0"
-  resolved "https://registry.yarnpkg.com/three/-/three-0.163.0.tgz#cbfefbfd64a1353ab7cc8bf0fc396ddca1875a49"
-  integrity sha512-HlMgCb2TF/dTLRtknBnjUTsR8FsDqBY43itYop2+Zg822I+Kd0Ua2vs8CvfBVefXkBdNDrLMoRTGCIIpfCuDew==
-
-three@~0.160.0:
-  version "0.160.1"
-  resolved "https://registry.yarnpkg.com/three/-/three-0.160.1.tgz#61fe2907312e8604b1f64187f58e047503847413"
-  integrity sha512-Bgl2wPJypDOZ1stAxwfWAcJ0WQf7QzlptsxkjYiURPz+n5k4RBDLsq+6f9Y75TYxn6aHLcWz+JNmwTOXWrQTBQ==
+three@^0.176.0:
+  version "0.176.0"
+  resolved "https://registry.yarnpkg.com/three/-/three-0.176.0.tgz#a30c1974e46db5745e4f96dd9ee2028d71e16ecf"
+  integrity sha512-PWRKYWQo23ojf9oZSlRGH8K09q7nRSWx6LY/HF/UUrMdYgN9i1e2OwJYHoQjwc6HF/4lvvYLC5YC1X8UJL2ZpA==
 
 undici-types@~5.26.4:
   version "5.26.5"
@@ -909,28 +904,6 @@ wildcard@^2.0.0:
   resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.1.tgz#5ab10d02487198954836b6349f74fff961e10f67"
   integrity sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ==
 
-wtd-core@~3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/wtd-core/-/wtd-core-3.0.0.tgz#bff8005de29a37df807844e16dcfb36df3c64cd9"
-  integrity sha512-LSPfAQ5ULSV5vPhipcjdQvV5xOx25QesYK23jwUOF99xOx6fuulk7CMQerERRwA4uoQooNmRd8AT6IPBwORlWQ==
-
-wtd-three-ext@~3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/wtd-three-ext/-/wtd-three-ext-3.0.0.tgz#4d12f951635bd41313d790f74908f71e9e379b2c"
-  integrity sha512-PLZJipCAiinot8D1uB4A7+XHxPAYeZXDhczbbazK7pKdqpE77zMizQH4rSZsaNbzktgnIfpgK/ODqhJTdrUjUw==
-  dependencies:
-    three "~0.160.0"
-    wtd-core "~3.0.0"
-
-wwobjloader2@^6.2.1:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/wwobjloader2/-/wwobjloader2-6.2.1.tgz#59513efaa46cde5e1f751279fcca31abdcb0aae9"
-  integrity sha512-/v/sfUX0PMQAI8souzCs6xsO9LR3RyL+ujnOiS/1pngUlakKyHYC5XMQvu77pTeWzY3rzNyt5Q/bg5O3RukA+g==
-  dependencies:
-    three "~0.163.0"
-    wtd-core "~3.0.0"
-    wtd-three-ext "~3.0.0"
-
 yarn@^1.22.21:
   version "1.22.22"
   resolved "https://registry.yarnpkg.com/yarn/-/yarn-1.22.22.tgz#ac34549e6aa8e7ead463a7407e1c7390f61a6610"