浏览代码

Merge pull request #20260 from jeffpyke/optimize-line2

Pass geometry and material into super constructor
Mr.doob 4 年之前
父节点
当前提交
2c9fce00b3
共有 4 个文件被更改,包括 16 次插入16 次删除
  1. 4 4
      examples/js/lines/Line2.js
  2. 4 4
      examples/js/lines/LineSegments2.js
  3. 4 4
      examples/jsm/lines/Line2.js
  4. 4 4
      examples/jsm/lines/LineSegments2.js

+ 4 - 4
examples/js/lines/Line2.js

@@ -2,12 +2,12 @@ console.warn( "THREE.Line2: As part of the transition to ES6 Modules, the files
 
 THREE.Line2 = function ( geometry, material ) {
 
-	THREE.LineSegments2.call( this );
+	if ( geometry === undefined ) geometry = new THREE.LineGeometry();
+	if ( material === undefined ) material = new THREE.LineMaterial( { color: Math.random() * 0xffffff } );
 
-	this.type = 'Line2';
+	THREE.LineSegments2.call( this, geometry, material );
 
-	this.geometry = geometry !== undefined ? geometry : new THREE.LineGeometry();
-	this.material = material !== undefined ? material : new THREE.LineMaterial( { color: Math.random() * 0xffffff } );
+	this.type = 'Line2';
 
 };
 

+ 4 - 4
examples/js/lines/LineSegments2.js

@@ -2,12 +2,12 @@ console.warn( "THREE.LineSegments2: As part of the transition to ES6 Modules, th
 
 THREE.LineSegments2 = function ( geometry, material ) {
 
-	THREE.Mesh.call( this );
+	if ( geometry === undefined ) geometry = new THREE.LineSegmentsGeometry();
+	if ( material === undefined ) material = new THREE.LineMaterial( { color: Math.random() * 0xffffff } );
 
-	this.type = 'LineSegments2';
+	THREE.Mesh.call( this, geometry, material );
 
-	this.geometry = geometry !== undefined ? geometry : new THREE.LineSegmentsGeometry();
-	this.material = material !== undefined ? material : new THREE.LineMaterial( { color: Math.random() * 0xffffff } );
+	this.type = 'LineSegments2';
 
 };
 

+ 4 - 4
examples/jsm/lines/Line2.js

@@ -5,12 +5,12 @@ import { LineMaterial } from "../lines/LineMaterial.js";
 
 var Line2 = function ( geometry, material ) {
 
-	LineSegments2.call( this );
+	if ( geometry === undefined ) geometry = new LineGeometry();
+	if ( material === undefined ) material = new LineMaterial( { color: Math.random() * 0xffffff } );
 
-	this.type = 'Line2';
+	LineSegments2.call( this, geometry, material );
 
-	this.geometry = geometry !== undefined ? geometry : new LineGeometry();
-	this.material = material !== undefined ? material : new LineMaterial( { color: Math.random() * 0xffffff } );
+	this.type = 'Line2';
 
 };
 

+ 4 - 4
examples/jsm/lines/LineSegments2.js

@@ -13,12 +13,12 @@ import { LineMaterial } from "../lines/LineMaterial.js";
 
 var LineSegments2 = function ( geometry, material ) {
 
-	Mesh.call( this );
+	if ( geometry === undefined ) geometry = new LineSegmentsGeometry();
+	if ( material === undefined ) material = new LineMaterial( { color: Math.random() * 0xffffff } );
 
-	this.type = 'LineSegments2';
+	Mesh.call( this, geometry, material );
 
-	this.geometry = geometry !== undefined ? geometry : new LineSegmentsGeometry();
-	this.material = material !== undefined ? material : new LineMaterial( { color: Math.random() * 0xffffff } );
+	this.type = 'LineSegments2';
 
 };