@needle-tools/three 0.146.4 → 0.146.6

package/build/three.cjs

@@ -8548,9 +8548,9 @@ var logdepthbuf_pars_vertex = "#ifdef USE_LOGDEPTHBUF\n\t#ifdef USE_LOGDEPTHBUF_
 
 var logdepthbuf_vertex = "#ifdef USE_LOGDEPTHBUF\n\t#ifdef USE_LOGDEPTHBUF_EXT\n\t\tvFragDepth = 1.0 + gl_Position.w;\n\t\tvIsPerspective = float( isPerspectiveMatrix( projectionMatrix ) );\n\t#else\n\t\tif ( isPerspectiveMatrix( projectionMatrix ) ) {\n\t\t\tgl_Position.z = log2( max( EPSILON, gl_Position.w + 1.0 ) ) * logDepthBufFC - 1.0;\n\t\t\tgl_Position.z *= gl_Position.w;\n\t\t}\n\t#endif\n#endif";
 
-var map_fragment = "#ifdef USE_MAP\n\tvec4 sampledDiffuseColor = texture2D( map, vUv );\n\t#ifdef DECODE_VIDEO_TEXTURE\n\t\tsampledDiffuseColor = vec4( mix( pow( sampledDiffuseColor.rgb * 0.9478672986 + vec3( 0.0521327014 ), vec3( 2.4 ) ), sampledDiffuseColor.rgb * 0.0773993808, vec3( lessThanEqual( sampledDiffuseColor.rgb, vec3( 0.04045 ) ) ) ), sampledDiffuseColor.w );\n\t#endif\n\tdiffuseColor *= sampledDiffuseColor;\n#endif";
+var map_fragment = "#ifdef USE_MAP\n#ifdef USE_MIPMAP_BIAS\n				vec4 sampledDiffuseColor = texture2D( map, vUv, mipmapBias );\n#else\n\t\tvec4 sampledDiffuseColor = texture2D( map, vUv, -0.5 );\n#endif\n\t#ifdef DECODE_VIDEO_TEXTURE\n\t\tsampledDiffuseColor = vec4( mix( pow( sampledDiffuseColor.rgb * 0.9478672986 + vec3( 0.0521327014 ), vec3( 2.4 ) ), sampledDiffuseColor.rgb * 0.0773993808, vec3( lessThanEqual( sampledDiffuseColor.rgb, vec3( 0.04045 ) ) ) ), sampledDiffuseColor.w );\n\t#endif\n\tdiffuseColor *= sampledDiffuseColor;\n#endif";
 
-var map_pars_fragment = "#ifdef USE_MAP\n\tuniform sampler2D map;\n#endif";
+var map_pars_fragment = "#ifdef USE_MAP\n\tuniform sampler2D map;\n				\n#ifdef USE_MIPMAP_BIAS\n		uniform float mipmapBias;\n#endif\n#endif";
 
 var map_particle_fragment = "#if defined( USE_MAP ) || defined( USE_ALPHAMAP )\n\tvec2 uv = ( uvTransform * vec3( gl_PointCoord.x, 1.0 - gl_PointCoord.y, 1 ) ).xy;\n#endif\n#ifdef USE_MAP\n\tdiffuseColor *= texture2D( map, uv );\n#endif\n#ifdef USE_ALPHAMAP\n\tdiffuseColor.a *= texture2D( alphaMap, uv ).g;\n#endif";
 
@@ -16610,6 +16610,7 @@ class WebXRManager extends EventDispatcher {
 			const top2 = topFov * far / far2 * near2;
 			const bottom2 = bottomFov * far / far2 * near2;
 			camera.projectionMatrix.makePerspective(left2, right2, top2, bottom2, near2, far2);
+			camera.projectionMatrixInverse.copy(camera.projectionMatrix).invert();
 		}
 		function updateCamera(camera, parent) {
 			if (parent === null) {
@@ -16639,16 +16640,6 @@ class WebXRManager extends EventDispatcher {
 			for (let i = 0; i < cameras.length; i++) {
 				updateCamera(cameras[i], parent);
 			}
-			cameraVR.matrixWorld.decompose(cameraVR.position, cameraVR.quaternion, cameraVR.scale);
-
-			// update user camera and its children
-
-			camera.matrix.copy(cameraVR.matrix);
-			camera.matrix.decompose(camera.position, camera.quaternion, camera.scale);
-			const children = camera.children;
-			for (let i = 0, l = children.length; i < l; i++) {
-				children[i].updateMatrixWorld(true);
-			}
 
 			// update projection matrix for proper view frustum culling
 
@@ -16659,7 +16650,32 @@ class WebXRManager extends EventDispatcher {
 
 				cameraVR.projectionMatrix.copy(cameraL.projectionMatrix);
 			}
+
+			// update user camera and its children
+
+			updateUserCamera(camera, cameraVR, parent);
 		};
+		function updateUserCamera(camera, cameraVR, parent) {
+			if (parent === null) {
+				camera.matrix.copy(cameraVR.matrixWorld);
+			} else {
+				camera.matrix.copy(parent.matrixWorld);
+				camera.matrix.invert();
+				camera.matrix.multiply(cameraVR.matrixWorld);
+			}
+			camera.matrix.decompose(camera.position, camera.quaternion, camera.scale);
+			camera.updateMatrixWorld(true);
+			const children = camera.children;
+			for (let i = 0, l = children.length; i < l; i++) {
+				children[i].updateMatrixWorld(true);
+			}
+			camera.projectionMatrix.copy(cameraVR.projectionMatrix);
+			camera.projectionMatrixInverse.copy(cameraVR.projectionMatrixInverse);
+			if (camera.isPerspectiveCamera) {
+				camera.fov = RAD2DEG * 2 * Math.atan(1 / camera.projectionMatrix.elements[5]);
+				camera.zoom = 1;
+			}
+		}
 		this.getCamera = function () {
 			return cameraVR;
 		};
@@ -16730,10 +16746,13 @@ class WebXRManager extends EventDispatcher {
 						cameras[i] = camera;
 					}
 					camera.matrix.fromArray(view.transform.matrix);
+					camera.matrix.decompose(camera.position, camera.quaternion, camera.scale);
 					camera.projectionMatrix.fromArray(view.projectionMatrix);
+					camera.projectionMatrixInverse.copy(camera.projectionMatrix).invert();
 					camera.viewport.set(viewport.x, viewport.y, viewport.width, viewport.height);
 					if (i === 0) {
 						cameraVR.matrix.copy(camera.matrix);
+						cameraVR.matrix.decompose(cameraVR.position, cameraVR.quaternion, cameraVR.scale);
 					}
 					if (cameraVRNeedsUpdate === true) {
 						cameraVR.cameras.push(camera);

package/build/three.js

@@ -8550,9 +8550,9 @@
 
 	var logdepthbuf_vertex = "#ifdef USE_LOGDEPTHBUF\n\t#ifdef USE_LOGDEPTHBUF_EXT\n\t\tvFragDepth = 1.0 + gl_Position.w;\n\t\tvIsPerspective = float( isPerspectiveMatrix( projectionMatrix ) );\n\t#else\n\t\tif ( isPerspectiveMatrix( projectionMatrix ) ) {\n\t\t\tgl_Position.z = log2( max( EPSILON, gl_Position.w + 1.0 ) ) * logDepthBufFC - 1.0;\n\t\t\tgl_Position.z *= gl_Position.w;\n\t\t}\n\t#endif\n#endif";
 
-	var map_fragment = "#ifdef USE_MAP\n\tvec4 sampledDiffuseColor = texture2D( map, vUv );\n\t#ifdef DECODE_VIDEO_TEXTURE\n\t\tsampledDiffuseColor = vec4( mix( pow( sampledDiffuseColor.rgb * 0.9478672986 + vec3( 0.0521327014 ), vec3( 2.4 ) ), sampledDiffuseColor.rgb * 0.0773993808, vec3( lessThanEqual( sampledDiffuseColor.rgb, vec3( 0.04045 ) ) ) ), sampledDiffuseColor.w );\n\t#endif\n\tdiffuseColor *= sampledDiffuseColor;\n#endif";
+	var map_fragment = "#ifdef USE_MAP\n#ifdef USE_MIPMAP_BIAS\n				vec4 sampledDiffuseColor = texture2D( map, vUv, mipmapBias );\n#else\n\t\tvec4 sampledDiffuseColor = texture2D( map, vUv, -0.5 );\n#endif\n\t#ifdef DECODE_VIDEO_TEXTURE\n\t\tsampledDiffuseColor = vec4( mix( pow( sampledDiffuseColor.rgb * 0.9478672986 + vec3( 0.0521327014 ), vec3( 2.4 ) ), sampledDiffuseColor.rgb * 0.0773993808, vec3( lessThanEqual( sampledDiffuseColor.rgb, vec3( 0.04045 ) ) ) ), sampledDiffuseColor.w );\n\t#endif\n\tdiffuseColor *= sampledDiffuseColor;\n#endif";
 
-	var map_pars_fragment = "#ifdef USE_MAP\n\tuniform sampler2D map;\n#endif";
+	var map_pars_fragment = "#ifdef USE_MAP\n\tuniform sampler2D map;\n				\n#ifdef USE_MIPMAP_BIAS\n		uniform float mipmapBias;\n#endif\n#endif";
 
 	var map_particle_fragment = "#if defined( USE_MAP ) || defined( USE_ALPHAMAP )\n\tvec2 uv = ( uvTransform * vec3( gl_PointCoord.x, 1.0 - gl_PointCoord.y, 1 ) ).xy;\n#endif\n#ifdef USE_MAP\n\tdiffuseColor *= texture2D( map, uv );\n#endif\n#ifdef USE_ALPHAMAP\n\tdiffuseColor.a *= texture2D( alphaMap, uv ).g;\n#endif";
 
@@ -16612,6 +16612,7 @@
 				const top2 = topFov * far / far2 * near2;
 				const bottom2 = bottomFov * far / far2 * near2;
 				camera.projectionMatrix.makePerspective(left2, right2, top2, bottom2, near2, far2);
+				camera.projectionMatrixInverse.copy(camera.projectionMatrix).invert();
 			}
 			function updateCamera(camera, parent) {
 				if (parent === null) {
@@ -16641,16 +16642,6 @@
 				for (let i = 0; i < cameras.length; i++) {
 					updateCamera(cameras[i], parent);
 				}
-				cameraVR.matrixWorld.decompose(cameraVR.position, cameraVR.quaternion, cameraVR.scale);
-
-				// update user camera and its children
-
-				camera.matrix.copy(cameraVR.matrix);
-				camera.matrix.decompose(camera.position, camera.quaternion, camera.scale);
-				const children = camera.children;
-				for (let i = 0, l = children.length; i < l; i++) {
-					children[i].updateMatrixWorld(true);
-				}
 
 				// update projection matrix for proper view frustum culling
 
@@ -16661,7 +16652,32 @@
 
 					cameraVR.projectionMatrix.copy(cameraL.projectionMatrix);
 				}
+
+				// update user camera and its children
+
+				updateUserCamera(camera, cameraVR, parent);
 			};
+			function updateUserCamera(camera, cameraVR, parent) {
+				if (parent === null) {
+					camera.matrix.copy(cameraVR.matrixWorld);
+				} else {
+					camera.matrix.copy(parent.matrixWorld);
+					camera.matrix.invert();
+					camera.matrix.multiply(cameraVR.matrixWorld);
+				}
+				camera.matrix.decompose(camera.position, camera.quaternion, camera.scale);
+				camera.updateMatrixWorld(true);
+				const children = camera.children;
+				for (let i = 0, l = children.length; i < l; i++) {
+					children[i].updateMatrixWorld(true);
+				}
+				camera.projectionMatrix.copy(cameraVR.projectionMatrix);
+				camera.projectionMatrixInverse.copy(cameraVR.projectionMatrixInverse);
+				if (camera.isPerspectiveCamera) {
+					camera.fov = RAD2DEG * 2 * Math.atan(1 / camera.projectionMatrix.elements[5]);
+					camera.zoom = 1;
+				}
+			}
 			this.getCamera = function () {
 				return cameraVR;
 			};
@@ -16732,10 +16748,13 @@
 							cameras[i] = camera;
 						}
 						camera.matrix.fromArray(view.transform.matrix);
+						camera.matrix.decompose(camera.position, camera.quaternion, camera.scale);
 						camera.projectionMatrix.fromArray(view.projectionMatrix);
+						camera.projectionMatrixInverse.copy(camera.projectionMatrix).invert();
 						camera.viewport.set(viewport.x, viewport.y, viewport.width, viewport.height);
 						if (i === 0) {
 							cameraVR.matrix.copy(camera.matrix);
+							cameraVR.matrix.decompose(cameraVR.position, cameraVR.quaternion, cameraVR.scale);
 						}
 						if (cameraVRNeedsUpdate === true) {
 							cameraVR.cameras.push(camera);