瀏覽代碼

Deprecated EdgesHelper and WireframeHelper. See #7533

Mr.doob 9 年之前
父節點
當前提交
0259b14fb4
共有 4 個文件被更改,包括 16 次插入56 次删除
  1. 16 0
      src/Three.Legacy.js
  2. 0 2
      src/Three.js
  3. 0 30
      src/extras/helpers/EdgesHelper.js
  4. 0 24
      src/extras/helpers/WireframeHelper.js

+ 16 - 0
src/Three.Legacy.js

@@ -12,13 +12,16 @@ import { EventDispatcher } from './core/EventDispatcher.js';
 import { Face3 } from './core/Face3.js';
 import { Object3D } from './core/Object3D.js';
 import { BoxGeometry } from './geometries/BoxGeometry.js';
+import { EdgesGeometry } from './geometries/EdgesGeometry.js';
 import { ExtrudeGeometry } from './geometries/ExtrudeGeometry.js';
 import { ShapeGeometry } from './geometries/ShapeGeometry.js';
+import { WireframeGeometry } from './geometries/WireframeGeometry.js';
 import { Light } from './lights/Light.js';
 import { AudioLoader } from './loaders/AudioLoader.js';
 import { CubeTextureLoader } from './loaders/CubeTextureLoader.js';
 import { TextureLoader } from './loaders/TextureLoader.js';
 import { Material } from './materials/Material.js';
+import { LineBasicMaterial } from './materials/LineBasicMaterial.js';
 import { MeshPhongMaterial } from './materials/MeshPhongMaterial.js';
 import { MultiMaterial } from './materials/MultiMaterial.js';
 import { PointsMaterial } from './materials/PointsMaterial.js';
@@ -33,6 +36,7 @@ import { Plane } from './math/Plane.js';
 import { Quaternion } from './math/Quaternion.js';
 import { Ray } from './math/Ray.js';
 import { Vector3 } from './math/Vector3.js';
+import { LineSegments } from './objects/LineSegments.js';
 import { LOD } from './objects/LOD.js';
 import { Points } from './objects/Points.js';
 import { Sprite } from './objects/Sprite.js';
@@ -88,6 +92,18 @@ export function Vertex ( x, y, z ) {
 
 //
 
+export function EdgesHelper( object, hex ) {
+	console.warn( 'THREE.EdgesHelper has been removed. Use THREE.EdgesGeometry instead.' );
+	return new LineSegments( new EdgesGeometry( object.geometry ), new LineBasicMaterial( { color: hex !== undefined ? hex : 0xffffff } ) );
+}
+
+export function WireframeHelper( object, hex ) {
+	console.warn( 'THREE.WireframeHelper has been removed. Use THREE.WireframeGeometry instead.' );
+	return new LineSegments( new WireframeGeometry( object.geometry ), new LineBasicMaterial( { color: hex !== undefined ? hex : 0xffffff } ) );
+}
+
+//
+
 Object.assign( Box2.prototype, {
 	center: function ( optionalTarget ) {
 		console.warn( 'THREE.Box2: .center() has been renamed to .getCenter().' );

+ 0 - 2
src/Three.js

@@ -132,7 +132,6 @@ export { Quaternion } from './math/Quaternion.js';
 export { ColorKeywords, Color } from './math/Color.js';
 export { MorphBlendMesh } from './extras/objects/MorphBlendMesh.js';
 export { ImmediateRenderObject } from './extras/objects/ImmediateRenderObject.js';
-export { WireframeHelper } from './extras/helpers/WireframeHelper.js';
 export { VertexNormalsHelper } from './extras/helpers/VertexNormalsHelper.js';
 export { SpotLightHelper } from './extras/helpers/SpotLightHelper.js';
 export { SkeletonHelper } from './extras/helpers/SkeletonHelper.js';
@@ -140,7 +139,6 @@ export { PointLightHelper } from './extras/helpers/PointLightHelper.js';
 export { HemisphereLightHelper } from './extras/helpers/HemisphereLightHelper.js';
 export { GridHelper } from './extras/helpers/GridHelper.js';
 export { FaceNormalsHelper } from './extras/helpers/FaceNormalsHelper.js';
-export { EdgesHelper } from './extras/helpers/EdgesHelper.js';
 export { DirectionalLightHelper } from './extras/helpers/DirectionalLightHelper.js';
 export { CameraHelper } from './extras/helpers/CameraHelper.js';
 export { BoundingBoxHelper } from './extras/helpers/BoundingBoxHelper.js';

+ 0 - 30
src/extras/helpers/EdgesHelper.js

@@ -1,30 +0,0 @@
-import { LineSegments } from '../../objects/LineSegments';
-import { LineBasicMaterial } from '../../materials/LineBasicMaterial';
-import { EdgesGeometry } from '../../geometries/EdgesGeometry';
-
-/**
- * @author WestLangley / http://github.com/WestLangley
- * @param object THREE.Mesh whose geometry will be used
- * @param hex line color
- * @param thresholdAngle the minimum angle (in degrees),
- * between the face normals of adjacent faces,
- * that is required to render an edge. A value of 10 means
- * an edge is only rendered if the angle is at least 10 degrees.
- */
-
-function EdgesHelper( object, hex, thresholdAngle ) {
-
-	var color = ( hex !== undefined ) ? hex : 0xffffff;
-
-	LineSegments.call( this, new EdgesGeometry( object.geometry, thresholdAngle ), new LineBasicMaterial( { color: color } ) );
-
-	this.matrix = object.matrixWorld;
-	this.matrixAutoUpdate = false;
-
-}
-
-EdgesHelper.prototype = Object.create( LineSegments.prototype );
-EdgesHelper.prototype.constructor = EdgesHelper;
-
-
-export { EdgesHelper };

+ 0 - 24
src/extras/helpers/WireframeHelper.js

@@ -1,24 +0,0 @@
-import { LineSegments } from '../../objects/LineSegments';
-import { LineBasicMaterial } from '../../materials/LineBasicMaterial';
-import { WireframeGeometry } from '../../geometries/WireframeGeometry';
-
-/**
- * @author mrdoob / http://mrdoob.com/
- */
-
-function WireframeHelper( object, hex ) {
-
-	var color = ( hex !== undefined ) ? hex : 0xffffff;
-
-	LineSegments.call( this, new WireframeGeometry( object.geometry ), new LineBasicMaterial( { color: color } ) );
-
-	this.matrix = object.matrixWorld;
-	this.matrixAutoUpdate = false;
-
-}
-
-WireframeHelper.prototype = Object.create( LineSegments.prototype );
-WireframeHelper.prototype.constructor = WireframeHelper;
-
-
-export { WireframeHelper };