Ver Fonte

Updated builds.

Mr.doob há 8 anos atrás
pai
commit
6594029d5e
3 ficheiros alterados com 374 adições e 374 exclusões
  1. 39 39
      build/three.js
  2. 296 296
      build/three.min.js
  3. 39 39
      build/three.module.js

+ 39 - 39
build/three.js

@@ -22499,65 +22499,75 @@
 
 				}
 
-				if ( material.isMeshBasicMaterial ||
-					material.isMeshLambertMaterial ||
-					material.isMeshPhongMaterial ||
-					material.isMeshStandardMaterial ||
-					material.isMeshNormalMaterial ||
-					material.isMeshDepthMaterial ||
-					material.isMeshDistanceMaterial ) {
+				if ( material.isMeshBasicMaterial ) {
 
 					refreshUniformsCommon( m_uniforms, material );
 
-				}
+				} else if ( material.isMeshLambertMaterial ) {
 
-				// refresh single material specific uniforms
+					refreshUniformsCommon( m_uniforms, material );
+					refreshUniformsLambert( m_uniforms, material );
 
-				if ( material.isLineBasicMaterial ) {
+				} else if ( material.isMeshPhongMaterial ) {
 
-					refreshUniformsLine( m_uniforms, material );
+					refreshUniformsCommon( m_uniforms, material );
 
-				} else if ( material.isLineDashedMaterial ) {
+					if ( material.isMeshToonMaterial ) {
 
-					refreshUniformsLine( m_uniforms, material );
-					refreshUniformsDash( m_uniforms, material );
+						refreshUniformsToon( m_uniforms, material );
 
-				} else if ( material.isPointsMaterial ) {
+					} else {
 
-					refreshUniformsPoints( m_uniforms, material );
+						refreshUniformsPhong( m_uniforms, material );
 
-				} else if ( material.isMeshLambertMaterial ) {
+					}
 
-					refreshUniformsLambert( m_uniforms, material );
+				} else if ( material.isMeshStandardMaterial ) {
 
-				} else if ( material.isMeshToonMaterial ) {
+					refreshUniformsCommon( m_uniforms, material );
 
-					refreshUniformsToon( m_uniforms, material );
+					if ( material.isMeshPhysicalMaterial ) {
 
-				} else if ( material.isMeshPhongMaterial ) {
+						refreshUniformsPhysical( m_uniforms, material );
 
-					refreshUniformsPhong( m_uniforms, material );
+					} else {
 
-				} else if ( material.isMeshPhysicalMaterial ) {
+						refreshUniformsStandard( m_uniforms, material );
 
-					refreshUniformsPhysical( m_uniforms, material );
+					}
 
-				} else if ( material.isMeshStandardMaterial ) {
+				} else if ( material.isMeshNormalMaterial ) {
 
-					refreshUniformsStandard( m_uniforms, material );
+					refreshUniformsCommon( m_uniforms, material );
 
 				} else if ( material.isMeshDepthMaterial ) {
 
+					refreshUniformsCommon( m_uniforms, material );
 					refreshUniformsDepth( m_uniforms, material );
 
 				} else if ( material.isMeshDistanceMaterial ) {
 
+					refreshUniformsCommon( m_uniforms, material );
 					refreshUniformsDistance( m_uniforms, material );
 
 				} else if ( material.isMeshNormalMaterial ) {
 
 					refreshUniformsNormal( m_uniforms, material );
 
+				} else if ( material.isLineBasicMaterial ) {
+
+					refreshUniformsLine( m_uniforms, material );
+
+					if ( material.isLineDashedMaterial ) {
+
+						refreshUniformsDash( m_uniforms, material );
+
+					}
+
+				} else if ( material.isPointsMaterial ) {
+
+					refreshUniformsPoints( m_uniforms, material );
+
 				} else if ( material.isShadowMaterial ) {
 
 					m_uniforms.color.value = material.color;
@@ -29757,36 +29767,26 @@
 
 	function LineDashedMaterial( parameters ) {
 
-		Material.call( this );
+		LineBasicMaterial.call( this );
 
 		this.type = 'LineDashedMaterial';
 
-		this.color = new Color( 0xffffff );
-
-		this.linewidth = 1;
-
 		this.scale = 1;
 		this.dashSize = 3;
 		this.gapSize = 1;
 
-		this.lights = false;
-
 		this.setValues( parameters );
 
 	}
 
-	LineDashedMaterial.prototype = Object.create( Material.prototype );
+	LineDashedMaterial.prototype = Object.create( LineBasicMaterial.prototype );
 	LineDashedMaterial.prototype.constructor = LineDashedMaterial;
 
 	LineDashedMaterial.prototype.isLineDashedMaterial = true;
 
 	LineDashedMaterial.prototype.copy = function ( source ) {
 
-		Material.prototype.copy.call( this, source );
-
-		this.color.copy( source.color );
-
-		this.linewidth = source.linewidth;
+		LineBasicMaterial.prototype.copy.call( this, source );
 
 		this.scale = source.scale;
 		this.dashSize = source.dashSize;

Diff do ficheiro suprimidas por serem muito extensas
+ 296 - 296
build/three.min.js


+ 39 - 39
build/three.module.js

@@ -22493,65 +22493,75 @@ function WebGLRenderer( parameters ) {
 
 			}
 
-			if ( material.isMeshBasicMaterial ||
-				material.isMeshLambertMaterial ||
-				material.isMeshPhongMaterial ||
-				material.isMeshStandardMaterial ||
-				material.isMeshNormalMaterial ||
-				material.isMeshDepthMaterial ||
-				material.isMeshDistanceMaterial ) {
+			if ( material.isMeshBasicMaterial ) {
 
 				refreshUniformsCommon( m_uniforms, material );
 
-			}
+			} else if ( material.isMeshLambertMaterial ) {
 
-			// refresh single material specific uniforms
+				refreshUniformsCommon( m_uniforms, material );
+				refreshUniformsLambert( m_uniforms, material );
 
-			if ( material.isLineBasicMaterial ) {
+			} else if ( material.isMeshPhongMaterial ) {
 
-				refreshUniformsLine( m_uniforms, material );
+				refreshUniformsCommon( m_uniforms, material );
 
-			} else if ( material.isLineDashedMaterial ) {
+				if ( material.isMeshToonMaterial ) {
 
-				refreshUniformsLine( m_uniforms, material );
-				refreshUniformsDash( m_uniforms, material );
+					refreshUniformsToon( m_uniforms, material );
 
-			} else if ( material.isPointsMaterial ) {
+				} else {
 
-				refreshUniformsPoints( m_uniforms, material );
+					refreshUniformsPhong( m_uniforms, material );
 
-			} else if ( material.isMeshLambertMaterial ) {
+				}
 
-				refreshUniformsLambert( m_uniforms, material );
+			} else if ( material.isMeshStandardMaterial ) {
 
-			} else if ( material.isMeshToonMaterial ) {
+				refreshUniformsCommon( m_uniforms, material );
 
-				refreshUniformsToon( m_uniforms, material );
+				if ( material.isMeshPhysicalMaterial ) {
 
-			} else if ( material.isMeshPhongMaterial ) {
+					refreshUniformsPhysical( m_uniforms, material );
 
-				refreshUniformsPhong( m_uniforms, material );
+				} else {
 
-			} else if ( material.isMeshPhysicalMaterial ) {
+					refreshUniformsStandard( m_uniforms, material );
 
-				refreshUniformsPhysical( m_uniforms, material );
+				}
 
-			} else if ( material.isMeshStandardMaterial ) {
+			} else if ( material.isMeshNormalMaterial ) {
 
-				refreshUniformsStandard( m_uniforms, material );
+				refreshUniformsCommon( m_uniforms, material );
 
 			} else if ( material.isMeshDepthMaterial ) {
 
+				refreshUniformsCommon( m_uniforms, material );
 				refreshUniformsDepth( m_uniforms, material );
 
 			} else if ( material.isMeshDistanceMaterial ) {
 
+				refreshUniformsCommon( m_uniforms, material );
 				refreshUniformsDistance( m_uniforms, material );
 
 			} else if ( material.isMeshNormalMaterial ) {
 
 				refreshUniformsNormal( m_uniforms, material );
 
+			} else if ( material.isLineBasicMaterial ) {
+
+				refreshUniformsLine( m_uniforms, material );
+
+				if ( material.isLineDashedMaterial ) {
+
+					refreshUniformsDash( m_uniforms, material );
+
+				}
+
+			} else if ( material.isPointsMaterial ) {
+
+				refreshUniformsPoints( m_uniforms, material );
+
 			} else if ( material.isShadowMaterial ) {
 
 				m_uniforms.color.value = material.color;
@@ -29751,36 +29761,26 @@ MeshLambertMaterial.prototype.copy = function ( source ) {
 
 function LineDashedMaterial( parameters ) {
 
-	Material.call( this );
+	LineBasicMaterial.call( this );
 
 	this.type = 'LineDashedMaterial';
 
-	this.color = new Color( 0xffffff );
-
-	this.linewidth = 1;
-
 	this.scale = 1;
 	this.dashSize = 3;
 	this.gapSize = 1;
 
-	this.lights = false;
-
 	this.setValues( parameters );
 
 }
 
-LineDashedMaterial.prototype = Object.create( Material.prototype );
+LineDashedMaterial.prototype = Object.create( LineBasicMaterial.prototype );
 LineDashedMaterial.prototype.constructor = LineDashedMaterial;
 
 LineDashedMaterial.prototype.isLineDashedMaterial = true;
 
 LineDashedMaterial.prototype.copy = function ( source ) {
 
-	Material.prototype.copy.call( this, source );
-
-	this.color.copy( source.color );
-
-	this.linewidth = source.linewidth;
+	LineBasicMaterial.prototype.copy.call( this, source );
 
 	this.scale = source.scale;
 	this.dashSize = source.dashSize;

Alguns ficheiros não foram mostrados porque muitos ficheiros mudaram neste diff