super-three 0.135.0 → 0.136.0

package/examples/js/utils/RoughnessMipmapper.js

@@ -55,34 +55,23 @@
 
 			}
 
-			if ( width !== roughnessMap.image.width || height !== roughnessMap.image.height ) {
-
-				const params = {
-					wrapS: roughnessMap.wrapS,
-					wrapT: roughnessMap.wrapT,
-					magFilter: roughnessMap.magFilter,
-					minFilter: roughnessMap.minFilter,
-					depthBuffer: false
-				};
-				const newRoughnessTarget = new THREE.WebGLRenderTarget( width, height, params );
-				newRoughnessTarget.texture.generateMipmaps = true; // Setting the render target causes the memory to be allocated.
-
-				_renderer.setRenderTarget( newRoughnessTarget );
-
-				material.roughnessMap = newRoughnessTarget.texture;
-				if ( material.metalnessMap == roughnessMap ) material.metalnessMap = material.roughnessMap;
-				if ( material.aoMap == roughnessMap ) material.aoMap = material.roughnessMap; // Copy UV transform parameters
-
-				material.roughnessMap.offset.copy( roughnessMap.offset );
-				material.roughnessMap.repeat.copy( roughnessMap.repeat );
-				material.roughnessMap.center.copy( roughnessMap.center );
-				material.roughnessMap.rotation = roughnessMap.rotation;
-				material.roughnessMap.image = roughnessMap.image;
-				material.roughnessMap.matrixAutoUpdate = roughnessMap.matrixAutoUpdate;
-				material.roughnessMap.matrix.copy( roughnessMap.matrix );
-
-			}
-
+			const newRoughnessTexture = new THREE.FramebufferTexture( width, height, roughnessMap.format );
+			newRoughnessTexture.wrapS = roughnessMap.wrapS;
+			newRoughnessTexture.wrapT = roughnessMap.wrapT;
+			newRoughnessTexture.minFilter = roughnessMap.minFilter;
+			newRoughnessTexture.magFilter = roughnessMap.magFilter;
+			material.roughnessMap = newRoughnessTexture;
+			if ( material.metalnessMap == roughnessMap ) material.metalnessMap = material.roughnessMap;
+			if ( material.aoMap == roughnessMap ) material.aoMap = material.roughnessMap; // Copy UV transform parameters
+
+			material.roughnessMap.offset.copy( roughnessMap.offset );
+			material.roughnessMap.repeat.copy( roughnessMap.repeat );
+			material.roughnessMap.center.copy( roughnessMap.center );
+			material.roughnessMap.rotation = roughnessMap.rotation;
+			material.roughnessMap.image = roughnessMap.image; // required for USDZExporter, see #22741
+
+			material.roughnessMap.matrixAutoUpdate = roughnessMap.matrixAutoUpdate;
+			material.roughnessMap.matrix.copy( roughnessMap.matrix );
 			_mipmapMaterial.uniforms.roughnessMap.value = roughnessMap;
 			_mipmapMaterial.uniforms.normalMap.value = normalMap;
 			const position = new THREE.Vector2( 0, 0 );
@@ -110,7 +99,7 @@
 
 			}
 
-			if ( roughnessMap !== material.roughnessMap ) roughnessMap.dispose();
+			roughnessMap.dispose();
 
 			_renderer.setRenderTarget( oldTarget );
 

package/examples/jsm/animation/CCDIKSolver.js

@@ -149,7 +149,6 @@ class CCDIKSolver {
 				angle = math.acos( angle );
 
 				// skip if changing angle is too small to prevent vibration of bone
-				// Refer to http://www20.atpages.jp/katwat/three.js_r58/examples/mytest37/mmd.three.js
 				if ( angle < 1e-5 ) continue;
 
 				if ( ik.minAngle !== undefined && angle < ik.minAngle ) {

package/examples/jsm/animation/MMDPhysics.js

@@ -1203,7 +1203,6 @@ class Constraint {
 
 			for ( let i = 0; i < 6; i ++ ) {
 
-				// this parameter is from http://www20.atpages.jp/katwat/three.js_r58/examples/mytest37/mmd.three.js
 				constraint.setParam( 2, 0.475, i );
 
 			}
@@ -1368,7 +1367,6 @@ class MMDPhysicsHelper extends Object3D {
 
 		}
 
-		// copy from http://www20.atpages.jp/katwat/three.js_r58/examples/mytest37/mytest37.js?ver=20160815
 		function createCapsuleGeometry( radius, cylinderHeight, segmentsRadius, segmentsHeight ) {
 
 			var geometry = new CylinderGeometry( radius, radius, cylinderHeight, segmentsRadius, segmentsHeight, true );

package/examples/jsm/controls/ArcballControls.js

@@ -67,7 +67,9 @@ const _endEvent = { type: 'end' };
 const _raycaster = new Raycaster();
 const _offset = new Vector3();
 
-
+const _gizmoMatrixStateTemp = new Matrix4();
+const _cameraMatrixStateTemp = new Matrix4();
+const _scalePointTemp = new Vector3();
 /**
  *
  * @param {Camera} camera Virtual camera used in the scene
@@ -82,7 +84,8 @@ class ArcballControls extends EventDispatcher {
 		this.camera = null;
 		this.domElement = domElement;
 		this.scene = scene;
-		this.target = new Vector3( 0, 0, 0 );
+		this.target = new Vector3();
+		this._currentTarget = new Vector3();
 		this.radiusFactor = 0.67;
 
 		this.mouseActions = [];
@@ -232,7 +235,6 @@ class ArcballControls extends EventDispatcher {
 		this.domElement.addEventListener( 'pointerdown', this.onPointerDown );
 		this.domElement.addEventListener( 'pointercancel', this.onPointerCancel );
 
-		window.addEventListener( 'keydown', this.onKeyDown );
 		window.addEventListener( 'resize', this.onWindowResize );
 
 	}
@@ -774,28 +776,6 @@ class ArcballControls extends EventDispatcher {
 
 	};
 
-	onKeyDown = ( event ) => {
-
-		if ( event.key == 'c' ) {
-
-			if ( event.ctrlKey || event.metaKey ) {
-
-				this.copyState();
-
-			}
-
-		} else if ( event.key == 'v' ) {
-
-			if ( event.ctrlKey || event.metaKey ) {
-
-				this.pasteState();
-
-			}
-
-		}
-
-	};
-
 	onSinglePanStart = ( event, operation ) => {
 
 		if ( this.enabled ) {
@@ -2006,11 +1986,11 @@ class ArcballControls extends EventDispatcher {
 		_offset.copy( point ).sub( this._gizmos.position ).multiplyScalar( amount );
 		this._translationMatrix.makeTranslation( _offset.x, _offset.y, _offset.z );
 
-		const gizmoStateTemp = this._gizmoMatrixState.clone();
+		_gizmoMatrixStateTemp.copy( this._gizmoMatrixState );
 		this._gizmoMatrixState.premultiply( this._translationMatrix );
 		this._gizmoMatrixState.decompose( this._gizmos.position, this._gizmos.quaternion, this._gizmos.scale );
 
-		const cameraStateTemp = this._cameraMatrixState.clone();
+		_cameraMatrixStateTemp.copy( this._cameraMatrixState );
 		this._cameraMatrixState.premultiply( this._translationMatrix );
 		this._cameraMatrixState.decompose( this.camera.position, this.camera.quaternion, this.camera.scale );
 
@@ -2021,8 +2001,8 @@ class ArcballControls extends EventDispatcher {
 
 		}
 
-		this._gizmoMatrixState.copy( gizmoStateTemp );
-		this._cameraMatrixState.copy( cameraStateTemp );
+		this._gizmoMatrixState.copy( _gizmoMatrixStateTemp );
+		this._cameraMatrixState.copy( _cameraMatrixStateTemp );
 
 	};
 
@@ -2098,7 +2078,6 @@ class ArcballControls extends EventDispatcher {
 		window.removeEventListener( 'pointerup', this.onPointerUp );
 
 		window.removeEventListener( 'resize', this.onWindowResize );
-		window.removeEventListener( 'keydown', this.onKeyDown );
 
 		if ( this.scene !== null ) this.scene.remove( this._gizmos );
 		this.disposeGrid();
@@ -2623,7 +2602,7 @@ class ArcballControls extends EventDispatcher {
 	 */
 	scale = ( size, point, scaleGizmos = true ) => {
 
-		const scalePoint = point.clone();
+		_scalePointTemp.copy( point );
 		let sizeInverse = 1 / size;
 
 		if ( this.camera.isOrthographicCamera ) {
@@ -2658,12 +2637,12 @@ class ArcballControls extends EventDispatcher {
 
 
 			//move camera and gizmos to obtain pinch effect
-			scalePoint.sub( this._v3_1 );
+			_scalePointTemp.sub( this._v3_1 );
 
-			const amount = scalePoint.clone().multiplyScalar( sizeInverse );
-			scalePoint.sub( amount );
+			const amount = _scalePointTemp.clone().multiplyScalar( sizeInverse );
+			_scalePointTemp.sub( amount );
 
-			this._m4_1.makeTranslation( scalePoint.x, scalePoint.y, scalePoint.z );
+			this._m4_1.makeTranslation( _scalePointTemp.x, _scalePointTemp.y, _scalePointTemp.z );
 			this._m4_2.premultiply( this._m4_1 );
 
 			this.setTransformationMatrices( this._m4_1, this._m4_2 );
@@ -2675,7 +2654,7 @@ class ArcballControls extends EventDispatcher {
 			this._v3_2.setFromMatrixPosition( this._gizmoMatrixState );
 
 			//move camera
-			let distance = this._v3_1.distanceTo( scalePoint );
+			let distance = this._v3_1.distanceTo( _scalePointTemp );
 			let amount = distance - ( distance * sizeInverse );
 
 			//check min and max distance
@@ -2692,7 +2671,7 @@ class ArcballControls extends EventDispatcher {
 
 			}
 
-			_offset.copy( scalePoint ).sub( this._v3_1 ).normalize().multiplyScalar( amount );
+			_offset.copy( _scalePointTemp ).sub( this._v3_1 ).normalize().multiplyScalar( amount );
 
 			this._m4_1.makeTranslation( _offset.x, _offset.y, _offset.z );
 
@@ -2702,9 +2681,9 @@ class ArcballControls extends EventDispatcher {
 				//scale gizmos so they appear in the same spot having the same dimension
 				const pos = this._v3_2;
 
-				distance = pos.distanceTo( scalePoint );
+				distance = pos.distanceTo( _scalePointTemp );
 				amount = distance - ( distance * sizeInverse );
-				_offset.copy( scalePoint ).sub( this._v3_2 ).normalize().multiplyScalar( amount );
+				_offset.copy( _scalePointTemp ).sub( this._v3_2 ).normalize().multiplyScalar( amount );
 
 				this._translationMatrix.makeTranslation( pos.x, pos.y, pos.z );
 				this._scaleMatrix.makeScale( sizeInverse, sizeInverse, sizeInverse );
@@ -2745,23 +2724,6 @@ class ArcballControls extends EventDispatcher {
 
 	};
 
-	/**
-	 * Set the trackball's center point
-	 * @param {Number} x X coordinate
-	 * @param {Number} y Y coordinate
-	 * @param {Number} z Z coordinate
-	 */
-	setTarget = ( x, y, z ) => {
-
-		this.target.set( x, y, z );
-		this._gizmos.position.set( x, y, z );	//for correct radius calculation
-		this._tbRadius = this.calculateTbRadius( this.camera );
-
-		this.makeGizmos( this.target, this._tbRadius );
-		this.camera.lookAt( this.target );
-
-	};
-
 	/**
 	 * Set values in transformation object
 	 * @param {Matrix4} camera Transformation to be applied to the camera
@@ -3123,6 +3085,15 @@ class ArcballControls extends EventDispatcher {
 
 		const EPS = 0.000001;
 
+		if ( this.target.equals( this._currentTarget ) === false ) {
+
+			this._gizmos.position.copy( this.target );	//for correct radius calculation
+			this._tbRadius = this.calculateTbRadius( this.camera );
+			this.makeGizmos( this.target, this._tbRadius );
+			this._currentTarget.copy( this.target );
+
+		}
+
 		//check min/max parameters
 		if ( this.camera.isOrthographicCamera ) {
 

package/examples/jsm/controls/TransformControls.js

@@ -564,6 +564,25 @@ class TransformControls extends Object3D {
 
 	}
 
+	reset() {
+
+		if ( ! this.enabled ) return;
+
+		if ( this.dragging ) {
+
+			this.object.position.copy( this._positionStart );
+			this.object.quaternion.copy( this._quaternionStart );
+			this.object.scale.copy( this._scaleStart );
+
+			this.dispatchEvent( _changeEvent );
+			this.dispatchEvent( _objectChangeEvent );
+
+			this.pointStart.copy( this.pointEnd );
+
+		}
+
+	}
+
 	getRaycaster() {
 
 		return _raycaster;
@@ -669,7 +688,11 @@ function onPointerDown( event ) {
 
 	if ( ! this.enabled ) return;
 
-	this.domElement.setPointerCapture( event.pointerId );
+	if ( ! document.pointerLockElement ) {
+
+		this.domElement.setPointerCapture( event.pointerId );
+
+	}
 
 	this.domElement.addEventListener( 'pointermove', this._onPointerMove );
 

package/examples/jsm/curves/CurveExtras.js

@@ -8,9 +8,7 @@ import {
  *
  * Formulas collected from various sources
  * http://mathworld.wolfram.com/HeartCurve.html
- * http://mathdl.maa.org/images/upload_library/23/stemkoski/knots/page6.html
  * http://en.wikipedia.org/wiki/Viviani%27s_curve
- * http://mathdl.maa.org/images/upload_library/23/stemkoski/knots/page4.html
  * http://www.mi.sanu.ac.rs/vismath/taylorapril2011/Taylor.pdf
  * https://prideout.net/blog/old/blog/index.html@p=44.html
  */

package/examples/jsm/effects/AsciiEffect.js

@@ -1,6 +1,5 @@
 /**
- * Ascii generation is based on http://www.nihilogic.dk/labs/jsascii/
- * Maybe more about this later with a blog post at http://lab4games.net/zz85/blog
+ * Ascii generation is based on https://github.com/hassadee/jsascii/blob/master/jsascii.js
  *
  * 16 April 2012 - @blurspline
  */
@@ -57,13 +56,7 @@ class AsciiEffect {
 		this.domElement = domElement;
 
 
-		// Throw in ascii library from http://www.nihilogic.dk/labs/jsascii/jsascii.js
-
-		/*
-		* jsAscii 0.1
-		* Copyright (c) 2008 Jacob Seidelin, jseidelin@nihilogic.dk, http://blog.nihilogic.dk/
-		* MIT License [http://www.nihilogic.dk/licenses/mit-license.txt]
-		*/
+		// Throw in ascii library from https://github.com/hassadee/jsascii/blob/master/jsascii.js (MIT License)
 
 		function initAsciiSize() {
 

package/examples/jsm/exporters/GLTFExporter.js

@@ -2199,7 +2199,7 @@ class GLTFMaterialsUnlitExtension {
 /**
  * Specular-Glossiness Extension
  *
- * Specification: https://github.com/KhronosGroup/glTF/tree/master/extensions/2.0/Khronos/KHR_materials_pbrSpecularGlossiness
+ * Specification: https://github.com/KhronosGroup/glTF/tree/main/extensions/2.0/Archived/KHR_materials_pbrSpecularGlossiness
  */
 class GLTFMaterialsPBRSpecularGlossiness {
 

package/examples/jsm/geometries/TeapotGeometry.js

@@ -48,7 +48,6 @@ import {
  *
  * Code converted from my ancient SPD software, http://tog.acm.org/resources/SPD/
  * Created for the Udacity course "Interactive Rendering", http://bit.ly/ericity
- * Lesson: https://www.udacity.com/course/viewer#!/c-cs291/l-68866048/m-106482448
  * YouTube video on teapot history: https://www.youtube.com/watch?v=DxMfblPzFNc
  *
  * See https://en.wikipedia.org/wiki/Utah_teapot for the history of the teapot

package/examples/jsm/interactive/SelectionBox.js

@@ -182,6 +182,7 @@ class SelectionBox {
 
 					object.getMatrixAt( instanceId, _matrix );
 					_matrix.decompose( _center, _quaternion, _scale );
+					_center.applyMatrix4( object.matrixWorld );
 
 					if ( frustum.containsPoint( _center ) ) {
 

package/examples/jsm/interactive/SelectionHelper.js

@@ -18,14 +18,14 @@ class SelectionHelper {
 
 		this.isDown = false;
 
-		this.renderer.domElement.addEventListener( 'pointerdown', function ( event ) {
+		this.onPointerDown = function ( event ) {
 
 			this.isDown = true;
 			this.onSelectStart( event );
 
-		}.bind( this ) );
+		}.bind( this );
 
-		this.renderer.domElement.addEventListener( 'pointermove', function ( event ) {
+		this.onPointerMove = function ( event ) {
 
 			if ( this.isDown ) {
 
@@ -33,14 +33,26 @@ class SelectionHelper {
 
 			}
 
-		}.bind( this ) );
+		}.bind( this );
 
-		this.renderer.domElement.addEventListener( 'pointerup', function ( event ) {
+		this.onPointerUp = function ( ) {
 
 			this.isDown = false;
-			this.onSelectOver( event );
+			this.onSelectOver();
 
-		}.bind( this ) );
+		}.bind( this );
+
+		this.renderer.domElement.addEventListener( 'pointerdown', this.onPointerDown );
+		this.renderer.domElement.addEventListener( 'pointermove', this.onPointerMove );
+		this.renderer.domElement.addEventListener( 'pointerup', this.onPointerUp );
+
+	}
+
+	dispose() {
+
+		this.renderer.domElement.removeEventListener( 'pointerdown', this.onPointerDown );
+		this.renderer.domElement.removeEventListener( 'pointermove', this.onPointerMove );
+		this.renderer.domElement.removeEventListener( 'pointerup', this.onPointerUp );
 
 	}