three-stdlib 2.23.5 → 2.23.7

package/_polyfill/CapsuleGeometry.cjs

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const THREE = require("three");
+class CapsuleGeometry extends THREE.LatheGeometry {
+  constructor(radius = 1, length = 1, capSegments = 4, radialSegments = 8) {
+    const path = new THREE.Path();
+    path.absarc(0, -length / 2, radius, Math.PI * 1.5, 0);
+    path.absarc(0, length / 2, radius, 0, Math.PI * 0.5);
+    super(path.getPoints(capSegments), radialSegments);
+    this.type = "CapsuleGeometry";
+    this.parameters = {
+      radius,
+      height: length,
+      capSegments,
+      radialSegments
+    };
+  }
+  static fromJSON(data) {
+    return new CapsuleGeometry(data.radius, data.length, data.capSegments, data.radialSegments);
+  }
+}
+exports.CapsuleGeometry = CapsuleGeometry;

package/_polyfill/CapsuleGeometry.js

@@ -0,0 +1,22 @@
+import { LatheGeometry, Path } from "three";
+class CapsuleGeometry extends LatheGeometry {
+  constructor(radius = 1, length = 1, capSegments = 4, radialSegments = 8) {
+    const path = new Path();
+    path.absarc(0, -length / 2, radius, Math.PI * 1.5, 0);
+    path.absarc(0, length / 2, radius, 0, Math.PI * 0.5);
+    super(path.getPoints(capSegments), radialSegments);
+    this.type = "CapsuleGeometry";
+    this.parameters = {
+      radius,
+      height: length,
+      capSegments,
+      radialSegments
+    };
+  }
+  static fromJSON(data) {
+    return new CapsuleGeometry(data.radius, data.length, data.capSegments, data.radialSegments);
+  }
+}
+export {
+  CapsuleGeometry
+};

package/animation/MMDPhysics.cjs

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const THREE = require("three");
+const CapsuleGeometry = require("../_polyfill/CapsuleGeometry.cjs");
 class MMDPhysics {
   /**
    * @param {THREE.SkinnedMesh} mesh
@@ -815,7 +816,7 @@ class MMDPhysicsHelper extends THREE.Object3D {
         case 1:
           return new THREE.BoxGeometry(param2.width * 2, param2.height * 2, param2.depth * 2, 8, 8, 8);
         case 2:
-          return new THREE.CapsuleGeometry(param2.width, param2.height, 8, 16);
+          return new CapsuleGeometry.CapsuleGeometry(param2.width, param2.height, 8, 16);
         default:
           return null;
       }

package/animation/MMDPhysics.js

@@ -1,4 +1,5 @@
-import { Vector3, Matrix4, Quaternion, Euler, Bone, Object3D, MeshBasicMaterial, Color, CapsuleGeometry, BoxGeometry, SphereGeometry, Mesh } from "three";
+import { Vector3, Matrix4, Quaternion, Euler, Bone, Object3D, MeshBasicMaterial, Color, BoxGeometry, SphereGeometry, Mesh } from "three";
+import { CapsuleGeometry } from "../_polyfill/CapsuleGeometry.js";
 class MMDPhysics {
   /**
    * @param {THREE.SkinnedMesh} mesh

package/exporters/GLTFExporter.cjs

@@ -560,7 +560,7 @@ class GLTFWriter {
     context.putImageData(composite, 0, 0);
     const reference = metalnessMap || roughnessMap;
     const texture = reference.clone();
-    texture.source = new THREE.Source(canvas);
+    texture.source = new THREE.Texture(canvas).source;
     if ("colorSpace" in texture)
       texture.colorSpace = "";
     else

package/exporters/GLTFExporter.js

@@ -1,4 +1,4 @@
-import { PlaneGeometry, ShaderMaterial, Uniform, Mesh, PerspectiveCamera, Scene, WebGLRenderer, Texture, NearestFilter, NearestMipmapNearestFilter, NearestMipmapLinearFilter, LinearFilter, LinearMipmapNearestFilter, LinearMipmapLinearFilter, ClampToEdgeWrapping, RepeatWrapping, MirroredRepeatWrapping, Color, MathUtils, Vector3, CompressedTexture, Source, RGBAFormat, DoubleSide, REVISION, BufferAttribute, PropertyBinding, InterpolateDiscrete, Matrix4, InterpolateLinear } from "three";
+import { PlaneGeometry, ShaderMaterial, Uniform, Mesh, PerspectiveCamera, Scene, WebGLRenderer, Texture, NearestFilter, NearestMipmapNearestFilter, NearestMipmapLinearFilter, LinearFilter, LinearMipmapNearestFilter, LinearMipmapLinearFilter, ClampToEdgeWrapping, RepeatWrapping, MirroredRepeatWrapping, Color, MathUtils, Vector3, CompressedTexture, RGBAFormat, DoubleSide, REVISION, BufferAttribute, PropertyBinding, InterpolateDiscrete, Matrix4, InterpolateLinear } from "three";
 let _renderer;
 let fullscreenQuadGeometry;
 let fullscreenQuadMaterial;
@@ -558,7 +558,7 @@ class GLTFWriter {
     context.putImageData(composite, 0, 0);
     const reference = metalnessMap || roughnessMap;
     const texture = reference.clone();
-    texture.source = new Source(canvas);
+    texture.source = new Texture(canvas).source;
     if ("colorSpace" in texture)
       texture.colorSpace = "";
     else

package/loaders/GLTFLoader.cjs

@@ -132,11 +132,10 @@ 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 = textDecoder.decode(new Uint8Array(data, 0, 4));
+      const magic = THREE.LoaderUtils.decodeText(new Uint8Array(data.slice(0, 4)));
       if (magic === BINARY_EXTENSION_HEADER_MAGIC) {
         try {
           extensions[EXTENSIONS.KHR_BINARY_GLTF] = new GLTFBinaryExtension(data);
@@ -147,7 +146,7 @@ class GLTFLoader extends THREE.Loader {
         }
         json = JSON.parse(extensions[EXTENSIONS.KHR_BINARY_GLTF].content);
       } else {
-        json = JSON.parse(textDecoder.decode(data));
+        json = JSON.parse(THREE.LoaderUtils.decodeText(new Uint8Array(data)));
       }
     } else {
       json = data;
@@ -348,7 +347,7 @@ class GLTFMaterialsUnlitExtension {
         materialParams.opacity = array[3];
       }
       if (metallicRoughness.baseColorTexture !== void 0) {
-        pending.push(parser.assignTexture(materialParams, "map", metallicRoughness.baseColorTexture, THREE.SRGBColorSpace));
+        pending.push(parser.assignTexture(materialParams, "map", metallicRoughness.baseColorTexture, 3001));
       }
     }
     return Promise.all(pending);
@@ -490,7 +489,7 @@ class GLTFMaterialsSheenExtension {
       materialParams.sheenRoughness = extension.sheenRoughnessFactor;
     }
     if (extension.sheenColorTexture !== void 0) {
-      pending.push(parser.assignTexture(materialParams, "sheenColorMap", extension.sheenColorTexture, THREE.SRGBColorSpace));
+      pending.push(parser.assignTexture(materialParams, "sheenColorMap", extension.sheenColorTexture, 3001));
     }
     if (extension.sheenRoughnessTexture !== void 0) {
       pending.push(parser.assignTexture(materialParams, "sheenRoughnessMap", extension.sheenRoughnessTexture));
@@ -608,7 +607,8 @@ 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, THREE.SRGBColorSpace)
+        parser.assignTexture(materialParams, "specularColorMap", extension.specularColorTexture, 3001)
+        // sRGBEncoding
       );
     }
     return Promise.all(pending);
@@ -890,9 +890,8 @@ 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: textDecoder.decode(new Uint8Array(data.slice(0, 4))),
+      magic: THREE.LoaderUtils.decodeText(new Uint8Array(data.slice(0, 4))),
       version: headerView.getUint32(4, true),
       length: headerView.getUint32(8, true)
     };
@@ -911,7 +910,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 = textDecoder.decode(contentArray);
+        this.content = THREE.LoaderUtils.decodeText(contentArray);
       } else if (chunkType === BINARY_EXTENSION_CHUNK_TYPES.BIN) {
         const byteOffset = BINARY_EXTENSION_HEADER_LENGTH + chunkIndex;
         this.body = data.slice(byteOffset, byteOffset + chunkLength);
@@ -1041,7 +1040,7 @@ class GLTFCubicSplineInterpolant extends THREE.Interpolant {
     return result;
   }
 }
-const _q = new THREE.Quaternion();
+const _q = /* @__PURE__ */ new THREE.Quaternion();
 class GLTFCubicSplineQuaternionInterpolant extends GLTFCubicSplineInterpolant {
   interpolate_(i1, t0, t, t1) {
     const result = super.interpolate_(i1, t0, t, t1);
@@ -1104,10 +1103,18 @@ const ATTRIBUTES = {
   POSITION: "position",
   NORMAL: "normal",
   TANGENT: "tangent",
-  TEXCOORD_0: "uv",
-  TEXCOORD_1: "uv1",
-  TEXCOORD_2: "uv2",
-  TEXCOORD_3: "uv3",
+  // 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"
+  },
   COLOR_0: "color",
   WEIGHTS_0: "skinWeight",
   JOINTS_0: "skinIndex"
@@ -1277,7 +1284,7 @@ function getImageURIMimeType(uri) {
     return "image/webp";
   return "image/png";
 }
-const _identityMatrix = new THREE.Matrix4();
+const _identityMatrix = /* @__PURE__ */ new THREE.Matrix4();
 class GLTFParser {
   constructor(json = {}, options = {}) {
     this.json = json;
@@ -1759,7 +1766,7 @@ class GLTFParser {
    * @param {Object} mapDef
    * @return {Promise<Texture>}
    */
-  assignTexture(materialParams, mapName, mapDef, colorSpace) {
+  assignTexture(materialParams, mapName, mapDef, encoding) {
     const parser = this;
     return this.getDependency("texture", mapDef.index).then(function(texture) {
       if (!texture)
@@ -1776,8 +1783,11 @@ class GLTFParser {
           parser.associations.set(texture, gltfReference);
         }
       }
-      if (colorSpace !== void 0) {
-        texture.colorSpace = colorSpace;
+      if (encoding !== void 0) {
+        if ("colorSpace" in texture)
+          texture.colorSpace = encoding === 3001 ? "srgb" : "srgb-linear";
+        else
+          texture.encoding = encoding;
       }
       materialParams[mapName] = texture;
       return texture;
@@ -1880,7 +1890,7 @@ class GLTFParser {
         materialParams.opacity = array[3];
       }
       if (metallicRoughness.baseColorTexture !== void 0) {
-        pending.push(parser.assignTexture(materialParams, "map", metallicRoughness.baseColorTexture, THREE.SRGBColorSpace));
+        pending.push(parser.assignTexture(materialParams, "map", metallicRoughness.baseColorTexture, 3001));
       }
       materialParams.metalness = metallicRoughness.metallicFactor !== void 0 ? metallicRoughness.metallicFactor : 1;
       materialParams.roughness = metallicRoughness.roughnessFactor !== void 0 ? metallicRoughness.roughnessFactor : 1;
@@ -1930,7 +1940,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, THREE.SRGBColorSpace));
+      pending.push(parser.assignTexture(materialParams, "emissiveMap", materialDef.emissiveTexture, 3001));
     }
     return Promise.all(pending).then(function() {
       const material = new materialType(materialParams);

package/loaders/GLTFLoader.js

@@ -1,4 +1,4 @@
-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 { 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 { toTrianglesDrawMode } from "../utils/BufferGeometryUtils.js";
 class GLTFLoader extends Loader {
   constructor(manager) {
@@ -130,11 +130,10 @@ 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 = textDecoder.decode(new Uint8Array(data, 0, 4));
+      const magic = LoaderUtils.decodeText(new Uint8Array(data.slice(0, 4)));
       if (magic === BINARY_EXTENSION_HEADER_MAGIC) {
         try {
           extensions[EXTENSIONS.KHR_BINARY_GLTF] = new GLTFBinaryExtension(data);
@@ -145,7 +144,7 @@ class GLTFLoader extends Loader {
         }
         json = JSON.parse(extensions[EXTENSIONS.KHR_BINARY_GLTF].content);
       } else {
-        json = JSON.parse(textDecoder.decode(data));
+        json = JSON.parse(LoaderUtils.decodeText(new Uint8Array(data)));
       }
     } else {
       json = data;
@@ -346,7 +345,7 @@ class GLTFMaterialsUnlitExtension {
         materialParams.opacity = array[3];
       }
       if (metallicRoughness.baseColorTexture !== void 0) {
-        pending.push(parser.assignTexture(materialParams, "map", metallicRoughness.baseColorTexture, SRGBColorSpace));
+        pending.push(parser.assignTexture(materialParams, "map", metallicRoughness.baseColorTexture, 3001));
       }
     }
     return Promise.all(pending);
@@ -488,7 +487,7 @@ class GLTFMaterialsSheenExtension {
       materialParams.sheenRoughness = extension.sheenRoughnessFactor;
     }
     if (extension.sheenColorTexture !== void 0) {
-      pending.push(parser.assignTexture(materialParams, "sheenColorMap", extension.sheenColorTexture, SRGBColorSpace));
+      pending.push(parser.assignTexture(materialParams, "sheenColorMap", extension.sheenColorTexture, 3001));
     }
     if (extension.sheenRoughnessTexture !== void 0) {
       pending.push(parser.assignTexture(materialParams, "sheenRoughnessMap", extension.sheenRoughnessTexture));
@@ -606,7 +605,8 @@ 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, SRGBColorSpace)
+        parser.assignTexture(materialParams, "specularColorMap", extension.specularColorTexture, 3001)
+        // sRGBEncoding
       );
     }
     return Promise.all(pending);
@@ -888,9 +888,8 @@ 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: textDecoder.decode(new Uint8Array(data.slice(0, 4))),
+      magic: LoaderUtils.decodeText(new Uint8Array(data.slice(0, 4))),
       version: headerView.getUint32(4, true),
       length: headerView.getUint32(8, true)
     };
@@ -909,7 +908,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 = textDecoder.decode(contentArray);
+        this.content = LoaderUtils.decodeText(contentArray);
       } else if (chunkType === BINARY_EXTENSION_CHUNK_TYPES.BIN) {
         const byteOffset = BINARY_EXTENSION_HEADER_LENGTH + chunkIndex;
         this.body = data.slice(byteOffset, byteOffset + chunkLength);
@@ -1039,7 +1038,7 @@ class GLTFCubicSplineInterpolant extends Interpolant {
     return result;
   }
 }
-const _q = new Quaternion();
+const _q = /* @__PURE__ */ new Quaternion();
 class GLTFCubicSplineQuaternionInterpolant extends GLTFCubicSplineInterpolant {
   interpolate_(i1, t0, t, t1) {
     const result = super.interpolate_(i1, t0, t, t1);
@@ -1102,10 +1101,18 @@ const ATTRIBUTES = {
   POSITION: "position",
   NORMAL: "normal",
   TANGENT: "tangent",
-  TEXCOORD_0: "uv",
-  TEXCOORD_1: "uv1",
-  TEXCOORD_2: "uv2",
-  TEXCOORD_3: "uv3",
+  // 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"
+  },
   COLOR_0: "color",
   WEIGHTS_0: "skinWeight",
   JOINTS_0: "skinIndex"
@@ -1275,7 +1282,7 @@ function getImageURIMimeType(uri) {
     return "image/webp";
   return "image/png";
 }
-const _identityMatrix = new Matrix4();
+const _identityMatrix = /* @__PURE__ */ new Matrix4();
 class GLTFParser {
   constructor(json = {}, options = {}) {
     this.json = json;
@@ -1757,7 +1764,7 @@ class GLTFParser {
    * @param {Object} mapDef
    * @return {Promise<Texture>}
    */
-  assignTexture(materialParams, mapName, mapDef, colorSpace) {
+  assignTexture(materialParams, mapName, mapDef, encoding) {
     const parser = this;
     return this.getDependency("texture", mapDef.index).then(function(texture) {
       if (!texture)
@@ -1774,8 +1781,11 @@ class GLTFParser {
           parser.associations.set(texture, gltfReference);
         }
       }
-      if (colorSpace !== void 0) {
-        texture.colorSpace = colorSpace;
+      if (encoding !== void 0) {
+        if ("colorSpace" in texture)
+          texture.colorSpace = encoding === 3001 ? "srgb" : "srgb-linear";
+        else
+          texture.encoding = encoding;
       }
       materialParams[mapName] = texture;
       return texture;
@@ -1878,7 +1888,7 @@ class GLTFParser {
         materialParams.opacity = array[3];
       }
       if (metallicRoughness.baseColorTexture !== void 0) {
-        pending.push(parser.assignTexture(materialParams, "map", metallicRoughness.baseColorTexture, SRGBColorSpace));
+        pending.push(parser.assignTexture(materialParams, "map", metallicRoughness.baseColorTexture, 3001));
       }
       materialParams.metalness = metallicRoughness.metallicFactor !== void 0 ? metallicRoughness.metallicFactor : 1;
       materialParams.roughness = metallicRoughness.roughnessFactor !== void 0 ? metallicRoughness.roughnessFactor : 1;
@@ -1928,7 +1938,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, SRGBColorSpace));
+      pending.push(parser.assignTexture(materialParams, "emissiveMap", materialDef.emissiveTexture, 3001));
     }
     return Promise.all(pending).then(function() {
       const material = new materialType(materialParams);

package/package.json

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