Updated builds.

851c4626 · Mr.doob · 3200ead5 · 851c4626 · 851c4626 · 851c4626
隐藏空白更改
内联并排

Showing with 348 addition and 376 deletion

build/three.js build/three.js +29 -43

build/three.min.js build/three.min.js +290 -290

build/three.module.js build/three.module.js +29 -43

未找到文件。
--- a/build/three.js
+++ b/build/three.js
@@ -5848,8 +5848,6 @@

 			// object specific properties

-			if ( this.isMesh && this.drawMode !== TrianglesDrawMode ) { object.drawMode = this.drawMode; }
-
 			if ( this.isInstancedMesh ) {

 				object.type = 'InstancedMesh';
@@ -11056,8 +11054,6 @@
 		this.geometry = geometry !== undefined ? geometry : new BufferGeometry();
 		this.material = material !== undefined ? material : new MeshBasicMaterial( { color: Math.random() * 0xffffff } );

-		this.drawMode = TrianglesDrawMode;
-
 		this.updateMorphTargets();

 	}
@@ -11068,18 +11064,10 @@

 		isMesh: true,

-		setDrawMode: function ( value ) {
-
-			this.drawMode = value;
-
-		},
-
 		copy: function ( source ) {

 			Object3D.prototype.copy.call( this, source );

-			this.drawMode = source.drawMode;
-
 			if ( source.morphTargetInfluences !== undefined ) {

 				this.morphTargetInfluences = source.morphTargetInfluences.slice();
@@ -11172,15 +11160,6 @@

 			}

-			// check unsupported draw modes
-
-			if ( this.drawMode !== TrianglesDrawMode ) {
-
-				console.warn( 'THREE.Mesh: TriangleStripDrawMode and TriangleFanDrawMode are not supported by .raycast().' );
-				return;
-
-			}
-
 			var intersection;

 			if ( geometry.isBufferGeometry ) {
@@ -16215,11 +16194,6 @@
 					render.triangles += instanceCount * ( count / 3 );
 					break;

-				case 5:
-				case 6:
-					render.triangles += instanceCount * ( count - 2 );
-					break;
-
 				case 1:
 					render.lines += instanceCount * ( count / 2 );
 					break;
@@ -24354,21 +24328,7 @@

 				} else {

-					switch ( object.drawMode ) {
-
-						case TrianglesDrawMode:
-							renderer.setMode( 4 );
-							break;
-
-						case TriangleStripDrawMode:
-							renderer.setMode( 5 );
-							break;
-
-						case TriangleFanDrawMode:
-							renderer.setMode( 6 );
-							break;
-
-					}
+					renderer.setMode( 4 );

 				}

@@ -40789,8 +40749,6 @@
 			if ( data.userData !== undefined ) { object.userData = data.userData; }
 			if ( data.layers !== undefined ) { object.layers.mask = data.layers; }

-			if ( data.drawMode !== undefined ) { object.setDrawMode( data.drawMode ); }
-
 			if ( data.children !== undefined ) {

 				var children = data.children;
@@ -48938,6 +48896,34 @@

 	} );

+	Object.assign( Mesh.prototype, {
+
+		setDrawMode: function () {
+
+			console.error( 'THREE.Mesh: .setDrawMode() has been removed. The renderer now always assumes THREE.TrianglesDrawMode. Transform your geometry via BufferGeometryUtils.toTrianglesDrawMode() if necessary.' );
+
+		},
+
+	} );
+
+	Object.defineProperties( Mesh.prototype, {
+
+		drawMode: {
+			get: function () {
+
+				console.error( 'THREE.Mesh: .drawMode has been removed. The renderer now always assumes THREE.TrianglesDrawMode.' );
+				return TrianglesDrawMode;
+
+			},
+			set: function () {
+
+				console.error( 'THREE.Mesh: .drawMode has been removed. The renderer now always assumes THREE.TrianglesDrawMode. Transform your geometry via BufferGeometryUtils.toTrianglesDrawMode() if necessary.' );
+
+			}
+		}
+
+	} );
+
 	Object.defineProperties( LOD.prototype, {

 		objects: {
--- a/build/three.min.js
+++ b/build/three.min.js
--- a/build/three.module.js
+++ b/build/three.module.js
@@ -5842,8 +5842,6 @@ Object3D.prototype = Object.assign( Object.create( EventDispatcher.prototype ),

 		// object specific properties

-		if ( this.isMesh && this.drawMode !== TrianglesDrawMode ) object.drawMode = this.drawMode;
-
 		if ( this.isInstancedMesh ) {

 			object.type = 'InstancedMesh';
@@ -11050,8 +11048,6 @@ function Mesh( geometry, material ) {
 	this.geometry = geometry !== undefined ? geometry : new BufferGeometry();
 	this.material = material !== undefined ? material : new MeshBasicMaterial( { color: Math.random() * 0xffffff } );

-	this.drawMode = TrianglesDrawMode;
-
 	this.updateMorphTargets();

 }
@@ -11062,18 +11058,10 @@ Mesh.prototype = Object.assign( Object.create( Object3D.prototype ), {

 	isMesh: true,

-	setDrawMode: function ( value ) {
-
-		this.drawMode = value;
-
-	},
-
 	copy: function ( source ) {

 		Object3D.prototype.copy.call( this, source );

-		this.drawMode = source.drawMode;
-
 		if ( source.morphTargetInfluences !== undefined ) {

 			this.morphTargetInfluences = source.morphTargetInfluences.slice();
@@ -11166,15 +11154,6 @@ Mesh.prototype = Object.assign( Object.create( Object3D.prototype ), {

 		}

-		// check unsupported draw modes
-
-		if ( this.drawMode !== TrianglesDrawMode ) {
-
-			console.warn( 'THREE.Mesh: TriangleStripDrawMode and TriangleFanDrawMode are not supported by .raycast().' );
-			return;
-
-		}
-
 		var intersection;

 		if ( geometry.isBufferGeometry ) {
@@ -16202,11 +16181,6 @@ function WebGLInfo( gl ) {
 				render.triangles += instanceCount * ( count / 3 );
 				break;

-			case 5:
-			case 6:
-				render.triangles += instanceCount * ( count - 2 );
-				break;
-
 			case 1:
 				render.lines += instanceCount * ( count / 2 );
 				break;
@@ -24346,21 +24320,7 @@ function WebGLRenderer( parameters ) {

 			} else {

-				switch ( object.drawMode ) {
-
-					case TrianglesDrawMode:
-						renderer.setMode( 4 );
-						break;
-
-					case TriangleStripDrawMode:
-						renderer.setMode( 5 );
-						break;
-
-					case TriangleFanDrawMode:
-						renderer.setMode( 6 );
-						break;
-
-				}
+				renderer.setMode( 4 );

 			}

@@ -40781,8 +40741,6 @@ ObjectLoader.prototype = Object.assign( Object.create( Loader.prototype ), {
 		if ( data.userData !== undefined ) object.userData = data.userData;
 		if ( data.layers !== undefined ) object.layers.mask = data.layers;

-		if ( data.drawMode !== undefined ) object.setDrawMode( data.drawMode );
-
 		if ( data.children !== undefined ) {

 			var children = data.children;
@@ -48932,6 +48890,34 @@ Object.defineProperties( Object3D.prototype, {

 } );

+Object.assign( Mesh.prototype, {
+
+	setDrawMode: function () {
+
+		console.error( 'THREE.Mesh: .setDrawMode() has been removed. The renderer now always assumes THREE.TrianglesDrawMode. Transform your geometry via BufferGeometryUtils.toTrianglesDrawMode() if necessary.' );
+
+	},
+
+} );
+
+Object.defineProperties( Mesh.prototype, {
+
+	drawMode: {
+		get: function () {
+
+			console.error( 'THREE.Mesh: .drawMode has been removed. The renderer now always assumes THREE.TrianglesDrawMode.' );
+			return TrianglesDrawMode;
+
+		},
+		set: function () {
+
+			console.error( 'THREE.Mesh: .drawMode has been removed. The renderer now always assumes THREE.TrianglesDrawMode. Transform your geometry via BufferGeometryUtils.toTrianglesDrawMode() if necessary.' );
+
+		}
+	}
+
+} );
+
 Object.defineProperties( LOD.prototype, {

 	objects: {