浏览代码

GeometryUtils: Remove .merge() and .center().

Don McCurdy 5 年之前
父节点
当前提交
a5a4d7f57c
共有 2 个文件被更改,包括 0 次插入57 次删除
  1. 0 28
      examples/js/utils/GeometryUtils.js
  2. 0 29
      examples/jsm/utils/GeometryUtils.js

+ 0 - 28
examples/js/utils/GeometryUtils.js

@@ -5,34 +5,6 @@
 
 
 THREE.GeometryUtils = {
 THREE.GeometryUtils = {
 
 
-	// Merge two geometries or geometry and geometry from object (using object's transform)
-
-	merge: function ( geometry1, geometry2, materialIndexOffset ) {
-
-		console.warn( 'THREE.GeometryUtils: .merge() has been moved to Geometry. Use geometry.merge( geometry2, matrix, materialIndexOffset ) instead.' );
-
-		var matrix;
-
-		if ( geometry2 instanceof THREE.Mesh ) {
-
-			geometry2.matrixAutoUpdate && geometry2.updateMatrix();
-
-			matrix = geometry2.matrix;
-			geometry2 = geometry2.geometry;
-
-		}
-
-		geometry1.merge( geometry2, matrix, materialIndexOffset );
-
-	},
-
-	center: function ( geometry ) {
-
-		console.warn( 'THREE.GeometryUtils: .center() has been moved to Geometry. Use geometry.center() instead.' );
-		return geometry.center();
-
-	},
-
 	/**
 	/**
 	 * Generates 2D-Coordinates in a very fast way.
 	 * Generates 2D-Coordinates in a very fast way.
 	 *
 	 *

+ 0 - 29
examples/jsm/utils/GeometryUtils.js

@@ -4,40 +4,11 @@
  */
  */
 
 
 import {
 import {
-	Mesh,
 	Vector3
 	Vector3
 } from "../../../build/three.module.js";
 } from "../../../build/three.module.js";
 
 
 var GeometryUtils = {
 var GeometryUtils = {
 
 
-	// Merge two geometries or geometry and geometry from object (using object's transform)
-
-	merge: function ( geometry1, geometry2, materialIndexOffset ) {
-
-		console.warn( 'THREE.GeometryUtils: .merge() has been moved to Geometry. Use geometry.merge( geometry2, matrix, materialIndexOffset ) instead.' );
-
-		var matrix;
-
-		if ( geometry2 instanceof Mesh ) {
-
-			geometry2.matrixAutoUpdate && geometry2.updateMatrix();
-
-			matrix = geometry2.matrix;
-			geometry2 = geometry2.geometry;
-
-		}
-
-		geometry1.merge( geometry2, matrix, materialIndexOffset );
-
-	},
-
-	center: function ( geometry ) {
-
-		console.warn( 'THREE.GeometryUtils: .center() has been moved to Geometry. Use geometry.center() instead.' );
-		return geometry.center();
-
-	},
-
 	/**
 	/**
 	 * Generates 2D-Coordinates in a very fast way.
 	 * Generates 2D-Coordinates in a very fast way.
 	 *
 	 *