BufferGeometry: Overwrite copy() in gener (#25536)

Mugen87 · web-flow · commit 0345c78e8c63 · 2023-02-20T21:00:05.000+09:00
diff --git a/examples/jsm/geometries/ParametricGeometry.js b/examples/jsm/geometries/ParametricGeometry.js
@@ -124,6 +124,16 @@ class ParametricGeometry extends BufferGeometry {
 
 	}
 
+	copy( source ) {
+
+		super.copy( source );
+
+		this.parameters = Object.assign( {}, source.parameters );
+
+		return this;
+
+	}
+
 }
 
 export { ParametricGeometry };
diff --git a/src/core/BufferGeometry.js b/src/core/BufferGeometry.js
@@ -1073,10 +1073,6 @@ class BufferGeometry extends EventDispatcher {
 
 		this.userData = source.userData;
 
-		// geometry generator parameters
-
-		if ( source.parameters !== undefined ) this.parameters = Object.assign( {}, source.parameters );
-
 		return this;
 
 	}
diff --git a/src/geometries/BoxGeometry.js b/src/geometries/BoxGeometry.js
@@ -159,6 +159,16 @@ class BoxGeometry extends BufferGeometry {
 
 	}
 
+	copy( source ) {
+
+		super.copy( source );
+
+		this.parameters = Object.assign( {}, source.parameters );
+
+		return this;
+
+	}
+
 	static fromJSON( data ) {
 
 		return new BoxGeometry( data.width, data.height, data.depth, data.widthSegments, data.heightSegments, data.depthSegments );
diff --git a/src/geometries/CircleGeometry.js b/src/geometries/CircleGeometry.js
@@ -79,6 +79,16 @@ class CircleGeometry extends BufferGeometry {
 
 	}
 
+	copy( source ) {
+
+		super.copy( source );
+
+		this.parameters = Object.assign( {}, source.parameters );
+
+		return this;
+
+	}
+
 	static fromJSON( data ) {
 
 		return new CircleGeometry( data.radius, data.segments, data.thetaStart, data.thetaLength );
diff --git a/src/geometries/CylinderGeometry.js b/src/geometries/CylinderGeometry.js
@@ -264,6 +264,16 @@ class CylinderGeometry extends BufferGeometry {
 
 	}
 
+	copy( source ) {
+
+		super.copy( source );
+
+		this.parameters = Object.assign( {}, source.parameters );
+
+		return this;
+
+	}
+
 	static fromJSON( data ) {
 
 		return new CylinderGeometry( data.radiusTop, data.radiusBottom, data.height, data.radialSegments, data.heightSegments, data.openEnded, data.thetaStart, data.thetaLength );
diff --git a/src/geometries/EdgesGeometry.js b/src/geometries/EdgesGeometry.js
@@ -137,6 +137,16 @@ class EdgesGeometry extends BufferGeometry {
 
 	}
 
+	copy( source ) {
+
+		super.copy( source );
+
+		this.parameters = Object.assign( {}, source.parameters );
+
+		return this;
+
+	}
+
 }
 
 export { EdgesGeometry };
diff --git a/src/geometries/ExtrudeGeometry.js b/src/geometries/ExtrudeGeometry.js
@@ -677,6 +677,16 @@ class ExtrudeGeometry extends BufferGeometry {
 
 	}
 
+	copy( source ) {
+
+		super.copy( source );
+
+		this.parameters = Object.assign( {}, source.parameters );
+
+		return this;
+
+	}
+
 	toJSON() {
 
 		const data = super.toJSON();
diff --git a/src/geometries/LatheGeometry.js b/src/geometries/LatheGeometry.js
@@ -167,6 +167,16 @@ class LatheGeometry extends BufferGeometry {
 
 	}
 
+	copy( source ) {
+
+		super.copy( source );
+
+		this.parameters = Object.assign( {}, source.parameters );
+
+		return this;
+
+	}
+
 	static fromJSON( data ) {
 
 		return new LatheGeometry( data.points, data.segments, data.phiStart, data.phiLength );
diff --git a/src/geometries/PlaneGeometry.js b/src/geometries/PlaneGeometry.js
@@ -77,6 +77,16 @@ class PlaneGeometry extends BufferGeometry {
 
 	}
 
+	copy( source ) {
+
+		super.copy( source );
+
+		this.parameters = Object.assign( {}, source.parameters );
+
+		return this;
+
+	}
+
 	static fromJSON( data ) {
 
 		return new PlaneGeometry( data.width, data.height, data.widthSegments, data.heightSegments );
diff --git a/src/geometries/PolyhedronGeometry.js b/src/geometries/PolyhedronGeometry.js
@@ -298,6 +298,16 @@ class PolyhedronGeometry extends BufferGeometry {
 
 	}
 
+	copy( source ) {
+
+		super.copy( source );
+
+		this.parameters = Object.assign( {}, source.parameters );
+
+		return this;
+
+	}
+
 	static fromJSON( data ) {
 
 		return new PolyhedronGeometry( data.vertices, data.indices, data.radius, data.details );
diff --git a/src/geometries/RingGeometry.js b/src/geometries/RingGeometry.js
@@ -106,6 +106,16 @@ class RingGeometry extends BufferGeometry {
 
 	}
 
+	copy( source ) {
+
+		super.copy( source );
+
+		this.parameters = Object.assign( {}, source.parameters );
+
+		return this;
+
+	}
+
 	static fromJSON( data ) {
 
 		return new RingGeometry( data.innerRadius, data.outerRadius, data.thetaSegments, data.phiSegments, data.thetaStart, data.thetaLength );
diff --git a/src/geometries/ShapeGeometry.js b/src/geometries/ShapeGeometry.js
@@ -130,6 +130,16 @@ class ShapeGeometry extends BufferGeometry {
 
 	}
 
+	copy( source ) {
+
+		super.copy( source );
+
+		this.parameters = Object.assign( {}, source.parameters );
+
+		return this;
+
+	}
+
 	toJSON() {
 
 		const data = super.toJSON();
diff --git a/src/geometries/SphereGeometry.js b/src/geometries/SphereGeometry.js
@@ -116,6 +116,16 @@ class SphereGeometry extends BufferGeometry {
 
 	}
 
+	copy( source ) {
+
+		super.copy( source );
+
+		this.parameters = Object.assign( {}, source.parameters );
+
+		return this;
+
+	}
+
 	static fromJSON( data ) {
 
 		return new SphereGeometry( data.radius, data.widthSegments, data.heightSegments, data.phiStart, data.phiLength, data.thetaStart, data.thetaLength );
diff --git a/src/geometries/TorusGeometry.js b/src/geometries/TorusGeometry.js
@@ -99,6 +99,16 @@ class TorusGeometry extends BufferGeometry {
 
 	}
 
+	copy( source ) {
+
+		super.copy( source );
+
+		this.parameters = Object.assign( {}, source.parameters );
+
+		return this;
+
+	}
+
 	static fromJSON( data ) {
 
 		return new TorusGeometry( data.radius, data.tube, data.radialSegments, data.tubularSegments, data.arc );
diff --git a/src/geometries/TorusKnotGeometry.js b/src/geometries/TorusKnotGeometry.js
@@ -146,6 +146,16 @@ class TorusKnotGeometry extends BufferGeometry {
 
 	}
 
+	copy( source ) {
+
+		super.copy( source );
+
+		this.parameters = Object.assign( {}, source.parameters );
+
+		return this;
+
+	}
+
 	static fromJSON( data ) {
 
 		return new TorusKnotGeometry( data.radius, data.tube, data.tubularSegments, data.radialSegments, data.p, data.q );
diff --git a/src/geometries/TubeGeometry.js b/src/geometries/TubeGeometry.js
@@ -163,6 +163,16 @@ class TubeGeometry extends BufferGeometry {
 
 	}
 
+	copy( source ) {
+
+		super.copy( source );
+
+		this.parameters = Object.assign( {}, source.parameters );
+
+		return this;
+
+	}
+
 	toJSON() {
 
 		const data = super.toJSON();
diff --git a/src/geometries/WireframeGeometry.js b/src/geometries/WireframeGeometry.js
@@ -112,6 +112,16 @@ class WireframeGeometry extends BufferGeometry {
 
 	}
 
+	copy( source ) {
+
+		super.copy( source );
+
+		this.parameters = Object.assign( {}, source.parameters );
+
+		return this;
+
+	}
+
 }
 
 function isUniqueEdge( start, end, edges ) {

Original file line number	Diff line number	Diff line change
`@@ -124,6 +124,16 @@ class ParametricGeometry extends BufferGeometry {`
`124`	`124`
`125`	`125`	`}`
`126`	`126`
	`127`	`+ copy( source ) {`
	`128`	`+`
	`129`	`+ super.copy( source );`
	`130`	`+`
	`131`	`+ this.parameters = Object.assign( {}, source.parameters );`
	`132`	`+`
	`133`	`+ return this;`
	`134`	`+`
	`135`	`+ }`
	`136`	`+`
`127`	`137`	`}`
`128`	`138`
`129`	`139`	`export { ParametricGeometry };`
Original file line number	Diff line number	Diff line change
`@@ -1073,10 +1073,6 @@ class BufferGeometry extends EventDispatcher {`
`1073`	`1073`
`1074`	`1074`	`this.userData = source.userData;`
`1075`	`1075`
`1076`		`- // geometry generator parameters`
`1077`		`-`
`1078`		`- if ( source.parameters !== undefined ) this.parameters = Object.assign( {}, source.parameters );`
`1079`		`-`
`1080`	`1076`	`return this;`
`1081`	`1077`
`1082`	`1078`	`}`
Original file line number	Diff line number	Diff line change
`@@ -137,6 +137,16 @@ class EdgesGeometry extends BufferGeometry {`
`137`	`137`
`138`	`138`	`}`
`139`	`139`
	`140`	`+ copy( source ) {`
	`141`	`+`
	`142`	`+ super.copy( source );`
	`143`	`+`
	`144`	`+ this.parameters = Object.assign( {}, source.parameters );`
	`145`	`+`
	`146`	`+ return this;`
	`147`	`+`
	`148`	`+ }`
	`149`	`+`
`140`	`150`	`}`
`141`	`151`
`142`	`152`	`export { EdgesGeometry };`