Mr.doob пре 4 година
родитељ
комит
baf652649f
3 измењених фајлова са 26 додато и 16 уклоњено
  1. 10 10
      build/three.js
  2. 0 0
      build/three.min.js
  3. 16 6
      build/three.module.js

+ 10 - 10
build/three.js

@@ -13508,20 +13508,24 @@
 		function push(object, geometry, material, groupOrder, z, group) {
 			const renderItem = getNextRenderItem(object, geometry, material, groupOrder, z, group);
 
-			if (material.transmission !== undefined && material.transmission > 0.0) {
+			if (material.transmission > 0.0) {
 				transmissive.push(renderItem);
+			} else if (material.transparent === true) {
+				transparent.push(renderItem);
 			} else {
-				(material.transparent === true ? transparent : opaque).push(renderItem);
+				opaque.push(renderItem);
 			}
 		}
 
 		function unshift(object, geometry, material, groupOrder, z, group) {
 			const renderItem = getNextRenderItem(object, geometry, material, groupOrder, z, group);
 
-			if (material.transmission !== undefined && material.transmission > 0.0) {
+			if (material.transmission > 0.0) {
 				transmissive.unshift(renderItem);
+			} else if (material.transparent === true) {
+				transparent.unshift(renderItem);
 			} else {
-				(material.transparent === true ? transparent : opaque).unshift(renderItem);
+				opaque.unshift(renderItem);
 			}
 		}
 
@@ -17440,11 +17444,7 @@
 		let _clippingEnabled = false;
 		let _localClippingEnabled = false; // transmission
 
-		let _transmissionRenderTarget = null;
-
-		const _transmissionSamplerSize = new Vector2(1024, 1024); // Should be configurable?
-		// camera matrices cache
-
+		let _transmissionRenderTarget = null; // camera matrices cache
 
 		const _projScreenMatrix = new Matrix4();
 
@@ -18191,7 +18191,7 @@
 
 		function renderTransmissiveObjects(opaqueObjects, transmissiveObjects, scene, camera) {
 			if (_transmissionRenderTarget === null) {
-				_transmissionRenderTarget = new WebGLRenderTarget(_transmissionSamplerSize.x, _transmissionSamplerSize.y, {
+				_transmissionRenderTarget = new WebGLRenderTarget(1024, 1024, {
 					generateMipmaps: true,
 					minFilter: LinearMipmapLinearFilter,
 					magFilter: NearestFilter,

Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
build/three.min.js


+ 16 - 6
build/three.module.js

@@ -18000,13 +18000,17 @@ function WebGLRenderList( properties ) {
 
 		const renderItem = getNextRenderItem( object, geometry, material, groupOrder, z, group );
 
-		if ( material.transmission !== undefined && material.transmission > 0.0 ) {
+		if ( material.transmission > 0.0 ) {
 
 			transmissive.push( renderItem );
 
+		} else if ( material.transparent === true ) {
+
+			transparent.push( renderItem );
+
 		} else {
 
-			( material.transparent === true ? transparent : opaque ).push( renderItem );
+			opaque.push( renderItem );
 
 		}
 
@@ -18016,13 +18020,17 @@ function WebGLRenderList( properties ) {
 
 		const renderItem = getNextRenderItem( object, geometry, material, groupOrder, z, group );
 
-		if ( material.transmission !== undefined && material.transmission > 0.0 ) {
+		if ( material.transmission > 0.0 ) {
 
 			transmissive.unshift( renderItem );
 
+		} else if ( material.transparent === true ) {
+
+			transparent.unshift( renderItem );
+
 		} else {
 
-			( material.transparent === true ? transparent : opaque ).unshift( renderItem );
+			opaque.unshift( renderItem );
 
 		}
 
@@ -23626,7 +23634,6 @@ function WebGLRenderer( parameters ) {
 	// transmission
 
 	let _transmissionRenderTarget = null;
-	const _transmissionSamplerSize = new Vector2( 1024, 1024 ); // Should be configurable?
 
 	// camera matrices cache
 
@@ -24727,7 +24734,7 @@ function WebGLRenderer( parameters ) {
 
 		if ( _transmissionRenderTarget === null ) {
 
-			_transmissionRenderTarget = new WebGLRenderTarget( _transmissionSamplerSize.x, _transmissionSamplerSize.y, {
+			_transmissionRenderTarget = new WebGLRenderTarget( 1024, 1024, {
 				generateMipmaps: true,
 				minFilter: LinearMipmapLinearFilter,
 				magFilter: NearestFilter,
@@ -24740,8 +24747,11 @@ function WebGLRenderer( parameters ) {
 		const currentRenderTarget = _this.getRenderTarget();
 		_this.setRenderTarget( _transmissionRenderTarget );
 		_this.clear();
+
 		renderObjects( opaqueObjects, scene, camera );
+
 		textures.updateRenderTargetMipmap( _transmissionRenderTarget );
+
 		_this.setRenderTarget( currentRenderTarget );
 
 		renderObjects( transmissiveObjects, scene, camera );

Неке датотеке нису приказане због велике количине промена