super-three 0.137.0 → 0.141.0

package/examples/jsm/utils/UVsDebug.js

@@ -42,51 +42,42 @@ function UVsDebug( geometry, size = 1024 ) {
 	ctx.fillStyle = 'rgb( 255, 255, 255 )';
 	ctx.fillRect( 0, 0, width, height );
 
-	if ( geometry.isGeometry ) {
+	const index = geometry.index;
+	const uvAttribute = geometry.attributes.uv;
 
-		console.error( 'THREE.UVsDebug no longer supports Geometry. Use THREE.BufferGeometry instead.' );
-		return;
+	if ( index ) {
 
-	} else {
-
-		const index = geometry.index;
-		const uvAttribute = geometry.attributes.uv;
-
-		if ( index ) {
+		// indexed geometry
 
-			// indexed geometry
+		for ( let i = 0, il = index.count; i < il; i += 3 ) {
 
-			for ( let i = 0, il = index.count; i < il; i += 3 ) {
+			face[ 0 ] = index.getX( i );
+			face[ 1 ] = index.getX( i + 1 );
+			face[ 2 ] = index.getX( i + 2 );
 
-				face[ 0 ] = index.getX( i );
-				face[ 1 ] = index.getX( i + 1 );
-				face[ 2 ] = index.getX( i + 2 );
+			uvs[ 0 ].fromBufferAttribute( uvAttribute, face[ 0 ] );
+			uvs[ 1 ].fromBufferAttribute( uvAttribute, face[ 1 ] );
+			uvs[ 2 ].fromBufferAttribute( uvAttribute, face[ 2 ] );
 
-				uvs[ 0 ].fromBufferAttribute( uvAttribute, face[ 0 ] );
-				uvs[ 1 ].fromBufferAttribute( uvAttribute, face[ 1 ] );
-				uvs[ 2 ].fromBufferAttribute( uvAttribute, face[ 2 ] );
+			processFace( face, uvs, i / 3 );
 
-				processFace( face, uvs, i / 3 );
-
-			}
-
-		} else {
+		}
 
-			// non-indexed geometry
+	} else {
 
-			for ( let i = 0, il = uvAttribute.count; i < il; i += 3 ) {
+		// non-indexed geometry
 
-				face[ 0 ] = i;
-				face[ 1 ] = i + 1;
-				face[ 2 ] = i + 2;
+		for ( let i = 0, il = uvAttribute.count; i < il; i += 3 ) {
 
-				uvs[ 0 ].fromBufferAttribute( uvAttribute, face[ 0 ] );
-				uvs[ 1 ].fromBufferAttribute( uvAttribute, face[ 1 ] );
-				uvs[ 2 ].fromBufferAttribute( uvAttribute, face[ 2 ] );
+			face[ 0 ] = i;
+			face[ 1 ] = i + 1;
+			face[ 2 ] = i + 2;
 
-				processFace( face, uvs, i / 3 );
+			uvs[ 0 ].fromBufferAttribute( uvAttribute, face[ 0 ] );
+			uvs[ 1 ].fromBufferAttribute( uvAttribute, face[ 1 ] );
+			uvs[ 2 ].fromBufferAttribute( uvAttribute, face[ 2 ] );
 
-			}
+			processFace( face, uvs, i / 3 );
 
 		}
 

package/examples/jsm/webxr/ARButton.js

@@ -8,11 +8,11 @@ class ARButton {
 
 			if ( sessionInit.domOverlay === undefined ) {
 
-				var overlay = document.createElement( 'div' );
+				const overlay = document.createElement( 'div' );
 				overlay.style.display = 'none';
 				document.body.appendChild( overlay );
 
-				var svg = document.createElementNS( 'http://www.w3.org/2000/svg', 'svg' );
+				const svg = document.createElementNS( 'http://www.w3.org/2000/svg', 'svg' );
 				svg.setAttribute( 'width', 38 );
 				svg.setAttribute( 'height', 38 );
 				svg.style.position = 'absolute';
@@ -25,7 +25,7 @@ class ARButton {
 				} );
 				overlay.appendChild( svg );
 
-				var path = document.createElementNS( 'http://www.w3.org/2000/svg', 'path' );
+				const path = document.createElementNS( 'http://www.w3.org/2000/svg', 'path' );
 				path.setAttribute( 'd', 'M 12,12 L 28,28 M 28,12 12,28' );
 				path.setAttribute( 'stroke', '#fff' );
 				path.setAttribute( 'stroke-width', 2 );
@@ -133,6 +133,16 @@ class ARButton {
 
 		}
 
+		function showARNotAllowed( exception ) {
+
+			disableButton();
+
+			console.warn( 'Exception when trying to call xr.isSessionSupported', exception );
+
+			button.textContent = 'AR NOT ALLOWED';
+
+		}
+
 		function stylizeElement( element ) {
 
 			element.style.position = 'absolute';
@@ -161,7 +171,7 @@ class ARButton {
 
 				supported ? showStartAR() : showARNotSupported();
 
-			} ).catch( showARNotSupported );
+			} ).catch( showARNotAllowed );
 
 			return button;
 

package/examples/jsm/webxr/OculusHandPointerModel.js

@@ -62,7 +62,7 @@ class OculusHandPointerModel extends THREE.Object3D {
 	_drawVerticesRing( vertices, baseVector, ringIndex ) {
 
 		const segmentVector = baseVector.clone();
-		for ( var i = 0; i < POINTER_SEGMENTS; i ++ ) {
+		for ( let i = 0; i < POINTER_SEGMENTS; i ++ ) {
 
 			segmentVector.applyAxisAngle( ZAXIS, ( Math.PI * 2 ) / POINTER_SEGMENTS );
 			const vid = ringIndex * POINTER_SEGMENTS + i;
@@ -91,7 +91,7 @@ class OculusHandPointerModel extends THREE.Object3D {
 			Math.cos( ( Math.PI * POINTER_HEMISPHERE_ANGLE ) / 180 ) * rearRadius,
 			0
 		);
-		for ( var i = 0; i < POINTER_RINGS; i ++ ) {
+		for ( let i = 0; i < POINTER_RINGS; i ++ ) {
 
 			this._drawVerticesRing( vertices, rearBase, i + 1 );
 			rearBase.applyAxisAngle(
@@ -127,7 +127,7 @@ class OculusHandPointerModel extends THREE.Object3D {
 
 	createPointer() {
 
-		var i, j;
+		let i, j;
 		const vertices = new Array(
 			( ( POINTER_RINGS + 1 ) * POINTER_SEGMENTS + 2 ) * 3
 		).fill( 0 );

package/examples/jsm/webxr/Text2D.js

@@ -19,7 +19,7 @@ function createText( message, height ) {
 
 	const texture = new THREE.Texture( canvas );
 	texture.needsUpdate = true;
-	//var spriteAlignment = new THREE.Vector2(0,0) ;
+
 	const material = new THREE.MeshBasicMaterial( {
 		color: 0xffffff,
 		side: THREE.DoubleSide,

package/examples/jsm/webxr/VRButton.js

@@ -104,6 +104,16 @@ class VRButton {
 
 		}
 
+		function showVRNotAllowed( exception ) {
+
+			disableButton();
+
+			console.warn( 'Exception when trying to call xr.isSessionSupported', exception );
+
+			button.textContent = 'VR NOT ALLOWED';
+
+		}
+
 		function stylizeElement( element ) {
 
 			element.style.position = 'absolute';
@@ -138,7 +148,7 @@ class VRButton {
 
 				}
 
-			} );
+			} ).catch( showVRNotAllowed );
 
 			return button;
 
@@ -176,6 +186,10 @@ class VRButton {
 
 		if ( 'xr' in navigator ) {
 
+			// WebXRViewer (based on Firefox) has a bug where addEventListener
+			// throws a silent exception and aborts execution entirely.
+			if ( /WebXRViewer\//i.test( navigator.userAgent ) ) return;
+
 			navigator.xr.addEventListener( 'sessiongranted', () => {
 
 				VRButton.xrSessionIsGranted = true;

package/examples/jsm/webxr/XRHandMeshModel.js

@@ -90,13 +90,9 @@ class XRHandMeshModel {
 
 					const position = XRJoint.position;
 
-					if ( bone ) {
-
-						bone.position.copy( position );
-						bone.quaternion.copy( XRJoint.quaternion );
-						// bone.scale.setScalar( XRJoint.jointRadius || defaultRadius );
-
-					}
+					bone.position.copy( position );
+					bone.quaternion.copy( XRJoint.quaternion );
+					// bone.scale.setScalar( XRJoint.jointRadius || defaultRadius );
 
 				}
 

package/examples/jsm/webxr/XRHandModelFactory.js

@@ -83,10 +83,13 @@ class XRHandModelFactory {
 
 			}
 
+			controller.visible = true;
+
 		} );
 
 		controller.addEventListener( 'disconnected', () => {
 
+			controller.visible = false;
 			// handModel.motionController = null;
 			// handModel.remove( scene );
 			// scene = null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "super-three",
-  "version": "0.137.0",
+  "version": "0.141.0",
   "description": "JavaScript 3D library",
   "type": "module",
   "main": "./build/three.js",
@@ -10,8 +10,9 @@
       "import": "./build/three.module.js",
       "require": "./build/three.cjs"
     },
-    "./examples/jsm/*": "./examples/jsm/*.js",
-    "./src/*": "./src/*.js"
+    "./examples/fonts/*": "./examples/fonts/*",
+    "./examples/jsm/*": "./examples/jsm/*",
+    "./src/*": "./src/*"
   },
   "repository": {
     "type": "git",
@@ -38,7 +39,10 @@
   },
   "eslintConfig": {
     "root": true,
-    "extends": "mdcs",
+    "extends": [
+      "mdcs",
+      "plugin:compat/recommended"
+    ],
     "parser": "@babel/eslint-parser",
     "parserOptions": {
       "babelOptions": {
@@ -46,8 +50,14 @@
       }
     },
     "plugins": [
-      "html"
+      "html",
+      "import"
     ],
+    "settings": {
+      "polyfills": [
+        "WebGL2RenderingContext"
+      ]
+    },
     "globals": {
       "__THREE_DEVTOOLS__": "readonly",
       "WebGL2ComputeRenderingContext": "readonly",
@@ -67,6 +77,10 @@
       "no-throw-literal": [
         "error"
       ],
+      "import/extensions": [
+        "error",
+        "always"
+      ],
       "quotes": [
         "error",
         "single"
@@ -80,6 +94,9 @@
       ]
     }
   },
+  "browserslist": [
+    "> 1%, not dead, not ie 11, not op_mini all"
+  ],
   "scripts": {
     "start": "npm run dev",
     "test": "npm run lint && npm run test-unit",
@@ -92,7 +109,6 @@
     "lint-fix": "npm run lint -- --fix && npm run lint-examples -- --fix",
     "lint-docs": "eslint docs --ext html",
     "test-unit": "npm run unit --prefix test",
-    "test-unit-examples": "npm run unit-examples --prefix test",
     "test-e2e": "node test/e2e/puppeteer.js",
     "test-e2e-cov": "node test/e2e/check-coverage.js",
     "test-treeshake": "rollup -c test/rollup.treeshake.config.js",
@@ -121,22 +137,24 @@
   },
   "homepage": "https://threejs.org/",
   "devDependencies": {
-    "@babel/core": "^7.15.5",
-    "@babel/eslint-parser": "^7.15.7",
-    "@babel/plugin-proposal-class-properties": "^7.14.5",
-    "@babel/preset-env": "^7.15.6",
-    "@rollup/plugin-babel": "^5.3.0",
-    "@rollup/plugin-node-resolve": "^13.0.5",
-    "chalk": "^4.1.2",
-    "concurrently": "^6.2.2",
-    "eslint": "^7.32.0",
+    "@babel/core": "^7.17.9",
+    "@babel/eslint-parser": "^7.17.0",
+    "@babel/plugin-proposal-class-properties": "^7.16.7",
+    "@babel/preset-env": "^7.16.11",
+    "@rollup/plugin-babel": "^5.3.1",
+    "@rollup/plugin-node-resolve": "^13.2.0",
+    "chalk": "^5.0.1",
+    "concurrently": "^7.1.0",
+    "eslint": "^8.13.0",
     "eslint-config-mdcs": "^5.0.0",
+    "eslint-plugin-compat": "^4.0.2",
     "eslint-plugin-html": "^6.2.0",
-    "rollup": "^2.57.0",
-    "rollup-plugin-filesize": "^9.1.1",
+    "eslint-plugin-import": "^2.26.0",
+    "rollup": "^2.70.2",
+    "rollup-plugin-filesize": "^9.1.2",
     "rollup-plugin-terser": "^7.0.2",
-    "rollup-plugin-visualizer": "^5.5.2",
-    "servez": "^1.12.0"
+    "rollup-plugin-visualizer": "^5.6.0",
+    "servez": "^1.14.1"
   },
   "jspm": {
     "files": [