three-stdlib 2.23.4 → 2.23.5

package/README.md

@@ -10,7 +10,9 @@ Stand-alone version of [threejs/examples/jsm](https://github.com/mrdoob/three.js
 
 ## Basic usage
 
-    npm install three-stdlib
+```bash
+npm install three-stdlib
+```
 
 ```ts
 // Export collection
@@ -21,24 +23,33 @@ import { OrbitControls, ... } from 'three-stdlib'
 
 ## Problem
 
-`threejs/examples` are usually regarded as something that you copy/paste into your project and adapt to your needs. That's not how people use it, and this has caused numerous issues in the past.
+`three/examples` are usually regarded as something that you copy/paste into your project and adapt to your needs. That's not how people use it, and this has caused numerous issues in the past.
 
 ## Solution
 
-- A build system for esm and cjs
-- Version managed dependencies
+- A build system for ESM and CJS, compatible with browser, workers, and Node
 - Class based, optimized for tree-shaking, no globals, exports instead of collections
-- Single flatbundle as well as individual transpiles
 - Typesafety with simple annotation-like types
-- CI, tests, linting, formatting (prettier)
+- SemVer and NPM managed dependencies
 
 But most importantly, allowing more people that use and rely on these primitives to hold a little stake, and to share the weight of maintaining it.
 
-## How to contribute
+## How to Contribute
+
+1.  Fork and clone the repo
+2.  Run `yarn install` to install dependencies
+3.  Create a branch for your PR with `git checkout -b pr-type/issue-number-your-branch-name beta
+4.  Let's get cooking! 👨🏻‍🍳🥓
+
+### Commit Guidelines
+
+Be sure your commit messages follow this specification: https://conventionalcommits.org/en/v1.0.0-beta.4
+
+## Publishing
 
-If you want to get involved you could do any of the following:
+We use `semantic-release-action` to deploy the package. Because of this only certain commits will trigger the action of creating a release:
 
-- Help to maintain and sync the existing primitives
-- Create stories for these examples for our dedicated storybook
-- Convert some of the files to Typescript
-- Add new examples for the library you think could be helpful for others
+- `chore` will not release a new version
+- `fix:` will create a `0.0.x` version
+- `feat:` will create a `0.x.0` version
+- `BREAKING CHANGE:` will create a `x.0.0` version

package/loaders/GLTFLoader.cjs

@@ -42,6 +42,9 @@ class GLTFLoader extends THREE.Loader {
     this.register(function(parser) {
       return new GLTFMaterialsIridescenceExtension(parser);
     });
+    this.register(function(parser) {
+      return new GLTFMaterialsAnisotropyExtension(parser);
+    });
     this.register(function(parser) {
       return new GLTFLightsExtension(parser);
     });
@@ -129,10 +132,11 @@ class GLTFLoader extends THREE.Loader {
     let json;
     const extensions = {};
     const plugins = {};
+    const textDecoder = new TextDecoder();
     if (typeof data === "string") {
       json = JSON.parse(data);
     } else if (data instanceof ArrayBuffer) {
-      const magic = THREE.LoaderUtils.decodeText(new Uint8Array(data.slice(0, 4)));
+      const magic = textDecoder.decode(new Uint8Array(data, 0, 4));
       if (magic === BINARY_EXTENSION_HEADER_MAGIC) {
         try {
           extensions[EXTENSIONS.KHR_BINARY_GLTF] = new GLTFBinaryExtension(data);
@@ -143,7 +147,7 @@ class GLTFLoader extends THREE.Loader {
         }
         json = JSON.parse(extensions[EXTENSIONS.KHR_BINARY_GLTF].content);
       } else {
-        json = JSON.parse(THREE.LoaderUtils.decodeText(new Uint8Array(data)));
+        json = JSON.parse(textDecoder.decode(data));
       }
     } else {
       json = data;
@@ -229,6 +233,7 @@ const EXTENSIONS = {
   KHR_MATERIALS_SPECULAR: "KHR_materials_specular",
   KHR_MATERIALS_TRANSMISSION: "KHR_materials_transmission",
   KHR_MATERIALS_IRIDESCENCE: "KHR_materials_iridescence",
+  KHR_MATERIALS_ANISOTROPY: "KHR_materials_anisotropy",
   KHR_MATERIALS_UNLIT: "KHR_materials_unlit",
   KHR_MATERIALS_VOLUME: "KHR_materials_volume",
   KHR_TEXTURE_BASISU: "KHR_texture_basisu",
@@ -343,7 +348,7 @@ class GLTFMaterialsUnlitExtension {
         materialParams.opacity = array[3];
       }
       if (metallicRoughness.baseColorTexture !== void 0) {
-        pending.push(parser.assignTexture(materialParams, "map", metallicRoughness.baseColorTexture, 3001));
+        pending.push(parser.assignTexture(materialParams, "map", metallicRoughness.baseColorTexture, THREE.SRGBColorSpace));
       }
     }
     return Promise.all(pending);
@@ -485,7 +490,7 @@ class GLTFMaterialsSheenExtension {
       materialParams.sheenRoughness = extension.sheenRoughnessFactor;
     }
     if (extension.sheenColorTexture !== void 0) {
-      pending.push(parser.assignTexture(materialParams, "sheenColorMap", extension.sheenColorTexture, 3001));
+      pending.push(parser.assignTexture(materialParams, "sheenColorMap", extension.sheenColorTexture, THREE.SRGBColorSpace));
     }
     if (extension.sheenRoughnessTexture !== void 0) {
       pending.push(parser.assignTexture(materialParams, "sheenRoughnessMap", extension.sheenRoughnessTexture));
@@ -603,13 +608,44 @@ class GLTFMaterialsSpecularExtension {
     materialParams.specularColor = new THREE.Color(colorArray[0], colorArray[1], colorArray[2]);
     if (extension.specularColorTexture !== void 0) {
       pending.push(
-        parser.assignTexture(materialParams, "specularColorMap", extension.specularColorTexture, 3001)
-        // sRGBEncoding
+        parser.assignTexture(materialParams, "specularColorMap", extension.specularColorTexture, THREE.SRGBColorSpace)
       );
     }
     return Promise.all(pending);
   }
 }
+class GLTFMaterialsAnisotropyExtension {
+  constructor(parser) {
+    this.parser = parser;
+    this.name = EXTENSIONS.KHR_MATERIALS_ANISOTROPY;
+  }
+  getMaterialType(materialIndex) {
+    const parser = this.parser;
+    const materialDef = parser.json.materials[materialIndex];
+    if (!materialDef.extensions || !materialDef.extensions[this.name])
+      return null;
+    return THREE.MeshPhysicalMaterial;
+  }
+  extendMaterialParams(materialIndex, materialParams) {
+    const parser = this.parser;
+    const materialDef = parser.json.materials[materialIndex];
+    if (!materialDef.extensions || !materialDef.extensions[this.name]) {
+      return Promise.resolve();
+    }
+    const pending = [];
+    const extension = materialDef.extensions[this.name];
+    if (extension.anisotropyStrength !== void 0) {
+      materialParams.anisotropy = extension.anisotropyStrength;
+    }
+    if (extension.anisotropyRotation !== void 0) {
+      materialParams.anisotropyRotation = extension.anisotropyRotation;
+    }
+    if (extension.anisotropyTexture !== void 0) {
+      pending.push(parser.assignTexture(materialParams, "anisotropyMap", extension.anisotropyTexture));
+    }
+    return Promise.all(pending);
+  }
+}
 class GLTFTextureBasisUExtension {
   constructor(parser) {
     this.parser = parser;
@@ -854,8 +890,9 @@ class GLTFBinaryExtension {
     this.content = null;
     this.body = null;
     const headerView = new DataView(data, 0, BINARY_EXTENSION_HEADER_LENGTH);
+    const textDecoder = new TextDecoder();
     this.header = {
-      magic: THREE.LoaderUtils.decodeText(new Uint8Array(data.slice(0, 4))),
+      magic: textDecoder.decode(new Uint8Array(data.slice(0, 4))),
       version: headerView.getUint32(4, true),
       length: headerView.getUint32(8, true)
     };
@@ -874,7 +911,7 @@ class GLTFBinaryExtension {
       chunkIndex += 4;
       if (chunkType === BINARY_EXTENSION_CHUNK_TYPES.JSON) {
         const contentArray = new Uint8Array(data, BINARY_EXTENSION_HEADER_LENGTH + chunkIndex, chunkLength);
-        this.content = THREE.LoaderUtils.decodeText(contentArray);
+        this.content = textDecoder.decode(contentArray);
       } else if (chunkType === BINARY_EXTENSION_CHUNK_TYPES.BIN) {
         const byteOffset = BINARY_EXTENSION_HEADER_LENGTH + chunkIndex;
         this.body = data.slice(byteOffset, byteOffset + chunkLength);
@@ -1004,7 +1041,7 @@ class GLTFCubicSplineInterpolant extends THREE.Interpolant {
     return result;
   }
 }
-const _q = /* @__PURE__ */ new THREE.Quaternion();
+const _q = new THREE.Quaternion();
 class GLTFCubicSplineQuaternionInterpolant extends GLTFCubicSplineInterpolant {
   interpolate_(i1, t0, t, t1) {
     const result = super.interpolate_(i1, t0, t, t1);
@@ -1067,18 +1104,10 @@ const ATTRIBUTES = {
   POSITION: "position",
   NORMAL: "normal",
   TANGENT: "tangent",
-  // uv => uv1, 4 uv channels
-  // https://github.com/mrdoob/three.js/pull/25943
-  // https://github.com/mrdoob/three.js/pull/25788
-  ...THREE.REVISION.replace(/\D+/g, "") >= 152 ? {
-    TEXCOORD_0: "uv",
-    TEXCOORD_1: "uv1",
-    TEXCOORD_2: "uv2",
-    TEXCOORD_3: "uv3"
-  } : {
-    TEXCOORD_0: "uv",
-    TEXCOORD_1: "uv2"
-  },
+  TEXCOORD_0: "uv",
+  TEXCOORD_1: "uv1",
+  TEXCOORD_2: "uv2",
+  TEXCOORD_3: "uv3",
   COLOR_0: "color",
   WEIGHTS_0: "skinWeight",
   JOINTS_0: "skinIndex"
@@ -1205,13 +1234,18 @@ function updateMorphTargets(mesh, meshDef) {
   }
 }
 function createPrimitiveKey(primitiveDef) {
-  const dracoExtension = primitiveDef.extensions && primitiveDef.extensions[EXTENSIONS.KHR_DRACO_MESH_COMPRESSION];
   let geometryKey;
+  const dracoExtension = primitiveDef.extensions && primitiveDef.extensions[EXTENSIONS.KHR_DRACO_MESH_COMPRESSION];
   if (dracoExtension) {
     geometryKey = "draco:" + dracoExtension.bufferView + ":" + dracoExtension.indices + ":" + createAttributesKey(dracoExtension.attributes);
   } else {
     geometryKey = primitiveDef.indices + ":" + createAttributesKey(primitiveDef.attributes) + ":" + primitiveDef.mode;
   }
+  if (primitiveDef.targets !== void 0) {
+    for (let i = 0, il = primitiveDef.targets.length; i < il; i++) {
+      geometryKey += ":" + createAttributesKey(primitiveDef.targets[i]);
+    }
+  }
   return geometryKey;
 }
 function createAttributesKey(attributes) {
@@ -1243,7 +1277,7 @@ function getImageURIMimeType(uri) {
     return "image/webp";
   return "image/png";
 }
-const _identityMatrix = /* @__PURE__ */ new THREE.Matrix4();
+const _identityMatrix = new THREE.Matrix4();
 class GLTFParser {
   constructor(json = {}, options = {}) {
     this.json = json;
@@ -1725,7 +1759,7 @@ class GLTFParser {
    * @param {Object} mapDef
    * @return {Promise<Texture>}
    */
-  assignTexture(materialParams, mapName, mapDef, encoding) {
+  assignTexture(materialParams, mapName, mapDef, colorSpace) {
     const parser = this;
     return this.getDependency("texture", mapDef.index).then(function(texture) {
       if (!texture)
@@ -1742,11 +1776,8 @@ class GLTFParser {
           parser.associations.set(texture, gltfReference);
         }
       }
-      if (encoding !== void 0) {
-        if ("colorSpace" in texture)
-          texture.colorSpace = encoding === 3001 ? "srgb" : "srgb-linear";
-        else
-          texture.encoding = encoding;
+      if (colorSpace !== void 0) {
+        texture.colorSpace = colorSpace;
       }
       materialParams[mapName] = texture;
       return texture;
@@ -1849,7 +1880,7 @@ class GLTFParser {
         materialParams.opacity = array[3];
       }
       if (metallicRoughness.baseColorTexture !== void 0) {
-        pending.push(parser.assignTexture(materialParams, "map", metallicRoughness.baseColorTexture, 3001));
+        pending.push(parser.assignTexture(materialParams, "map", metallicRoughness.baseColorTexture, THREE.SRGBColorSpace));
       }
       materialParams.metalness = metallicRoughness.metallicFactor !== void 0 ? metallicRoughness.metallicFactor : 1;
       materialParams.roughness = metallicRoughness.roughnessFactor !== void 0 ? metallicRoughness.roughnessFactor : 1;
@@ -1899,7 +1930,7 @@ class GLTFParser {
       materialParams.emissive = new THREE.Color().fromArray(materialDef.emissiveFactor);
     }
     if (materialDef.emissiveTexture !== void 0 && materialType !== THREE.MeshBasicMaterial) {
-      pending.push(parser.assignTexture(materialParams, "emissiveMap", materialDef.emissiveTexture, 3001));
+      pending.push(parser.assignTexture(materialParams, "emissiveMap", materialDef.emissiveTexture, THREE.SRGBColorSpace));
     }
     return Promise.all(pending).then(function() {
       const material = new materialType(materialParams);
@@ -1915,12 +1946,12 @@ class GLTFParser {
   /** When Object3D instances are targeted by animation, they need unique names. */
   createUniqueName(originalName) {
     const sanitizedName = THREE.PropertyBinding.sanitizeNodeName(originalName || "");
-    let name = sanitizedName;
-    for (let i = 1; this.nodeNamesUsed[name]; ++i) {
-      name = sanitizedName + "_" + i;
+    if (sanitizedName in this.nodeNamesUsed) {
+      return sanitizedName + "_" + ++this.nodeNamesUsed[sanitizedName];
+    } else {
+      this.nodeNamesUsed[sanitizedName] = 0;
+      return sanitizedName;
     }
-    this.nodeNamesUsed[name] = true;
-    return name;
   }
   /**
    * Specification: https://github.com/KhronosGroup/glTF/blob/master/specification/2.0/README.md#geometry
@@ -2023,9 +2054,13 @@ class GLTFParser {
         });
       }
       if (meshes.length === 1) {
+        if (meshDef.extensions)
+          addUnknownExtensionsToUserData(extensions, meshes[0], meshDef);
         return meshes[0];
       }
       const group = new THREE.Group();
+      if (meshDef.extensions)
+        addUnknownExtensionsToUserData(extensions, group, meshDef);
       parser.associations.set(group, { meshes: meshIndex });
       for (let i = 0, il = meshes.length; i < il; i++) {
         group.add(meshes[i]);

package/loaders/GLTFLoader.js

@@ -1,4 +1,4 @@
-import { Loader, LoaderUtils, FileLoader, Color, SpotLight, PointLight, DirectionalLight, MeshBasicMaterial, MeshPhysicalMaterial, Vector2, Matrix4, Vector3, Quaternion, InstancedMesh, Object3D, Interpolant, NearestFilter, LinearFilter, NearestMipmapNearestFilter, LinearMipmapNearestFilter, NearestMipmapLinearFilter, LinearMipmapLinearFilter, ClampToEdgeWrapping, MirroredRepeatWrapping, RepeatWrapping, REVISION, InterpolateLinear, InterpolateDiscrete, MeshStandardMaterial, FrontSide, TextureLoader, ImageBitmapLoader, BufferAttribute, InterleavedBuffer, InterleavedBufferAttribute, Texture, PointsMaterial, Material, LineBasicMaterial, DoubleSide, PropertyBinding, BufferGeometry, SkinnedMesh, Mesh, TriangleStripDrawMode, TriangleFanDrawMode, LineSegments, Line, LineLoop, Points, Group, PerspectiveCamera, MathUtils, OrthographicCamera, Skeleton, VectorKeyframeTrack, QuaternionKeyframeTrack, NumberKeyframeTrack, AnimationClip, Bone, Box3, Sphere } from "three";
+import { Loader, LoaderUtils, FileLoader, Color, SpotLight, PointLight, DirectionalLight, MeshBasicMaterial, SRGBColorSpace, MeshPhysicalMaterial, Vector2, Matrix4, Vector3, Quaternion, InstancedMesh, Object3D, Interpolant, NearestFilter, LinearFilter, NearestMipmapNearestFilter, LinearMipmapNearestFilter, NearestMipmapLinearFilter, LinearMipmapLinearFilter, ClampToEdgeWrapping, MirroredRepeatWrapping, RepeatWrapping, InterpolateLinear, InterpolateDiscrete, MeshStandardMaterial, FrontSide, TextureLoader, ImageBitmapLoader, BufferAttribute, InterleavedBuffer, InterleavedBufferAttribute, Texture, PointsMaterial, Material, LineBasicMaterial, DoubleSide, PropertyBinding, BufferGeometry, SkinnedMesh, Mesh, TriangleStripDrawMode, TriangleFanDrawMode, LineSegments, Line, LineLoop, Points, Group, PerspectiveCamera, MathUtils, OrthographicCamera, Skeleton, VectorKeyframeTrack, QuaternionKeyframeTrack, NumberKeyframeTrack, AnimationClip, Bone, Box3, Sphere } from "three";
 import { toTrianglesDrawMode } from "../utils/BufferGeometryUtils.js";
 class GLTFLoader extends Loader {
   constructor(manager) {
@@ -40,6 +40,9 @@ class GLTFLoader extends Loader {
     this.register(function(parser) {
       return new GLTFMaterialsIridescenceExtension(parser);
     });
+    this.register(function(parser) {
+      return new GLTFMaterialsAnisotropyExtension(parser);
+    });
     this.register(function(parser) {
       return new GLTFLightsExtension(parser);
     });
@@ -127,10 +130,11 @@ class GLTFLoader extends Loader {
     let json;
     const extensions = {};
     const plugins = {};
+    const textDecoder = new TextDecoder();
     if (typeof data === "string") {
       json = JSON.parse(data);
     } else if (data instanceof ArrayBuffer) {
-      const magic = LoaderUtils.decodeText(new Uint8Array(data.slice(0, 4)));
+      const magic = textDecoder.decode(new Uint8Array(data, 0, 4));
       if (magic === BINARY_EXTENSION_HEADER_MAGIC) {
         try {
           extensions[EXTENSIONS.KHR_BINARY_GLTF] = new GLTFBinaryExtension(data);
@@ -141,7 +145,7 @@ class GLTFLoader extends Loader {
         }
         json = JSON.parse(extensions[EXTENSIONS.KHR_BINARY_GLTF].content);
       } else {
-        json = JSON.parse(LoaderUtils.decodeText(new Uint8Array(data)));
+        json = JSON.parse(textDecoder.decode(data));
       }
     } else {
       json = data;
@@ -227,6 +231,7 @@ const EXTENSIONS = {
   KHR_MATERIALS_SPECULAR: "KHR_materials_specular",
   KHR_MATERIALS_TRANSMISSION: "KHR_materials_transmission",
   KHR_MATERIALS_IRIDESCENCE: "KHR_materials_iridescence",
+  KHR_MATERIALS_ANISOTROPY: "KHR_materials_anisotropy",
   KHR_MATERIALS_UNLIT: "KHR_materials_unlit",
   KHR_MATERIALS_VOLUME: "KHR_materials_volume",
   KHR_TEXTURE_BASISU: "KHR_texture_basisu",
@@ -341,7 +346,7 @@ class GLTFMaterialsUnlitExtension {
         materialParams.opacity = array[3];
       }
       if (metallicRoughness.baseColorTexture !== void 0) {
-        pending.push(parser.assignTexture(materialParams, "map", metallicRoughness.baseColorTexture, 3001));
+        pending.push(parser.assignTexture(materialParams, "map", metallicRoughness.baseColorTexture, SRGBColorSpace));
       }
     }
     return Promise.all(pending);
@@ -483,7 +488,7 @@ class GLTFMaterialsSheenExtension {
       materialParams.sheenRoughness = extension.sheenRoughnessFactor;
     }
     if (extension.sheenColorTexture !== void 0) {
-      pending.push(parser.assignTexture(materialParams, "sheenColorMap", extension.sheenColorTexture, 3001));
+      pending.push(parser.assignTexture(materialParams, "sheenColorMap", extension.sheenColorTexture, SRGBColorSpace));
     }
     if (extension.sheenRoughnessTexture !== void 0) {
       pending.push(parser.assignTexture(materialParams, "sheenRoughnessMap", extension.sheenRoughnessTexture));
@@ -601,13 +606,44 @@ class GLTFMaterialsSpecularExtension {
     materialParams.specularColor = new Color(colorArray[0], colorArray[1], colorArray[2]);
     if (extension.specularColorTexture !== void 0) {
       pending.push(
-        parser.assignTexture(materialParams, "specularColorMap", extension.specularColorTexture, 3001)
-        // sRGBEncoding
+        parser.assignTexture(materialParams, "specularColorMap", extension.specularColorTexture, SRGBColorSpace)
       );
     }
     return Promise.all(pending);
   }
 }
+class GLTFMaterialsAnisotropyExtension {
+  constructor(parser) {
+    this.parser = parser;
+    this.name = EXTENSIONS.KHR_MATERIALS_ANISOTROPY;
+  }
+  getMaterialType(materialIndex) {
+    const parser = this.parser;
+    const materialDef = parser.json.materials[materialIndex];
+    if (!materialDef.extensions || !materialDef.extensions[this.name])
+      return null;
+    return MeshPhysicalMaterial;
+  }
+  extendMaterialParams(materialIndex, materialParams) {
+    const parser = this.parser;
+    const materialDef = parser.json.materials[materialIndex];
+    if (!materialDef.extensions || !materialDef.extensions[this.name]) {
+      return Promise.resolve();
+    }
+    const pending = [];
+    const extension = materialDef.extensions[this.name];
+    if (extension.anisotropyStrength !== void 0) {
+      materialParams.anisotropy = extension.anisotropyStrength;
+    }
+    if (extension.anisotropyRotation !== void 0) {
+      materialParams.anisotropyRotation = extension.anisotropyRotation;
+    }
+    if (extension.anisotropyTexture !== void 0) {
+      pending.push(parser.assignTexture(materialParams, "anisotropyMap", extension.anisotropyTexture));
+    }
+    return Promise.all(pending);
+  }
+}
 class GLTFTextureBasisUExtension {
   constructor(parser) {
     this.parser = parser;
@@ -852,8 +888,9 @@ class GLTFBinaryExtension {
     this.content = null;
     this.body = null;
     const headerView = new DataView(data, 0, BINARY_EXTENSION_HEADER_LENGTH);
+    const textDecoder = new TextDecoder();
     this.header = {
-      magic: LoaderUtils.decodeText(new Uint8Array(data.slice(0, 4))),
+      magic: textDecoder.decode(new Uint8Array(data.slice(0, 4))),
       version: headerView.getUint32(4, true),
       length: headerView.getUint32(8, true)
     };
@@ -872,7 +909,7 @@ class GLTFBinaryExtension {
       chunkIndex += 4;
       if (chunkType === BINARY_EXTENSION_CHUNK_TYPES.JSON) {
         const contentArray = new Uint8Array(data, BINARY_EXTENSION_HEADER_LENGTH + chunkIndex, chunkLength);
-        this.content = LoaderUtils.decodeText(contentArray);
+        this.content = textDecoder.decode(contentArray);
       } else if (chunkType === BINARY_EXTENSION_CHUNK_TYPES.BIN) {
         const byteOffset = BINARY_EXTENSION_HEADER_LENGTH + chunkIndex;
         this.body = data.slice(byteOffset, byteOffset + chunkLength);
@@ -1002,7 +1039,7 @@ class GLTFCubicSplineInterpolant extends Interpolant {
     return result;
   }
 }
-const _q = /* @__PURE__ */ new Quaternion();
+const _q = new Quaternion();
 class GLTFCubicSplineQuaternionInterpolant extends GLTFCubicSplineInterpolant {
   interpolate_(i1, t0, t, t1) {
     const result = super.interpolate_(i1, t0, t, t1);
@@ -1065,18 +1102,10 @@ const ATTRIBUTES = {
   POSITION: "position",
   NORMAL: "normal",
   TANGENT: "tangent",
-  // uv => uv1, 4 uv channels
-  // https://github.com/mrdoob/three.js/pull/25943
-  // https://github.com/mrdoob/three.js/pull/25788
-  ...REVISION.replace(/\D+/g, "") >= 152 ? {
-    TEXCOORD_0: "uv",
-    TEXCOORD_1: "uv1",
-    TEXCOORD_2: "uv2",
-    TEXCOORD_3: "uv3"
-  } : {
-    TEXCOORD_0: "uv",
-    TEXCOORD_1: "uv2"
-  },
+  TEXCOORD_0: "uv",
+  TEXCOORD_1: "uv1",
+  TEXCOORD_2: "uv2",
+  TEXCOORD_3: "uv3",
   COLOR_0: "color",
   WEIGHTS_0: "skinWeight",
   JOINTS_0: "skinIndex"
@@ -1203,13 +1232,18 @@ function updateMorphTargets(mesh, meshDef) {
   }
 }
 function createPrimitiveKey(primitiveDef) {
-  const dracoExtension = primitiveDef.extensions && primitiveDef.extensions[EXTENSIONS.KHR_DRACO_MESH_COMPRESSION];
   let geometryKey;
+  const dracoExtension = primitiveDef.extensions && primitiveDef.extensions[EXTENSIONS.KHR_DRACO_MESH_COMPRESSION];
   if (dracoExtension) {
     geometryKey = "draco:" + dracoExtension.bufferView + ":" + dracoExtension.indices + ":" + createAttributesKey(dracoExtension.attributes);
   } else {
     geometryKey = primitiveDef.indices + ":" + createAttributesKey(primitiveDef.attributes) + ":" + primitiveDef.mode;
   }
+  if (primitiveDef.targets !== void 0) {
+    for (let i = 0, il = primitiveDef.targets.length; i < il; i++) {
+      geometryKey += ":" + createAttributesKey(primitiveDef.targets[i]);
+    }
+  }
   return geometryKey;
 }
 function createAttributesKey(attributes) {
@@ -1241,7 +1275,7 @@ function getImageURIMimeType(uri) {
     return "image/webp";
   return "image/png";
 }
-const _identityMatrix = /* @__PURE__ */ new Matrix4();
+const _identityMatrix = new Matrix4();
 class GLTFParser {
   constructor(json = {}, options = {}) {
     this.json = json;
@@ -1723,7 +1757,7 @@ class GLTFParser {
    * @param {Object} mapDef
    * @return {Promise<Texture>}
    */
-  assignTexture(materialParams, mapName, mapDef, encoding) {
+  assignTexture(materialParams, mapName, mapDef, colorSpace) {
     const parser = this;
     return this.getDependency("texture", mapDef.index).then(function(texture) {
       if (!texture)
@@ -1740,11 +1774,8 @@ class GLTFParser {
           parser.associations.set(texture, gltfReference);
         }
       }
-      if (encoding !== void 0) {
-        if ("colorSpace" in texture)
-          texture.colorSpace = encoding === 3001 ? "srgb" : "srgb-linear";
-        else
-          texture.encoding = encoding;
+      if (colorSpace !== void 0) {
+        texture.colorSpace = colorSpace;
       }
       materialParams[mapName] = texture;
       return texture;
@@ -1847,7 +1878,7 @@ class GLTFParser {
         materialParams.opacity = array[3];
       }
       if (metallicRoughness.baseColorTexture !== void 0) {
-        pending.push(parser.assignTexture(materialParams, "map", metallicRoughness.baseColorTexture, 3001));
+        pending.push(parser.assignTexture(materialParams, "map", metallicRoughness.baseColorTexture, SRGBColorSpace));
       }
       materialParams.metalness = metallicRoughness.metallicFactor !== void 0 ? metallicRoughness.metallicFactor : 1;
       materialParams.roughness = metallicRoughness.roughnessFactor !== void 0 ? metallicRoughness.roughnessFactor : 1;
@@ -1897,7 +1928,7 @@ class GLTFParser {
       materialParams.emissive = new Color().fromArray(materialDef.emissiveFactor);
     }
     if (materialDef.emissiveTexture !== void 0 && materialType !== MeshBasicMaterial) {
-      pending.push(parser.assignTexture(materialParams, "emissiveMap", materialDef.emissiveTexture, 3001));
+      pending.push(parser.assignTexture(materialParams, "emissiveMap", materialDef.emissiveTexture, SRGBColorSpace));
     }
     return Promise.all(pending).then(function() {
       const material = new materialType(materialParams);
@@ -1913,12 +1944,12 @@ class GLTFParser {
   /** When Object3D instances are targeted by animation, they need unique names. */
   createUniqueName(originalName) {
     const sanitizedName = PropertyBinding.sanitizeNodeName(originalName || "");
-    let name = sanitizedName;
-    for (let i = 1; this.nodeNamesUsed[name]; ++i) {
-      name = sanitizedName + "_" + i;
+    if (sanitizedName in this.nodeNamesUsed) {
+      return sanitizedName + "_" + ++this.nodeNamesUsed[sanitizedName];
+    } else {
+      this.nodeNamesUsed[sanitizedName] = 0;
+      return sanitizedName;
     }
-    this.nodeNamesUsed[name] = true;
-    return name;
   }
   /**
    * Specification: https://github.com/KhronosGroup/glTF/blob/master/specification/2.0/README.md#geometry
@@ -2021,9 +2052,13 @@ class GLTFParser {
         });
       }
       if (meshes.length === 1) {
+        if (meshDef.extensions)
+          addUnknownExtensionsToUserData(extensions, meshes[0], meshDef);
         return meshes[0];
       }
       const group = new Group();
+      if (meshDef.extensions)
+        addUnknownExtensionsToUserData(extensions, group, meshDef);
       parser.associations.set(group, { meshes: meshIndex });
       for (let i = 0, il = meshes.length; i < il; i++) {
         group.add(meshes[i]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "three-stdlib",
-  "version": "2.23.4",
+  "version": "2.23.5",
   "description": "stand-alone library of threejs examples",
   "keywords": [
     "three",