@unikia/upe-renderer 0.186.110 → 0.187.11

package/examples/jsm/Addons.js

@@ -97,6 +97,7 @@ export * from './loaders/GLTFLoader.js';
 export * from './loaders/HDRLoader.js';
 export * from './loaders/HDRCubeTextureLoader.js';
 export * from './loaders/IESLoader.js';
+export * from './loaders/JXLLoader.js';
 export * from './loaders/KMZLoader.js';
 export * from './loaders/KSPLATLoader.js';
 export * from './loaders/KTX2Loader.js';
@@ -284,6 +285,7 @@ export * as SkeletonUtils from './utils/SkeletonUtils.js';
 export * as SortUtils from './utils/SortUtils.js';
 export * from './utils/WebGLTextureUtils.js';
 export * from './utils/UVsDebug.js';
+export * from './utils/unwrapUVs.js';
 export * from './utils/WorkerPool.js';
 
 export * from './webxr/ARButton.js';

package/examples/jsm/animation/CCDIKSolver.js

@@ -4,6 +4,7 @@ import {
 	Color,
 	Line,
 	LineBasicMaterial,
+	MathUtils,
 	Matrix4,
 	Mesh,
 	MeshBasicMaterial,
@@ -23,6 +24,7 @@ const _invLinkQ = new Quaternion();
 const _linkScale = new Vector3();
 const _axis = new Vector3();
 const _vector = new Vector3();
+const _center = new Vector3();
 const _matrix = new Matrix4();
 
 /**
@@ -216,15 +218,25 @@ class CCDIKSolver {
 
 				}
 
-				if ( rotationMin !== undefined ) {
+				if ( rotationMin !== undefined || rotationMax !== undefined ) {
 
-					link.rotation.setFromVector3( _vector.setFromEuler( link.rotation ).max( rotationMin ) );
+					_vector.setFromEuler( link.rotation );
 
-				}
+					if ( rotationMin !== undefined && rotationMax !== undefined ) {
+
+						// wrap angles to within ±π of the limits' center so ranges crossing ±π clamp correctly
+						_center.addVectors( rotationMin, rotationMax ).multiplyScalar( 0.5 );
+
+						_vector.x = _center.x + MathUtils.euclideanModulo( _vector.x - _center.x + Math.PI, 2 * Math.PI ) - Math.PI;
+						_vector.y = _center.y + MathUtils.euclideanModulo( _vector.y - _center.y + Math.PI, 2 * Math.PI ) - Math.PI;
+						_vector.z = _center.z + MathUtils.euclideanModulo( _vector.z - _center.z + Math.PI, 2 * Math.PI ) - Math.PI;
+
+					}
 
-				if ( rotationMax !== undefined ) {
+					if ( rotationMin !== undefined ) _vector.max( rotationMin );
+					if ( rotationMax !== undefined ) _vector.min( rotationMax );
 
-					link.rotation.setFromVector3( _vector.setFromEuler( link.rotation ).min( rotationMax ) );
+					link.rotation.setFromVector3( _vector );
 
 				}
 

package/examples/jsm/controls/FirstPersonControls.js

@@ -123,7 +123,7 @@ class FirstPersonControls extends Controls {
 		 * How far you can vertically look around, upper limit. Range is `0` to `Math.PI` in radians.
 		 *
 		 * @type {number}
-		 * @default 0
+		 * @default Math.PI
 		 */
 		this.verticalMax = Math.PI;
 

package/examples/jsm/controls/OrbitControls.js

@@ -502,8 +502,7 @@ class OrbitControls extends Controls {
 		this.domElement.addEventListener( 'contextmenu', this._onContextMenu );
 		this.domElement.addEventListener( 'wheel', this._onMouseWheel, { passive: false } );
 
-		const document = this.domElement.getRootNode(); // offscreen canvas compatibility
-		document.addEventListener( 'keydown', this._interceptControlDown, { passive: true, capture: true } );
+		this.domElement.ownerDocument.addEventListener( 'keydown', this._interceptControlDown, { passive: true, capture: true } );
 
 		this.domElement.style.touchAction = 'none'; // Disable touch scroll
 
@@ -523,9 +522,8 @@ class OrbitControls extends Controls {
 
 		this.stopListenToKeyEvents();
 
-		const document = this.domElement.getRootNode(); // offscreen canvas compatibility
-		document.removeEventListener( 'keydown', this._interceptControlDown, { capture: true } );
-		document.removeEventListener( 'keyup', this._interceptControlUp, { capture: true } );
+		this.domElement.ownerDocument.removeEventListener( 'keydown', this._interceptControlDown, { capture: true } );
+		this.domElement.ownerDocument.removeEventListener( 'keyup', this._interceptControlUp, { capture: true } );
 
 		this._controlActive = false;
 
@@ -1096,7 +1094,7 @@ class OrbitControls extends Controls {
 
 	_handleMouseDownDolly( event ) {
 
-		this._updateZoomParameters( event.clientX, event.clientX );
+		this._updateZoomParameters( event.clientX, event.clientY );
 		this._dollyStart.set( event.clientX, event.clientY );
 
 	}
@@ -1143,6 +1141,15 @@ class OrbitControls extends Controls {
 
 		this._dollyStart.copy( this._dollyEnd );
 
+		if ( this.zoomToCursor ) {
+
+			// update() resets the cursor zoom, so keep zooming towards the position where the drag started
+
+			this._performCursorZoom = true;
+			this._dollyDirection.set( this._mouse.x, this._mouse.y, 1 ).unproject( this.object ).sub( this.object.position ).normalize();
+
+		}
+
 		this.update();
 
 	}
@@ -1807,7 +1814,12 @@ function onTouchStart( event ) {
 
 				case TOUCH.ROTATE:
 
-					if ( this.enableRotate === false ) return;
+					if ( this.enableRotate === false ) {
+
+						this.state = _STATE.NONE;
+						break;
+
+					}
 
 					this._handleTouchStartRotate( event );
 
@@ -1817,7 +1829,12 @@ function onTouchStart( event ) {
 
 				case TOUCH.PAN:
 
-					if ( this.enablePan === false ) return;
+					if ( this.enablePan === false ) {
+
+						this.state = _STATE.NONE;
+						break;
+
+					}
 
 					this._handleTouchStartPan( event );
 
@@ -1947,9 +1964,7 @@ function interceptControlDown( event ) {
 
 		this._controlActive = true;
 
-		const document = this.domElement.getRootNode(); // offscreen canvas compatibility
-
-		document.addEventListener( 'keyup', this._interceptControlUp, { passive: true, capture: true } );
+		this.domElement.ownerDocument.addEventListener( 'keyup', this._interceptControlUp, { passive: true, capture: true } );
 
 	}
 
@@ -1961,9 +1976,7 @@ function interceptControlUp( event ) {
 
 		this._controlActive = false;
 
-		const document = this.domElement.getRootNode(); // offscreen canvas compatibility
-
-		document.removeEventListener( 'keyup', this._interceptControlUp, { passive: true, capture: true } );
+		this.domElement.ownerDocument.removeEventListener( 'keyup', this._interceptControlUp, { passive: true, capture: true } );
 
 	}
 

package/examples/jsm/csm/CSMShader.js

@@ -26,17 +26,54 @@ vec3 geometryClearcoatNormal = vec3( 0.0 );
 #endif
 
 #ifdef USE_IRIDESCENCE
+
 	float dotNVi = saturate( dot( normal, geometryViewDir ) );
+
 	if ( material.iridescenceThickness == 0.0 ) {
+
 		material.iridescence = 0.0;
+
 	} else {
+
 		material.iridescence = saturate( material.iridescence );
+
 	}
+
 	if ( material.iridescence > 0.0 ) {
-		material.iridescenceFresnel = evalIridescence( 1.0, material.iridescenceIOR, dotNVi, material.iridescenceThickness, material.specularColor );
+
+		vec3 iridescenceFresnelDielectric = evalIridescence( 1.0, material.iridescenceIOR, dotNVi, material.iridescenceThickness, material.specularColor );
+		vec3 iridescenceFresnelMetallic = evalIridescence( 1.0, material.iridescenceIOR, dotNVi, material.iridescenceThickness, material.diffuseColor );
+
+		material.iridescenceFresnel = mix( iridescenceFresnelDielectric, iridescenceFresnelMetallic, material.metalness );
+
 		// Iridescence F0 approximation
-		material.iridescenceF0 = Schlick_to_F0( material.iridescenceFresnel, 1.0, dotNVi );
+		material.iridescenceF0Dielectric = Schlick_to_F0( iridescenceFresnelDielectric, 1.0, dotNVi );
+		material.iridescenceF0Metallic = Schlick_to_F0( iridescenceFresnelMetallic, 1.0, dotNVi );
+
 	}
+
+#endif
+
+#ifdef STANDARD
+
+	float dotNVms = saturate( dot( geometryNormal, geometryViewDir ) );
+
+	material.dfg = texture2D( dfgLUT, vec2( material.roughness, dotNVms ) ).rg;
+
+	#if ( NUM_SUN_LIGHTS > 0 || NUM_DIR_LIGHTS > 0 || NUM_POINT_LIGHTS > 0 || NUM_SPOT_LIGHTS > 0 )
+
+		// Multi-scattering energy compensation for direct lighting
+		// Based on "Practical Multiple Scattering Compensation for Microfacet Models"
+		// https://blog.selfshadow.com/publications/turquin/ms_comp_final.pdf
+
+		// Energy of the single-scattering lobe in a white furnace ( F0 = F90 = 1 )
+		float EssMs = material.dfg.x + material.dfg.y;
+
+		// Compensate for the energy lost to multiple scattering, tinting the added term by F0 ( equation 16 )
+		material.multiScatteringCompensation = 1.0 + material.specularColorBlended * ( 1.0 / EssMs - 1.0 );
+
+	#endif
+
 #endif
 
 IncidentLight directLight;
@@ -55,7 +92,7 @@ IncidentLight directLight;
 
 		getPointLightInfo( pointLight, geometryPosition, directLight );
 
-		#if defined( USE_SHADOWMAP ) && ( UNROLLED_LOOP_INDEX < NUM_POINT_LIGHT_SHADOWS )
+		#if defined( USE_SHADOWMAP ) && ( UNROLLED_LOOP_INDEX < NUM_POINT_LIGHT_SHADOWS ) && ( defined( SHADOWMAP_TYPE_PCF ) || defined( SHADOWMAP_TYPE_BASIC ) )
 		pointLightShadow = pointLightShadows[ i ];
 		directLight.color *= ( directLight.visible && receiveShadow ) ? getPointShadow( pointShadowMap[ i ], pointLightShadow.shadowMapSize, pointLightShadow.shadowIntensity, pointLightShadow.shadowBias, pointLightShadow.shadowRadius, vPointShadowCoord[ i ], pointLightShadow.shadowCameraNear, pointLightShadow.shadowCameraFar ) : 1.0;
 
@@ -115,6 +152,32 @@ IncidentLight directLight;
 
 #endif
 
+#if ( NUM_SUN_LIGHTS > 0 ) && defined( RE_Direct )
+
+	SunLight sunLight;
+	#if defined( USE_SHADOWMAP ) && NUM_SUN_LIGHT_SHADOWS > 0
+	SunLightShadow sunLightShadow;
+	#endif
+
+	#pragma unroll_loop_start
+	for ( int i = 0; i < NUM_SUN_LIGHTS; i ++ ) {
+
+		sunLight = sunLights[ i ];
+
+		getSunLightInfo( sunLight, directLight );
+
+		#if defined( USE_SHADOWMAP ) && ( UNROLLED_LOOP_INDEX < NUM_SUN_LIGHT_SHADOWS )
+		sunLightShadow = sunLightShadows[ i ];
+		directLight.color *= ( directLight.visible && receiveShadow ) ? getSunShadow( sunShadowMap[ i ], sunLightShadow, UNROLLED_LOOP_INDEX ) : 1.0;
+		#endif
+
+		RE_Direct( directLight, geometryPosition, geometryNormal, geometryViewDir, geometryClearcoatNormal, material, reflectedLight );
+
+	}
+	#pragma unroll_loop_end
+
+#endif
+
 #if ( NUM_DIR_LIGHTS > 0 ) && defined( RE_Direct ) && defined( USE_CSM ) && defined( CSM_CASCADES )
 
 	DirectionalLight directionalLight;
@@ -286,6 +349,14 @@ IncidentLight directLight;
 
 	#endif
 
+	#ifdef USE_LIGHT_PROBES_GRID
+
+		vec3 probeWorldPos = ( ( vec4( geometryPosition, 1.0 ) - viewMatrix[ 3 ] ) * viewMatrix ).xyz;
+		vec3 probeWorldNormal = transformNormalByInverseViewMatrix( geometryNormal, viewMatrix );
+		irradiance += getLightProbeGridIrradiance( probeWorldPos, probeWorldNormal );
+
+	#endif
+
 #endif
 
 #if defined( RE_IndirectSpecular )

package/examples/jsm/curves/CurveExtras.js

@@ -487,7 +487,7 @@ class DecoratedTorusKnot4a extends Curve {
 	/**
 	 * Constructs a new Decorated Torus Knot 4a.
 	 *
-	 * @param {number} [scale=1] - The curve's scale.
+	 * @param {number} [scale=40] - The curve's scale.
 	 */
 	constructor( scale = 40 ) {
 
@@ -537,7 +537,7 @@ class DecoratedTorusKnot4b extends Curve {
 	/**
 	 * Constructs a new Decorated Torus Knot 4b.
 	 *
-	 * @param {number} [scale=1] - The curve's scale.
+	 * @param {number} [scale=40] - The curve's scale.
 	 */
 	constructor( scale = 40 ) {
 
@@ -587,7 +587,7 @@ class DecoratedTorusKnot5a extends Curve {
 	/**
 	 * Constructs a new Decorated Torus Knot 5a.
 	 *
-	 * @param {number} [scale=1] - The curve's scale.
+	 * @param {number} [scale=40] - The curve's scale.
 	 */
 	constructor( scale = 40 ) {
 
@@ -637,7 +637,7 @@ class DecoratedTorusKnot5c extends Curve {
 	/**
 	 * Constructs a new Decorated Torus Knot 5c.
 	 *
-	 * @param {number} [scale=1] - The curve's scale.
+	 * @param {number} [scale=40] - The curve's scale.
 	 */
 	constructor( scale = 40 ) {
 

package/examples/jsm/curves/NURBSCurve.js

@@ -122,6 +122,20 @@ class NURBSCurve extends Curve {
 
 	}
 
+	copy( source ) {
+
+		super.copy( source );
+
+		this.degree = source.degree;
+		this.knots = [ ...source.knots ];
+		this.controlPoints = source.controlPoints.map( p => p.clone() );
+		this.startKnot = source.startKnot;
+		this.endKnot = source.endKnot;
+
+		return this;
+
+	}
+
 	toJSON() {
 
 		const data = super.toJSON();