three-stdlib 2.23.7 → 2.23.9

package/loaders/EXRLoader.cjs

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const THREE = require("three");
 const fflate = require("fflate");
+const hasColorSpace = "colorSpace" in /* @__PURE__ */ new THREE.Texture();
 class EXRLoader extends THREE.DataTextureLoader {
   constructor(manager) {
     super(manager);
@@ -1200,7 +1201,7 @@ class EXRLoader extends THREE.DataTextureLoader {
         uncompress: null,
         getter: null,
         format: null,
-        encoding: null
+        [hasColorSpace ? "colorSpace" : "encoding"]: null
       };
       switch (EXRHeader2.compression) {
         case "NO_COMPRESSION":
@@ -1284,13 +1285,14 @@ class EXRLoader extends THREE.DataTextureLoader {
           break;
       }
       EXRDecoder2.bytesPerLine = EXRDecoder2.width * EXRDecoder2.inputSize * EXRDecoder2.channels;
-      if (EXRDecoder2.outputChannels == 4) {
+      if (EXRDecoder2.outputChannels == 4)
         EXRDecoder2.format = THREE.RGBAFormat;
-        EXRDecoder2.encoding = 3e3;
-      } else {
+      else
         EXRDecoder2.format = THREE.RedFormat;
+      if (hasColorSpace)
+        EXRDecoder2.colorSpace = "srgb-linear";
+      else
         EXRDecoder2.encoding = 3e3;
-      }
       return EXRDecoder2;
     }
     const bufferDataView = new DataView(buffer);
@@ -1327,7 +1329,7 @@ class EXRLoader extends THREE.DataTextureLoader {
       height: EXRDecoder.height,
       data: EXRDecoder.byteArray,
       format: EXRDecoder.format,
-      encoding: EXRDecoder.encoding,
+      [hasColorSpace ? "colorSpace" : "encoding"]: EXRDecoder[hasColorSpace ? "colorSpace" : "encoding"],
       type: this.type
     };
   }
@@ -1337,8 +1339,8 @@ class EXRLoader extends THREE.DataTextureLoader {
   }
   load(url, onLoad, onProgress, onError) {
     function onLoadCallback(texture, texData) {
-      if ("colorSpace" in texture)
-        texture.colorSpace = texData.encoding === 3001 ? "srgb" : "srgb-linear";
+      if (hasColorSpace)
+        texture.colorSpace = texData.colorSpace;
       else
         texture.encoding = texData.encoding;
       texture.minFilter = THREE.LinearFilter;

package/loaders/EXRLoader.js

@@ -1,5 +1,6 @@
-import { DataTextureLoader, HalfFloatType, DataUtils, FloatType, RGBAFormat, RedFormat, LinearFilter } from "three";
+import { Texture, DataTextureLoader, HalfFloatType, DataUtils, FloatType, RGBAFormat, RedFormat, LinearFilter } from "three";
 import { unzlibSync } from "fflate";
+const hasColorSpace = "colorSpace" in /* @__PURE__ */ new Texture();
 class EXRLoader extends DataTextureLoader {
   constructor(manager) {
     super(manager);
@@ -1198,7 +1199,7 @@ class EXRLoader extends DataTextureLoader {
         uncompress: null,
         getter: null,
         format: null,
-        encoding: null
+        [hasColorSpace ? "colorSpace" : "encoding"]: null
       };
       switch (EXRHeader2.compression) {
         case "NO_COMPRESSION":
@@ -1282,13 +1283,14 @@ class EXRLoader extends DataTextureLoader {
           break;
       }
       EXRDecoder2.bytesPerLine = EXRDecoder2.width * EXRDecoder2.inputSize * EXRDecoder2.channels;
-      if (EXRDecoder2.outputChannels == 4) {
+      if (EXRDecoder2.outputChannels == 4)
         EXRDecoder2.format = RGBAFormat;
-        EXRDecoder2.encoding = 3e3;
-      } else {
+      else
         EXRDecoder2.format = RedFormat;
+      if (hasColorSpace)
+        EXRDecoder2.colorSpace = "srgb-linear";
+      else
         EXRDecoder2.encoding = 3e3;
-      }
       return EXRDecoder2;
     }
     const bufferDataView = new DataView(buffer);
@@ -1325,7 +1327,7 @@ class EXRLoader extends DataTextureLoader {
       height: EXRDecoder.height,
       data: EXRDecoder.byteArray,
       format: EXRDecoder.format,
-      encoding: EXRDecoder.encoding,
+      [hasColorSpace ? "colorSpace" : "encoding"]: EXRDecoder[hasColorSpace ? "colorSpace" : "encoding"],
       type: this.type
     };
   }
@@ -1335,8 +1337,8 @@ class EXRLoader extends DataTextureLoader {
   }
   load(url, onLoad, onProgress, onError) {
     function onLoadCallback(texture, texData) {
-      if ("colorSpace" in texture)
-        texture.colorSpace = texData.encoding === 3001 ? "srgb" : "srgb-linear";
+      if (hasColorSpace)
+        texture.colorSpace = texData.colorSpace;
       else
         texture.encoding = texData.encoding;
       texture.minFilter = LinearFilter;

package/package.json

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

package/webxr/OculusHandPointerModel.cjs

@@ -50,14 +50,25 @@ class OculusHandPointerModel extends THREE__namespace.Object3D {
     this.attached = false;
     this.cursorObject = null;
     this.raycaster = null;
-    hand.addEventListener("connected", (event) => {
-      const xrInputSource = event.data;
-      if (xrInputSource.hand) {
-        this.visible = true;
-        this.xrInputSource = xrInputSource;
-        this.createPointer();
-      }
-    });
+    this._onConnected = this._onConnected.bind(this);
+    this._onDisconnected = this._onDisconnected.bind(this);
+    this.hand.addEventListener("connected", this._onConnected);
+    this.hand.addEventListener("disconnected", this._onDisconnected);
+  }
+  _onConnected(event) {
+    const xrInputSource = event.data;
+    if (xrInputSource.hand) {
+      this.visible = true;
+      this.xrInputSource = xrInputSource;
+      this.createPointer();
+    }
+  }
+  _onDisconnected() {
+    this.visible = false;
+    this.xrInputSource = null;
+    this.pointerGeometry.dispose();
+    this.pointerMesh.material.dispose();
+    this.clear();
   }
   _drawVerticesRing(vertices, baseVector, ringIndex) {
     const segmentVector = baseVector.clone();
@@ -220,5 +231,10 @@ class OculusHandPointerModel extends THREE__namespace.Object3D {
       this.cursorObject.position.copy(direction.multiplyScalar(distance));
     }
   }
+  dispose() {
+    this._onDisconnected();
+    this.hand.removeEventListener("connected", this._onConnected);
+    this.hand.removeEventListener("disconnected", this._onDisconnected);
+  }
 }
 exports.OculusHandPointerModel = OculusHandPointerModel;

package/webxr/OculusHandPointerModel.d.ts

@@ -60,4 +60,6 @@ export class OculusHandPointerModel extends Object3D {
   public checkIntersections(objects: Object3D[], recursive?: boolean): void
 
   public setCursor(distance: number): void
+
+  public dispose(): void
 }

package/webxr/OculusHandPointerModel.js

@@ -31,14 +31,25 @@ class OculusHandPointerModel extends THREE.Object3D {
     this.attached = false;
     this.cursorObject = null;
     this.raycaster = null;
-    hand.addEventListener("connected", (event) => {
-      const xrInputSource = event.data;
-      if (xrInputSource.hand) {
-        this.visible = true;
-        this.xrInputSource = xrInputSource;
-        this.createPointer();
-      }
-    });
+    this._onConnected = this._onConnected.bind(this);
+    this._onDisconnected = this._onDisconnected.bind(this);
+    this.hand.addEventListener("connected", this._onConnected);
+    this.hand.addEventListener("disconnected", this._onDisconnected);
+  }
+  _onConnected(event) {
+    const xrInputSource = event.data;
+    if (xrInputSource.hand) {
+      this.visible = true;
+      this.xrInputSource = xrInputSource;
+      this.createPointer();
+    }
+  }
+  _onDisconnected() {
+    this.visible = false;
+    this.xrInputSource = null;
+    this.pointerGeometry.dispose();
+    this.pointerMesh.material.dispose();
+    this.clear();
   }
   _drawVerticesRing(vertices, baseVector, ringIndex) {
     const segmentVector = baseVector.clone();
@@ -201,6 +212,11 @@ class OculusHandPointerModel extends THREE.Object3D {
       this.cursorObject.position.copy(direction.multiplyScalar(distance));
     }
   }
+  dispose() {
+    this._onDisconnected();
+    this.hand.removeEventListener("connected", this._onConnected);
+    this.hand.removeEventListener("disconnected", this._onDisconnected);
+  }
 }
 export {
   OculusHandPointerModel