Mr.doob преди 3 години
родител
ревизия
7849228ef2
променени са 4 файла, в които са добавени 41 реда и са изтрити 27 реда
  1. 14 9
      build/three.cjs
  2. 14 9
      build/three.js
  3. 0 0
      build/three.min.js
  4. 13 9
      build/three.module.js

+ 14 - 9
build/three.cjs

@@ -19333,6 +19333,8 @@ function WebGLRenderer(parameters = {}) {
 
 
 	const _projScreenMatrix = new Matrix4();
 	const _projScreenMatrix = new Matrix4();
 
 
+	const _vector2 = new Vector2();
+
 	const _vector3 = new Vector3();
 	const _vector3 = new Vector3();
 
 
 	const _emptyScene = {
 	const _emptyScene = {
@@ -20011,20 +20013,23 @@ function WebGLRenderer(parameters = {}) {
 	}
 	}
 
 
 	function renderTransmissionPass(opaqueObjects, scene, camera) {
 	function renderTransmissionPass(opaqueObjects, scene, camera) {
+		const isWebGL2 = capabilities.isWebGL2;
+
 		if (_transmissionRenderTarget === null) {
 		if (_transmissionRenderTarget === null) {
-			const needsAntialias = _antialias === true && capabilities.isWebGL2 === true;
-			const renderTargetType = needsAntialias ? WebGLMultisampleRenderTarget : WebGLRenderTarget;
-			_transmissionRenderTarget = new renderTargetType(1024, 1024, {
+			const renderTargetType = isWebGL2 && _antialias === true ? WebGLMultisampleRenderTarget : WebGLRenderTarget;
+			_transmissionRenderTarget = new renderTargetType(1, 1, {
 				generateMipmaps: true,
 				generateMipmaps: true,
-				type: utils.convert(HalfFloatType) !== null ? HalfFloatType : UnsignedByteType,
-				minFilter: LinearMipmapLinearFilter,
-				magFilter: NearestFilter,
-				wrapS: ClampToEdgeWrapping,
-				wrapT: ClampToEdgeWrapping,
+				type: HalfFloatType,
+				minFilter: isWebGL2 ? LinearMipmapLinearFilter : LinearFilter,
 				useRenderToTexture: extensions.has('WEBGL_multisampled_render_to_texture')
 				useRenderToTexture: extensions.has('WEBGL_multisampled_render_to_texture')
 			});
 			});
 		}
 		}
 
 
+		_this.getDrawingBufferSize(_vector2);
+
+		_transmissionRenderTarget.setSize(_vector2.x, _vector2.y); //
+
+
 		const currentRenderTarget = _this.getRenderTarget();
 		const currentRenderTarget = _this.getRenderTarget();
 
 
 		_this.setRenderTarget(_transmissionRenderTarget);
 		_this.setRenderTarget(_transmissionRenderTarget);
@@ -20415,7 +20420,7 @@ function WebGLRenderer(parameters = {}) {
 				// The multisample_render_to_texture extension doesn't work properly if there
 				// The multisample_render_to_texture extension doesn't work properly if there
 				// are midframe flushes and an external depth buffer. Disable use of the extension.
 				// are midframe flushes and an external depth buffer. Disable use of the extension.
 				if (renderTarget.useRenderToTexture) {
 				if (renderTarget.useRenderToTexture) {
-					console.warn('render-to-texture extension was disabled because an external texture was provided');
+					console.warn('THREE.WebGLRenderer: Render-to-texture extension was disabled because an external texture was provided');
 					renderTarget.useRenderToTexture = false;
 					renderTarget.useRenderToTexture = false;
 					renderTarget.useRenderbuffer = true;
 					renderTarget.useRenderbuffer = true;
 				}
 				}

+ 14 - 9
build/three.js

@@ -19335,6 +19335,8 @@
 
 
 		const _projScreenMatrix = new Matrix4();
 		const _projScreenMatrix = new Matrix4();
 
 
+		const _vector2 = new Vector2();
+
 		const _vector3 = new Vector3();
 		const _vector3 = new Vector3();
 
 
 		const _emptyScene = {
 		const _emptyScene = {
@@ -20013,20 +20015,23 @@
 		}
 		}
 
 
 		function renderTransmissionPass(opaqueObjects, scene, camera) {
 		function renderTransmissionPass(opaqueObjects, scene, camera) {
+			const isWebGL2 = capabilities.isWebGL2;
+
 			if (_transmissionRenderTarget === null) {
 			if (_transmissionRenderTarget === null) {
-				const needsAntialias = _antialias === true && capabilities.isWebGL2 === true;
-				const renderTargetType = needsAntialias ? WebGLMultisampleRenderTarget : WebGLRenderTarget;
-				_transmissionRenderTarget = new renderTargetType(1024, 1024, {
+				const renderTargetType = isWebGL2 && _antialias === true ? WebGLMultisampleRenderTarget : WebGLRenderTarget;
+				_transmissionRenderTarget = new renderTargetType(1, 1, {
 					generateMipmaps: true,
 					generateMipmaps: true,
-					type: utils.convert(HalfFloatType) !== null ? HalfFloatType : UnsignedByteType,
-					minFilter: LinearMipmapLinearFilter,
-					magFilter: NearestFilter,
-					wrapS: ClampToEdgeWrapping,
-					wrapT: ClampToEdgeWrapping,
+					type: HalfFloatType,
+					minFilter: isWebGL2 ? LinearMipmapLinearFilter : LinearFilter,
 					useRenderToTexture: extensions.has('WEBGL_multisampled_render_to_texture')
 					useRenderToTexture: extensions.has('WEBGL_multisampled_render_to_texture')
 				});
 				});
 			}
 			}
 
 
+			_this.getDrawingBufferSize(_vector2);
+
+			_transmissionRenderTarget.setSize(_vector2.x, _vector2.y); //
+
+
 			const currentRenderTarget = _this.getRenderTarget();
 			const currentRenderTarget = _this.getRenderTarget();
 
 
 			_this.setRenderTarget(_transmissionRenderTarget);
 			_this.setRenderTarget(_transmissionRenderTarget);
@@ -20417,7 +20422,7 @@
 					// The multisample_render_to_texture extension doesn't work properly if there
 					// The multisample_render_to_texture extension doesn't work properly if there
 					// are midframe flushes and an external depth buffer. Disable use of the extension.
 					// are midframe flushes and an external depth buffer. Disable use of the extension.
 					if (renderTarget.useRenderToTexture) {
 					if (renderTarget.useRenderToTexture) {
-						console.warn('render-to-texture extension was disabled because an external texture was provided');
+						console.warn('THREE.WebGLRenderer: Render-to-texture extension was disabled because an external texture was provided');
 						renderTarget.useRenderToTexture = false;
 						renderTarget.useRenderToTexture = false;
 						renderTarget.useRenderbuffer = true;
 						renderTarget.useRenderbuffer = true;
 					}
 					}

Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
build/three.min.js


+ 13 - 9
build/three.module.js

@@ -26258,6 +26258,7 @@ function WebGLRenderer( parameters = {} ) {
 
 
 	const _projScreenMatrix = new Matrix4();
 	const _projScreenMatrix = new Matrix4();
 
 
+	const _vector2 = new Vector2();
 	const _vector3 = new Vector3();
 	const _vector3 = new Vector3();
 
 
 	const _emptyScene = { background: null, fog: null, environment: null, overrideMaterial: null, isScene: true };
 	const _emptyScene = { background: null, fog: null, environment: null, overrideMaterial: null, isScene: true };
@@ -27272,23 +27273,26 @@ function WebGLRenderer( parameters = {} ) {
 
 
 	function renderTransmissionPass( opaqueObjects, scene, camera ) {
 	function renderTransmissionPass( opaqueObjects, scene, camera ) {
 
 
+		const isWebGL2 = capabilities.isWebGL2;
+
 		if ( _transmissionRenderTarget === null ) {
 		if ( _transmissionRenderTarget === null ) {
 
 
-			const needsAntialias = _antialias === true && capabilities.isWebGL2 === true;
-			const renderTargetType = needsAntialias ? WebGLMultisampleRenderTarget : WebGLRenderTarget;
+			const renderTargetType = ( isWebGL2 && _antialias === true ) ? WebGLMultisampleRenderTarget : WebGLRenderTarget;
 
 
-			_transmissionRenderTarget = new renderTargetType( 1024, 1024, {
+			_transmissionRenderTarget = new renderTargetType( 1, 1, {
 				generateMipmaps: true,
 				generateMipmaps: true,
-				type: utils.convert( HalfFloatType ) !== null ? HalfFloatType : UnsignedByteType,
-				minFilter: LinearMipmapLinearFilter,
-				magFilter: NearestFilter,
-				wrapS: ClampToEdgeWrapping,
-				wrapT: ClampToEdgeWrapping,
+				type: HalfFloatType,
+				minFilter: isWebGL2 ? LinearMipmapLinearFilter : LinearFilter,
 				useRenderToTexture: extensions.has( 'WEBGL_multisampled_render_to_texture' )
 				useRenderToTexture: extensions.has( 'WEBGL_multisampled_render_to_texture' )
 			} );
 			} );
 
 
 		}
 		}
 
 
+		_this.getDrawingBufferSize( _vector2 );
+		_transmissionRenderTarget.setSize( _vector2.x, _vector2.y );
+
+		//
+
 		const currentRenderTarget = _this.getRenderTarget();
 		const currentRenderTarget = _this.getRenderTarget();
 		_this.setRenderTarget( _transmissionRenderTarget );
 		_this.setRenderTarget( _transmissionRenderTarget );
 		_this.clear();
 		_this.clear();
@@ -27874,7 +27878,7 @@ function WebGLRenderer( parameters = {} ) {
 				// are midframe flushes and an external depth buffer. Disable use of the extension.
 				// are midframe flushes and an external depth buffer. Disable use of the extension.
 				if ( renderTarget.useRenderToTexture ) {
 				if ( renderTarget.useRenderToTexture ) {
 
 
-					console.warn( 'render-to-texture extension was disabled because an external texture was provided' );
+					console.warn( 'THREE.WebGLRenderer: Render-to-texture extension was disabled because an external texture was provided' );
 					renderTarget.useRenderToTexture = false;
 					renderTarget.useRenderToTexture = false;
 					renderTarget.useRenderbuffer = true;
 					renderTarget.useRenderbuffer = true;
 
 

Някои файлове не бяха показани, защото твърде много файлове са промени