super-three 0.136.1 → 0.144.0

package/examples/jsm/utils/LDrawUtils.js

@@ -62,8 +62,11 @@ class LDrawUtils {
 					arr: [ geometry ]
 				};
 
+			} else {
+
+				geoms.arr.push( geometry );
+
 			}
-			else geoms.arr.push( geometry );
 
 		}
 
@@ -111,22 +114,23 @@ class LDrawUtils {
 
 				const elemSize = c.isMesh ? 3 : 2;
 
+				const geometry = c.geometry.clone();
 				const matrixIsInverted = c.matrixWorld.determinant() < 0;
 				if ( matrixIsInverted ) {
 
-					permuteAttribute( c.geometry.attributes.position, elemSize );
-					permuteAttribute( c.geometry.attributes.normal, elemSize );
+					permuteAttribute( geometry.attributes.position, elemSize );
+					permuteAttribute( geometry.attributes.normal, elemSize );
 
 				}
 
-				c.geometry.applyMatrix4( c.matrixWorld );
+				geometry.applyMatrix4( c.matrixWorld );
 
 				if ( c.isConditionalLine ) {
 
-					c.geometry.attributes.control0.applyMatrix4( c.matrixWorld );
-					c.geometry.attributes.control1.applyMatrix4( c.matrixWorld );
+					geometry.attributes.control0.applyMatrix4( c.matrixWorld );
+					geometry.attributes.control1.applyMatrix4( c.matrixWorld );
 					normalMatrix.getNormalMatrix( c.matrixWorld );
-					c.geometry.attributes.direction.applyNormalMatrix( normalMatrix );
+					geometry.attributes.direction.applyNormalMatrix( normalMatrix );
 
 				}
 
@@ -134,17 +138,20 @@ class LDrawUtils {
 
 				if ( Array.isArray( c.material ) ) {
 
-					for ( const groupIndex in c.geometry.groups ) {
+					for ( const groupIndex in geometry.groups ) {
 
-						const group = c.geometry.groups[ groupIndex ];
+						const group = geometry.groups[ groupIndex ];
 						const mat = c.material[ group.materialIndex ];
-						const newGeometry = extractGroup( c.geometry, group, elemSize, c.isConditionalLine );
+						const newGeometry = extractGroup( geometry, group, elemSize, c.isConditionalLine );
 						addGeometry( mat, newGeometry, geometries );
 
 					}
 
+				} else {
+
+					addGeometry( c.material, geometry, geometries );
+
 				}
-				else addGeometry( c.material, c.geometry, geometries );
 
 			}
 
@@ -155,27 +162,27 @@ class LDrawUtils {
 		const mergedObject = new Group();
 
 		const meshMaterialsIds = Object.keys( meshGeometries );
-		for ( const i in meshMaterialsIds ) {
+		for ( const meshMaterialsId of meshMaterialsIds ) {
 
-			const meshGeometry = meshGeometries[ meshMaterialsIds[ i ] ];
+			const meshGeometry = meshGeometries[ meshMaterialsId ];
 			const mergedGeometry = mergeBufferGeometries( meshGeometry.arr );
 			mergedObject.add( new Mesh( mergedGeometry, meshGeometry.mat ) );
 
 		}
 
 		const linesMaterialsIds = Object.keys( linesGeometries );
-		for ( const i in linesMaterialsIds ) {
+		for ( const linesMaterialsId of linesMaterialsIds ) {
 
-			const lineGeometry = linesGeometries[ linesMaterialsIds[ i ] ];
+			const lineGeometry = linesGeometries[ linesMaterialsId ];
 			const mergedGeometry = mergeBufferGeometries( lineGeometry.arr );
 			mergedObject.add( new LineSegments( mergedGeometry, lineGeometry.mat ) );
 
 		}
 
 		const condLinesMaterialsIds = Object.keys( condLinesGeometries );
-		for ( const i in condLinesMaterialsIds ) {
+		for ( const condLinesMaterialsId of condLinesMaterialsIds ) {
 
-			const condLineGeometry = condLinesGeometries[ condLinesMaterialsIds[ i ] ];
+			const condLineGeometry = condLinesGeometries[ condLinesMaterialsId ];
 			const mergedGeometry = mergeBufferGeometries( condLineGeometry.arr );
 			const condLines = new LineSegments( mergedGeometry, condLineGeometry.mat );
 			condLines.isConditionalLine = true;

package/examples/jsm/utils/PackedPhongMaterial.js

@@ -189,7 +189,6 @@ class PackedPhongMaterial extends MeshPhongMaterial {
 			ShaderChunk.emissivemap_pars_fragment,
 			ShaderChunk.envmap_common_pars_fragment,
 			ShaderChunk.envmap_pars_fragment,
-			ShaderChunk.cube_uv_reflection_fragment,
 			ShaderChunk.fog_pars_fragment,
 			ShaderChunk.bsdfs,
 			ShaderChunk.lights_pars_begin,

package/examples/jsm/utils/SceneUtils.js

@@ -1,9 +1,11 @@
 import {
 	Group,
-	Mesh
+	Mesh,
+	BufferAttribute,
+	BufferGeometry
 } from 'three';
 
-
+import { mergeGroups } from './BufferGeometryUtils.js';
 
 function createMeshesFromInstancedMesh( instancedMesh ) {
 
@@ -31,41 +33,93 @@ function createMeshesFromInstancedMesh( instancedMesh ) {
 
 }
 
-function createMultiMaterialObject( geometry, materials ) {
+function createMeshesFromMultiMaterialMesh( mesh ) {
 
-	const group = new Group();
-
-	for ( let i = 0, l = materials.length; i < l; i ++ ) {
+	if ( Array.isArray( mesh.material ) === false ) {
 
-		group.add( new Mesh( geometry, materials[ i ] ) );
+		console.warn( 'THREE.SceneUtils.createMeshesFromMultiMaterialMesh(): The given mesh has no multiple materials.' );
+		return mesh;
 
 	}
 
-	return group;
+	const object = new Group();
+	object.copy( mesh );
 
-}
+	// merge groups (which automatically sorts them)
 
-function detach( child, parent, scene ) {
+	const geometry = mergeGroups( mesh.geometry );
 
-	console.warn( 'THREE.SceneUtils: detach() has been deprecated. Use scene.attach( child ) instead.' );
+	const index = geometry.index;
+	const groups = geometry.groups;
+	const attributeNames = Object.keys( geometry.attributes );
 
-	scene.attach( child );
+	// create a mesh for each group by extracting the buffer data into a new geometry
 
-}
+	for ( let i = 0; i < groups.length; i ++ ) {
+
+		const group = groups[ i ];
+
+		const start = group.start;
+		const end = start + group.count;
+
+		const newGeometry = new BufferGeometry();
+		const newMaterial = mesh.material[ group.materialIndex ];
+
+		// process all buffer attributes
+
+		for ( let j = 0; j < attributeNames.length; j ++ ) {
+
+			const name = attributeNames[ j ];
+			const attribute = geometry.attributes[ name ];
+			const itemSize = attribute.itemSize;
+
+			const newLength = group.count * itemSize;
+			const type = attribute.array.constructor;
+
+			const newArray = new type( newLength );
+			const newAttribute = new BufferAttribute( newArray, itemSize );
+
+			for ( let k = start, n = 0; k < end; k ++, n ++ ) {
+
+				const ind = index.getX( k );
 
-function attach( child, scene, parent ) {
+				if ( itemSize >= 1 ) newAttribute.setX( n, attribute.getX( ind ) );
+				if ( itemSize >= 2 ) newAttribute.setY( n, attribute.getY( ind ) );
+				if ( itemSize >= 3 ) newAttribute.setZ( n, attribute.getZ( ind ) );
+				if ( itemSize >= 4 ) newAttribute.setW( n, attribute.getW( ind ) );
 
-	console.warn( 'THREE.SceneUtils: attach() has been deprecated. Use parent.attach( child ) instead.' );
+			}
 
-	parent.attach( child );
+
+			newGeometry.setAttribute( name, newAttribute );
+
+		}
+
+		const newMesh = new Mesh( newGeometry, newMaterial );
+		object.add( newMesh );
+
+	}
+
+	return object;
 
 }
 
+function createMultiMaterialObject( geometry, materials ) {
+
+	const group = new Group();
+
+	for ( let i = 0, l = materials.length; i < l; i ++ ) {
 
+		group.add( new Mesh( geometry, materials[ i ] ) );
+
+	}
+
+	return group;
+
+}
 
 export {
 	createMeshesFromInstancedMesh,
-	createMultiMaterialObject,
-	detach,
-	attach,
+	createMeshesFromMultiMaterialMesh,
+	createMultiMaterialObject
 };

package/examples/jsm/utils/SkeletonUtils.js

@@ -87,7 +87,7 @@ function retarget( target, source, options = {} ) {
 			bone = bones[ i ];
 			name = options.names[ bone.name ] || bone.name;
 
-			if ( options.offsets && options.offsets[ name ] ) {
+			if ( options.offsets[ name ] ) {
 
 				bone.matrix.multiply( options.offsets[ name ] );
 

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

@@ -46,12 +46,17 @@ class OculusHandPointerModel extends THREE.Object3D {
 		hand.addEventListener( 'connected', ( event ) => {
 
 			const xrInputSource = event.data;
+
 			if ( xrInputSource.hand ) {
 
 				this.visible = true;
 				this.xrInputSource = xrInputSource;
 
-				this.createPointer();
+				if ( this.pointerObject === null ) {
+
+					this.createPointer();
+
+				}
 
 			}
 
@@ -62,7 +67,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 +96,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 +132,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

@@ -1,12 +1,6 @@
 class VRButton {
 
-	static createButton( renderer, options ) {
-
-		if ( options ) {
-
-			console.error( 'THREE.VRButton: The "options" parameter has been removed. Please set the reference space type via renderer.xr.setReferenceSpaceType() instead.' );
-
-		}
+	static createButton( renderer ) {
 
 		const button = document.createElement( 'button' );
 
@@ -104,6 +98,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 +142,7 @@ class VRButton {
 
 				}
 
-			} );
+			} ).catch( showVRNotAllowed );
 
 			return button;
 
@@ -176,6 +180,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,9 +1,20 @@
 {
   "name": "super-three",
-  "version": "0.136.1",
+  "version": "0.144.0",
   "description": "JavaScript 3D library",
-  "main": "build/three.js",
-  "module": "build/three.module.js",
+  "type": "module",
+  "main": "./build/three.js",
+  "module": "./build/three.module.js",
+  "exports": {
+    ".": {
+      "import": "./build/three.module.js",
+      "require": "./build/three.cjs"
+    },
+    "./examples/fonts/*": "./examples/fonts/*",
+    "./examples/jsm/*": "./examples/jsm/*",
+    "./addons/*": "./examples/jsm/*",
+    "./src/*": "./src/*"
+  },
   "repository": {
     "type": "git",
     "url": "supermedium/three.js"
@@ -11,6 +22,7 @@
   "sideEffects": false,
   "files": [
     "build/three.js",
+    "build/three.cjs",
     "build/three.min.js",
     "build/three.module.js",
     "examples/js",
@@ -28,7 +40,10 @@
   },
   "eslintConfig": {
     "root": true,
-    "extends": "mdcs",
+    "extends": [
+      "mdcs",
+      "plugin:compat/recommended"
+    ],
     "parser": "@babel/eslint-parser",
     "parserOptions": {
       "babelOptions": {
@@ -36,12 +51,17 @@
       }
     },
     "plugins": [
-      "html"
+      "html",
+      "import"
     ],
+    "settings": {
+      "polyfills": [
+        "WebGL2RenderingContext"
+      ]
+    },
     "globals": {
       "__THREE_DEVTOOLS__": "readonly",
       "WebGL2ComputeRenderingContext": "readonly",
-
       "potpack": "readonly",
       "fflate": "readonly",
       "bodymovin": "readonly",
@@ -49,15 +69,22 @@
       "Stats": "readonly",
       "XRWebGLBinding": "readonly",
       "XRWebGLLayer": "readonly",
-
       "GPUShaderStage": "readonly",
       "GPUBufferUsage": "readonly",
-      "GPUTextureUsage": "readonly"
+      "GPUTextureUsage": "readonly",
+      "QUnit": "readonly",
+      "Ammo":"readonly",
+      "XRRigidTransform":"readonly",
+      "XRMediaBinding":"readonly"
     },
     "rules": {
       "no-throw-literal": [
         "error"
       ],
+      "import/extensions": [
+        "error",
+        "always"
+      ],
       "quotes": [
         "error",
         "single"
@@ -71,6 +98,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",
@@ -79,16 +109,14 @@
     "build-examples": "rollup -c utils/build/rollup.examples.config.js && echo '\nFormatting...' && eslint examples/js --ext js --ignore-pattern libs --ignore-pattern ifc --fix",
     "dev": "concurrently --names \"ROLLUP,HTTP\" -c \"bgBlue.bold,bgGreen.bold\" \"rollup -c utils/build/rollup.config.js -w -m inline\" \"servez -p 8080\"",
     "lint": "eslint src --ext js",
-    "lint-examples": "eslint examples/js examples/jsm --ext js --ignore-pattern libs --ignore-pattern ifc",
-    "lint-fix": "npm run lint -- --fix && npm run lint-examples -- --fix",
+    "lint-examples": "eslint examples/js examples/jsm examples/*.html --ext js,html --ignore-pattern libs --ignore-pattern ifc",
     "lint-docs": "eslint docs --ext html",
+    "lint-fix": "npm run lint -- --fix && npm run lint-examples -- --fix && npm run lint-docs -- --fix",
     "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",
-    "make-screenshot": "node test/e2e/puppeteer.js --make",
-    "prepublishOnly": "node utils/prepublish.js"
+    "make-screenshot": "node test/e2e/puppeteer.js --make"
   },
   "keywords": [
     "three",
@@ -113,23 +141,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.18.9",
+    "@babel/eslint-parser": "^7.18.9",
+    "@babel/plugin-proposal-class-properties": "^7.18.6",
+    "@babel/preset-env": "^7.18.9",
+    "@rollup/plugin-babel": "^5.3.1",
+    "@rollup/plugin-node-resolve": "^13.3.0",
+    "chalk": "^5.0.1",
+    "concurrently": "^7.3.0",
+    "eslint": "^8.20.0",
     "eslint-config-mdcs": "^5.0.0",
-    "eslint-plugin-html": "^6.2.0",
-    "glob": "^7.2.0",
-    "rollup": "^2.57.0",
-    "rollup-plugin-filesize": "^9.1.1",
+    "eslint-plugin-compat": "^4.0.2",
+    "eslint-plugin-html": "^7.1.0",
+    "eslint-plugin-import": "^2.26.0",
+    "rollup": "^2.77.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.7.1",
+    "servez": "^1.14.1"
   },
   "jspm": {
     "files": [