diff --git a/docs/api/helpers/AxisHelper.html b/docs/api/helpers/AxesHelper.html similarity index 94% rename from docs/api/helpers/AxisHelper.html rename to docs/api/helpers/AxesHelper.html index bf8dc3f9dfcfe29c4327a0b83984f16dadaa1ef6..663f13580c6e13918b6ca4c54d5e15c383db1d9b 100644 --- a/docs/api/helpers/AxisHelper.html +++ b/docs/api/helpers/AxesHelper.html @@ -1,7 +1,7 @@ - + @@ -26,8 +26,8 @@ -var axisHelper = new THREE.AxisHelper( 5 ); -scene.add( axisHelper ); +var axesHelper = new THREE.AxesHelper( 5 ); +scene.add( axesHelper );

Constructor

diff --git a/docs/list.js b/docs/list.js index bb142a9725babf3f20f97694cab69d86cad16ec9..e8c3584460d7ec06e9fe21364e31d540823f245a 100644 --- a/docs/list.js +++ b/docs/list.js @@ -181,7 +181,7 @@ var list = { "Helpers": { "ArrowHelper": "api/helpers/ArrowHelper", - "AxisHelper": "api/helpers/AxisHelper", + "AxesHelper": "api/helpers/AxesHelper", "BoxHelper": "api/helpers/BoxHelper", "Box3Helper": "api/helpers/Box3Helper", "CameraHelper": "api/helpers/CameraHelper", diff --git a/examples/misc_animation_keys.html b/examples/misc_animation_keys.html index 9132de58395e4a9a8cab70bd833e132c8ba3daf3..f32b885abcbdafd8d06d8290a7f671e09731c3cb 100644 --- a/examples/misc_animation_keys.html +++ b/examples/misc_animation_keys.html @@ -64,8 +64,8 @@ // - var axisHelper = new THREE.AxisHelper( 10 ); - scene.add( axisHelper ); + var axesHelper = new THREE.AxesHelper( 10 ); + scene.add( axesHelper ); // diff --git a/examples/misc_exporter_gltf.html b/examples/misc_exporter_gltf.html index 4b65deeb2c68a3ee414e29a9f093edba14af6f4d..60a6306aa2a72b8245b92b4ac0f68d3dc1493e6c 100644 --- a/examples/misc_exporter_gltf.html +++ b/examples/misc_exporter_gltf.html @@ -162,11 +162,11 @@ scene1.add( gridHelper ); // --------------------------------------------------------------------- - // Axis + // Axes // --------------------------------------------------------------------- - var axis = new THREE.AxisHelper(500); - axis.name = "AxisHelper"; - scene1.add( axis ); + var axes = new THREE.AxesHelper( 500 ); + axes.name = "AxesHelper"; + scene1.add( axes ); // --------------------------------------------------------------------- // Simple geometry with basic material diff --git a/examples/webgl_clipping_intersection.html b/examples/webgl_clipping_intersection.html index 79132ec4d43d0c937c6a7b014f973ae8b94479c0..c32b4be1949620d4008ddb245fd6fdc845e51184 100644 --- a/examples/webgl_clipping_intersection.html +++ b/examples/webgl_clipping_intersection.html @@ -88,7 +88,7 @@ // helpers var helpers = new THREE.Group(); - helpers.add( new THREE.AxisHelper( 20 ) ); + helpers.add( new THREE.AxesHelper( 20 ) ); helpers.add( new THREE.PlaneHelper( clipPlanes[ 0 ], 30, 0xff0000 ) ); helpers.add( new THREE.PlaneHelper( clipPlanes[ 1 ], 30, 0x00ff00 ) ); helpers.add( new THREE.PlaneHelper( clipPlanes[ 2 ], 30, 0x0000ff ) ); diff --git a/examples/webgl_geometries.html b/examples/webgl_geometries.html index c4810522e6803c7f2e10c5bfc0937deedf1ca2c8..180d9832aac90c2a870e1cd54c23cebca3c81007 100644 --- a/examples/webgl_geometries.html +++ b/examples/webgl_geometries.html @@ -117,7 +117,7 @@ object.position.set( 0, 0, -200 ); scene.add( object ); - object = new THREE.AxisHelper( 50 ); + object = new THREE.AxesHelper( 50 ); object.position.set( 200, 0, -200 ); scene.add( object ); diff --git a/examples/webgl_geometries2.html b/examples/webgl_geometries2.html index a46fe12548cd4d122eb67283474cff4448fc85bb..5727afad5864547d35ee0874ce5bf737d23becc1 100644 --- a/examples/webgl_geometries2.html +++ b/examples/webgl_geometries2.html @@ -108,8 +108,8 @@ object.position.set( 100, 0, 0 ); scene.add( object ); - object = new THREE.AxisHelper( 50 ); - object.position.set( 200, 0, -200 ); + object = new THREE.AxesHelper( 50 ); + object.position.set( 200, 0, - 200 ); scene.add( object ); renderer = new THREE.WebGLRenderer( { antialias: true } ); diff --git a/examples/webgl_geometry_convex.html b/examples/webgl_geometry_convex.html index 04c1605810a4456e84b21952f42546bd0e648752..9aecb0f6a8299e5a563c3824b68a880f3d535eeb 100644 --- a/examples/webgl_geometry_convex.html +++ b/examples/webgl_geometry_convex.html @@ -75,7 +75,7 @@ // helper - scene.add( new THREE.AxisHelper( 20 ) ); + scene.add( new THREE.AxesHelper( 20 ) ); // textures diff --git a/examples/webgl_geometry_spline_editor.html b/examples/webgl_geometry_spline_editor.html index ef71f20f0430e172017fc4cd24ba9f12fe67a95c..dc6a03a3e4a34aceb4167568453aa45947f35ac4 100644 --- a/examples/webgl_geometry_spline_editor.html +++ b/examples/webgl_geometry_spline_editor.html @@ -117,9 +117,9 @@ helper.material.transparent = true; scene.add( helper ); - var axis = new THREE.AxisHelper(); - axis.position.set( -500, -500, -500 ); - scene.add( axis ); + //var axes = new THREE.AxesHelper( 1000 ); + //axes.position.set( - 500, - 500, - 500 ); + //scene.add( axes ); renderer = new THREE.WebGLRenderer( { antialias: true } ); renderer.setPixelRatio( window.devicePixelRatio ); diff --git a/examples/webgl_lights_spotlight.html b/examples/webgl_lights_spotlight.html index 874bf173e8cab30eeea5684858d7cc2445fe313e..9796cfc9ec5c1d7242de4eb5ee23a87f51d781b1 100644 --- a/examples/webgl_lights_spotlight.html +++ b/examples/webgl_lights_spotlight.html @@ -100,7 +100,7 @@ shadowCameraHelper = new THREE.CameraHelper( spotLight.shadow.camera ); scene.add( shadowCameraHelper ); - scene.add( new THREE.AxisHelper( 10 ) ); + scene.add( new THREE.AxesHelper( 10 ) ); var material = new THREE.MeshPhongMaterial( { color: 0x808080, dithering: true } ); diff --git a/examples/webgl_loader_nrrd.html b/examples/webgl_loader_nrrd.html index 15828e630a8b5d5fc4facdaabdbda6a2671ba40b..3c991e7600b0d1459e77750ad0b145cbd9c56521 100644 --- a/examples/webgl_loader_nrrd.html +++ b/examples/webgl_loader_nrrd.html @@ -263,7 +263,7 @@ camera2.up = camera.up; // important! // axes - axes2 = new THREE.AxisHelper( 100 ); + axes2 = new THREE.AxesHelper( 100 ); scene2.add( axes2 ); } diff --git a/src/Three.Legacy.js b/src/Three.Legacy.js index 3401b1837c75291f078cc80ab33d92fe3f14245e..b852a829db4fdbf165a0c72cea9560548c2131bb 100644 --- a/src/Three.Legacy.js +++ b/src/Three.Legacy.js @@ -25,6 +25,7 @@ import { Object3D } from './core/Object3D.js'; import { Uniform } from './core/Uniform.js'; import { Curve } from './extras/core/Curve.js'; import { CatmullRomCurve3 } from './extras/curves/CatmullRomCurve3.js'; +import { AxesHelper } from './helpers/AxesHelper.js'; import { BoxHelper } from './helpers/BoxHelper.js'; import { GridHelper } from './helpers/GridHelper.js'; import { SkeletonHelper } from './helpers/SkeletonHelper.js'; @@ -300,6 +301,13 @@ Object.assign( Spline.prototype, { } ); // +export function AxisHelper( size ) { + + console.warn( 'THREE.AxisHelper has been renamed to THREE.AxesHelper.' ); + return new AxesHelper( size ); + +} + export function BoundingBoxHelper( object, color ) { console.warn( 'THREE.BoundingBoxHelper has been deprecated. Creating a THREE.BoxHelper instead.' ); diff --git a/src/Three.js b/src/Three.js index 0323b92b00f5c788407475e67d53fb27b1df84c5..0d46c4a04e32b2b49b817f4ae4e224d2151b6217 100644 --- a/src/Three.js +++ b/src/Three.js @@ -136,7 +136,7 @@ export { BoxHelper } from './helpers/BoxHelper.js'; export { Box3Helper } from './helpers/Box3Helper.js'; export { PlaneHelper } from './helpers/PlaneHelper.js'; export { ArrowHelper } from './helpers/ArrowHelper.js'; -export { AxisHelper } from './helpers/AxisHelper.js'; +export { AxesHelper } from './helpers/AxesHelper.js'; export { CatmullRomCurve3 } from './extras/curves/CatmullRomCurve3.js'; export { CubicBezierCurve3 } from './extras/curves/CubicBezierCurve3.js'; export { QuadraticBezierCurve3 } from './extras/curves/QuadraticBezierCurve3.js'; diff --git a/src/helpers/AxisHelper.js b/src/helpers/AxesHelper.js similarity index 84% rename from src/helpers/AxisHelper.js rename to src/helpers/AxesHelper.js index 23a8be3ba42bd7c5f95d109bb41f04dcdc201076..34a7f42ff5cfd9a85cdc0cc36ecfa2a7c4516d8c 100644 --- a/src/helpers/AxisHelper.js +++ b/src/helpers/AxesHelper.js @@ -9,7 +9,7 @@ import { LineBasicMaterial } from '../materials/LineBasicMaterial.js'; import { Float32BufferAttribute } from '../core/BufferAttribute.js'; import { BufferGeometry } from '../core/BufferGeometry.js'; -function AxisHelper( size ) { +function AxesHelper( size ) { size = size || 1; @@ -35,8 +35,8 @@ function AxisHelper( size ) { } -AxisHelper.prototype = Object.create( LineSegments.prototype ); -AxisHelper.prototype.constructor = AxisHelper; +AxesHelper.prototype = Object.create( LineSegments.prototype ); +AxesHelper.prototype.constructor = AxesHelper; -export { AxisHelper }; +export { AxesHelper };