From 0bf0f5eb724a4bceb814364f0ce899c23aad013c Mon Sep 17 00:00:00 2001
From: Cody Bennett <23324155+CodyJasonBennett@users.noreply.github.com>
Date: Wed, 14 Jun 2023 11:33:13 -0500
Subject: [PATCH] OculusHandPointerModel: cleanup on disconnect, implement
 dispose

---
 examples/jsm/webxr/OculusHandPointerModel.js | 47 ++++++++++++++------
 1 file changed, 34 insertions(+), 13 deletions(-)

diff --git a/examples/jsm/webxr/OculusHandPointerModel.js b/examples/jsm/webxr/OculusHandPointerModel.js
index 9732f75bab5fc4..9dd428921edaba 100644
--- a/examples/jsm/webxr/OculusHandPointerModel.js
+++ b/examples/jsm/webxr/OculusHandPointerModel.js
@@ -13,8 +13,8 @@ const POINTER_LENGTH = 0.035;
 const POINTER_SEGMENTS = 16;
 const POINTER_RINGS = 12;
 const POINTER_HEMISPHERE_ANGLE = 110;
-const YAXIS = new THREE.Vector3( 0, 1, 0 );
-const ZAXIS = new THREE.Vector3( 0, 0, 1 );
+const YAXIS = /* @__PURE__ */ new THREE.Vector3( 0, 1, 0 );
+const ZAXIS = /* @__PURE__ */ new THREE.Vector3( 0, 0, 1 );
 
 const CURSOR_RADIUS = 0.02;
 const CURSOR_MAX_DISTANCE = 1.5;
@@ -27,9 +27,10 @@ class OculusHandPointerModel extends THREE.Object3D {
 
 		this.hand = hand;
 		this.controller = controller;
+
+		// Unused
 		this.motionController = null;
 		this.envMap = null;
-
 		this.mesh = null;
 
 		this.pointerGeometry = null;
@@ -43,24 +44,36 @@ class OculusHandPointerModel extends THREE.Object3D {
 
 		this.raycaster = null;
 
-		hand.addEventListener( 'connected', ( event ) => {
+		this._onConnected = this._onConnected.bind( this );
+		this._onDisconnected = this._onDisconnected.bind( this );
+		this.hand.addEventListener( 'connected', this._onConnected );
+		this.hand.addEventListener( 'disconnected', this._onDisconnected );
 
-			const xrInputSource = event.data;
+	}
 
-			if ( xrInputSource.hand ) {
+	_onConnected( event ) {
 
-				this.visible = true;
-				this.xrInputSource = xrInputSource;
+		const xrInputSource = event.data;
+		if ( xrInputSource.hand ) {
 
-				if ( this.pointerObject === null ) {
+			this.visible = true;
+			this.xrInputSource = xrInputSource;
 
-					this.createPointer();
+			this.createPointer();
 
-				}
+		}
 
-			}
+	}
+
+	_onDisconnected() {
 
-		} );
+		this.visible = false;
+		this.xrInputSource = null;
+
+		this.pointerGeometry.dispose();
+		this.pointerMesh.material.dispose();
+
+		this.clear();
 
 	}
 
@@ -387,6 +400,14 @@ class OculusHandPointerModel extends THREE.Object3D {
 
 	}
 
+	dispose() {
+
+		this._onDisconnected();
+		this.hand.removeEventListener( 'connected', this._onConnected );
+		this.hand.removeEventListener( 'disconnected', this._onDisconnected );
+
+	}
+
 }
 
 export { OculusHandPointerModel };