浏览代码

Updated builds.

Mr.doob 3 年之前
父节点
当前提交
3d1f906c3c
共有 4 个文件被更改,包括 37 次插入9 次删除
  1. 12 3
      build/three.cjs
  2. 12 3
      build/three.js
  3. 0 0
      build/three.min.js
  4. 13 3
      build/three.module.js

+ 12 - 3
build/three.cjs

@@ -13934,7 +13934,8 @@ function handleSource(string, errorLine) {
 	const to = Math.min(errorLine + 6, lines.length);
 
 	for (let i = from; i < to; i++) {
-		lines2.push(i + 1 + ': ' + lines[i]);
+		const line = i + 1;
+		lines2.push(`${line === errorLine ? '>' : ' '} ${line}: ${lines[i]}`);
 	}
 
 	return lines2.join('\n');
@@ -13963,7 +13964,7 @@ function getShaderErrors(gl, shader, type) {
 	if (errorMatches) {
 		// --enable-privileged-webgl-extension
 		// console.log( '**' + type + '**', gl.getExtension( 'WEBGL_debug_shaders' ).getTranslatedShaderSource( shader ) );
-		const errorLine = parseInt(errorMatches[0]);
+		const errorLine = parseInt(errorMatches[1]);
 		return type.toUpperCase() + '\n\n' + errors + '\n\n' + handleSource(gl.getShaderSource(shader), errorLine);
 	} else {
 		return errors;
@@ -18778,7 +18779,15 @@ class WebXRManager extends EventDispatcher {
 						}
 					}
 
-					const camera = cameras[i];
+					let camera = cameras[i];
+
+					if (camera === undefined) {
+						camera = new PerspectiveCamera();
+						camera.layers.enable(i);
+						camera.viewport = new Vector4();
+						cameras[i] = camera;
+					}
+
 					camera.matrix.fromArray(view.transform.matrix);
 					camera.projectionMatrix.fromArray(view.projectionMatrix);
 					camera.viewport.set(viewport.x, viewport.y, viewport.width, viewport.height);

+ 12 - 3
build/three.js

@@ -13936,7 +13936,8 @@
 		const to = Math.min(errorLine + 6, lines.length);
 
 		for (let i = from; i < to; i++) {
-			lines2.push(i + 1 + ': ' + lines[i]);
+			const line = i + 1;
+			lines2.push(`${line === errorLine ? '>' : ' '} ${line}: ${lines[i]}`);
 		}
 
 		return lines2.join('\n');
@@ -13965,7 +13966,7 @@
 		if (errorMatches) {
 			// --enable-privileged-webgl-extension
 			// console.log( '**' + type + '**', gl.getExtension( 'WEBGL_debug_shaders' ).getTranslatedShaderSource( shader ) );
-			const errorLine = parseInt(errorMatches[0]);
+			const errorLine = parseInt(errorMatches[1]);
 			return type.toUpperCase() + '\n\n' + errors + '\n\n' + handleSource(gl.getShaderSource(shader), errorLine);
 		} else {
 			return errors;
@@ -18780,7 +18781,15 @@
 							}
 						}
 
-						const camera = cameras[i];
+						let camera = cameras[i];
+
+						if (camera === undefined) {
+							camera = new PerspectiveCamera();
+							camera.layers.enable(i);
+							camera.viewport = new Vector4();
+							cameras[i] = camera;
+						}
+
 						camera.matrix.fromArray(view.transform.matrix);
 						camera.projectionMatrix.fromArray(view.projectionMatrix);
 						camera.viewport.set(viewport.x, viewport.y, viewport.width, viewport.height);

文件差异内容过多而无法显示
+ 0 - 0
build/three.min.js


+ 13 - 3
build/three.module.js

@@ -18231,7 +18231,8 @@ function handleSource( string, errorLine ) {
 
 	for ( let i = from; i < to; i ++ ) {
 
-		lines2.push( ( i + 1 ) + ': ' + lines[ i ] );
+		const line = i + 1;
+		lines2.push( `${line === errorLine ? '>' : ' '} ${line}: ${lines[ i ]}` );
 
 	}
 
@@ -18268,7 +18269,7 @@ function getShaderErrors( gl, shader, type ) {
 		// --enable-privileged-webgl-extension
 		// console.log( '**' + type + '**', gl.getExtension( 'WEBGL_debug_shaders' ).getTranslatedShaderSource( shader ) );
 
-		const errorLine = parseInt( errorMatches[ 0 ] );
+		const errorLine = parseInt( errorMatches[ 1 ] );
 		return type.toUpperCase() + '\n\n' + errors + '\n\n' + handleSource( gl.getShaderSource( shader ), errorLine );
 
 	} else {
@@ -25530,7 +25531,16 @@ class WebXRManager extends EventDispatcher {
 
 					}
 
-					const camera = cameras[ i ];
+					let camera = cameras[ i ];
+
+					if ( camera === undefined ) {
+
+						camera = new PerspectiveCamera();
+						camera.layers.enable( i );
+						camera.viewport = new Vector4();
+						cameras[ i ] = camera;
+
+					}
 
 					camera.matrix.fromArray( view.transform.matrix );
 					camera.projectionMatrix.fromArray( view.projectionMatrix );

部分文件因为文件数量过多而无法显示