Renamed THREE.SegmentsLine to THREE.LineSegments. See 9b63a1d

mrdoob · mrdoob · commit 191bb16cd4db · 2015-05-02T00:10:36.000+01:00
diff --git a/docs/api/objects/LineSegments.html b/docs/api/objects/LineSegments.html
diff --git a/docs/list.js b/docs/list.js
@@ -110,7 +110,7 @@ var list = {
 			[ "Bone", "api/objects/Bone" ],
 			[ "LensFlare", "api/objects/LensFlare" ],
 			[ "Line", "api/objects/Line" ],
-			[ "SegmentsLine", "api/objects/SegmentsLine" ],
+			[ "LineSegments", "api/objects/LineSegments" ],
 			[ "LOD", "api/objects/LOD" ],
 			[ "Mesh", "api/objects/Mesh" ],
 			[ "MorphAnimMesh", "api/objects/MorphAnimMesh" ],
diff --git a/examples/canvas_camera_orthographic.html b/examples/canvas_camera_orthographic.html
@@ -68,7 +68,7 @@
 
 				var material = new THREE.LineBasicMaterial( { color: 0x000000, opacity: 0.2 } );
 
-				var line = new THREE.SegmentsLine( geometry, material );
+				var line = new THREE.LineSegments( geometry, material );
 				scene.add( line );
 
 				// Cubes
diff --git a/examples/canvas_camera_orthographic2.html b/examples/canvas_camera_orthographic2.html
@@ -137,7 +137,7 @@
 
 				var material = new THREE.LineBasicMaterial( { color: 0x000000, opacity: 0.2 } );
 
-				var line = new THREE.SegmentsLine( geometry, material );
+				var line = new THREE.LineSegments( geometry, material );
 				scene.add( line );
 
 				// Cubes
diff --git a/examples/canvas_interactive_voxelpainter.html b/examples/canvas_interactive_voxelpainter.html
@@ -73,7 +73,7 @@
 
 				var material = new THREE.LineBasicMaterial( { color: 0x000000, opacity: 0.2 } );
 
-				var line = new THREE.SegmentsLine( geometry, material );
+				var line = new THREE.LineSegments( geometry, material );
 				scene.add( line );
 
 				//
diff --git a/examples/canvas_lines_dashed.html b/examples/canvas_lines_dashed.html
@@ -93,7 +93,7 @@
 				objects.push( object );
 				scene.add( object );
 
-				var object = new THREE.SegmentsLine( geometryCube, new THREE.LineDashedMaterial( { color: 0xffaa00, dashSize: 3, gapSize: 1, linewidth: 2 } ) );
+				var object = new THREE.LineSegments( geometryCube, new THREE.LineDashedMaterial( { color: 0xffaa00, dashSize: 3, gapSize: 1, linewidth: 2 } ) );
 
 				objects.push( object );
 				scene.add( object );
diff --git a/examples/canvas_materials.html b/examples/canvas_materials.html
@@ -60,7 +60,7 @@
 
 				var material = new THREE.LineBasicMaterial( { color: 0xffffff, opacity: 0.2 } );
 
-				var line = new THREE.SegmentsLine( geometry, material );
+				var line = new THREE.LineSegments( geometry, material );
 				scene.add( line );
 
 				// Spheres
diff --git a/examples/canvas_performance.html b/examples/canvas_performance.html
@@ -63,7 +63,7 @@
 
 				var material = new THREE.LineBasicMaterial( { color: 0x000000, opacity: 0.5 } );
 
-				var line = new THREE.SegmentsLine( geometry, material );
+				var line = new THREE.LineSegments( geometry, material );
 				scene.add( line );
 
 				// Spheres
diff --git a/examples/canvas_sandbox.html b/examples/canvas_sandbox.html
@@ -85,7 +85,7 @@
 
 				var material = new THREE.LineBasicMaterial( { color: 0x000000, opacity: 0.5 } );
 
-				var line = new THREE.SegmentsLine( geometry, material );
+				var line = new THREE.LineSegments( geometry, material );
 				scene.add( line );
 
 				// Spheres
diff --git a/examples/js/renderers/Projector.js b/examples/js/renderers/Projector.js
@@ -616,7 +616,7 @@ THREE.Projector = function () {
 
 						} else {
 
-							var step = object instanceof THREE.SegmentsLine ? 2 : 1;
+							var step = object instanceof THREE.LineSegments ? 2 : 1;
 
 							for ( var i = 0, l = ( positions.length / 3 ) - 1; i < l; i += step ) {
 
@@ -639,7 +639,7 @@ THREE.Projector = function () {
 					v1 = getNextVertexInPool();
 					v1.positionScreen.copy( vertices[ 0 ] ).applyMatrix4( _modelViewProjectionMatrix );
 
-					var step = object instanceof THREE.SegmentsLine ? 2 : 1;
+					var step = object instanceof THREE.LineSegments ? 2 : 1;
 
 					for ( var v = 1, vl = vertices.length; v < vl; v ++ ) {
 
diff --git a/examples/webgl_buffergeometry_drawcalls.html b/examples/webgl_buffergeometry_drawcalls.html
@@ -177,7 +177,7 @@
 					transparent: true
 				} );
 
-				linesMesh = new THREE.SegmentsLine( geometry, material );
+				linesMesh = new THREE.LineSegments( geometry, material );
 				group.add( linesMesh );
 
 				//
diff --git a/examples/webgl_buffergeometry_lines_indexed.html b/examples/webgl_buffergeometry_lines_indexed.html
@@ -187,7 +187,7 @@
 				geometry.addAttribute( 'color', new THREE.BufferAttribute( new Float32Array( colors ), 3 ) );
 				geometry.computeBoundingSphere();
 
-				mesh = new THREE.SegmentsLine( geometry, material );
+				mesh = new THREE.LineSegments( geometry, material );
 				mesh.position.x -= 1200;
 				mesh.position.y -= 1200;
 
diff --git a/examples/webgl_camera.html b/examples/webgl_camera.html
@@ -102,20 +102,20 @@
 
 				//
 
-				mesh = new THREE.SegmentsLine(
+				mesh = new THREE.LineSegments(
 					new THREE.WireframeGeometry( new THREE.SphereBufferGeometry( 100, 16, 8 ) ),
 					new THREE.LineBasicMaterial( { color: 0xffffff } )
 				);
 				scene.add( mesh );
 
-				var mesh2 = new THREE.SegmentsLine(
+				var mesh2 = new THREE.LineSegments(
 					new THREE.WireframeGeometry( new THREE.SphereBufferGeometry( 50, 16, 8 ) ),
 					new THREE.LineBasicMaterial( { color: 0x00ff00 } )
 				);
 				mesh2.position.y = 150;
 				mesh.add( mesh2 );
 
-				var mesh3 = new THREE.SegmentsLine(
+				var mesh3 = new THREE.LineSegments(
 					new THREE.WireframeGeometry( new THREE.SphereBufferGeometry( 5, 16, 8 ) ),
 					new THREE.LineBasicMaterial( { color: 0x0000ff } )
 				);
diff --git a/examples/webgl_helpers.html b/examples/webgl_helpers.html
@@ -66,15 +66,15 @@
 					group.add( new THREE.BoxHelper( mesh ) );
 
 					var wireframe = new THREE.WireframeGeometry( geometry );
-					var line = new THREE.SegmentsLine( wireframe );
+					var line = new THREE.LineSegments( wireframe );
 					line.material.depthTest = false;
 					line.material.opacity = 0.25;
 					line.material.transparent = true;
 					line.position.x = 4;
 					group.add( line );
 
 					var edges = new THREE.EdgesGeometry( geometry );
-					var line = new THREE.SegmentsLine( edges );
+					var line = new THREE.LineSegments( edges );
 					line.material.depthTest = false;
 					line.material.opacity = 0.25;
 					line.material.transparent = true;
diff --git a/examples/webgl_interactive_lines.html b/examples/webgl_interactive_lines.html
@@ -97,7 +97,7 @@
 
 					} else {
 
-						object = new THREE.SegmentsLine( geometry );
+						object = new THREE.LineSegments( geometry );
 
 					}
 
diff --git a/examples/webgl_interactive_voxelpainter.html b/examples/webgl_interactive_voxelpainter.html
@@ -87,7 +87,7 @@
 
 				var material = new THREE.LineBasicMaterial( { color: 0x000000, opacity: 0.2, transparent: true } );
 
-				var line = new THREE.SegmentsLine( geometry, material );
+				var line = new THREE.LineSegments( geometry, material );
 				scene.add( line );
 
 				//
diff --git a/examples/webgl_lines_dashed.html b/examples/webgl_lines_dashed.html
@@ -90,7 +90,7 @@
 				objects.push( object );
 				scene.add( object );
 
-				var object = new THREE.SegmentsLine( geometryCube, new THREE.LineDashedMaterial( { color: 0xffaa00, dashSize: 3, gapSize: 1, linewidth: 2 } ) );
+				var object = new THREE.LineSegments( geometryCube, new THREE.LineDashedMaterial( { color: 0xffaa00, dashSize: 3, gapSize: 1, linewidth: 2 } ) );
 
 				objects.push( object );
 				scene.add( object );
diff --git a/examples/webgl_lines_sphere.html b/examples/webgl_lines_sphere.html
@@ -91,7 +91,7 @@
 
 					material = new THREE.LineBasicMaterial( { color: p[ 1 ], opacity: p[ 2 ], linewidth: p[ 3 ] } );
 
-					line = new THREE.SegmentsLine( geometry, material );
+					line = new THREE.LineSegments( geometry, material );
 					line.scale.x = line.scale.y = line.scale.z = p[ 0 ];
 					line.originalScale = p[ 0 ];
 					line.rotation.y = Math.random() * Math.PI;
diff --git a/examples/webgl_loader_collada.html b/examples/webgl_loader_collada.html
@@ -101,7 +101,7 @@
 
 				}
 
-				var line = new THREE.SegmentsLine( geometry, material );
+				var line = new THREE.LineSegments( geometry, material );
 				scene.add( line );
 
 				// Add the COLLADA
diff --git a/examples/webgl_loader_collada_keyframe.html b/examples/webgl_loader_collada_keyframe.html
@@ -113,7 +113,7 @@
 
 				}
 
-				var line = new THREE.SegmentsLine( geometry, material );
+				var line = new THREE.LineSegments( geometry, material );
 				scene.add( line );
 
 				// Add the COLLADA
diff --git a/examples/webgl_loader_collada_kinematics.html b/examples/webgl_loader_collada_kinematics.html
@@ -108,7 +108,7 @@
 
 				}
 
-				var line = new THREE.SegmentsLine( geometry, material );
+				var line = new THREE.LineSegments( geometry, material );
 				scene.add( line );
 
 				// Add the COLLADA
diff --git a/examples/webgl_materials.html b/examples/webgl_materials.html
@@ -60,7 +60,7 @@
 
 				}
 
-				var line = new THREE.SegmentsLine( geometry, line_material );
+				var line = new THREE.LineSegments( geometry, line_material );
 				scene.add( line );
 
 				// Materials
diff --git a/src/extras/helpers/AxisHelper.js b/src/extras/helpers/AxisHelper.js
@@ -25,9 +25,9 @@ THREE.AxisHelper = function ( size ) {
 
 	var material = new THREE.LineBasicMaterial( { vertexColors: THREE.VertexColors } );
 
-	THREE.SegmentsLine.call( this, geometry, material );
+	THREE.LineSegments.call( this, geometry, material );
 
 };
 
-THREE.AxisHelper.prototype = Object.create( THREE.SegmentsLine.prototype );
+THREE.AxisHelper.prototype = Object.create( THREE.LineSegments.prototype );
 THREE.AxisHelper.prototype.constructor = THREE.AxisHelper;
diff --git a/src/extras/helpers/BoxHelper.js b/src/extras/helpers/BoxHelper.js
@@ -7,7 +7,7 @@ THREE.BoxHelper = function ( object ) {
 	var geometry = new THREE.BufferGeometry();
 	geometry.addAttribute( 'position', new THREE.BufferAttribute( new Float32Array( 72 ), 3 ) );
 
-	THREE.SegmentsLine.call( this, geometry, new THREE.LineBasicMaterial( { color: 0xffff00 } ) );
+	THREE.LineSegments.call( this, geometry, new THREE.LineBasicMaterial( { color: 0xffff00 } ) );
 
 	if ( object !== undefined ) {
 
@@ -17,7 +17,7 @@ THREE.BoxHelper = function ( object ) {
 
 };
 
-THREE.BoxHelper.prototype = Object.create( THREE.SegmentsLine.prototype );
+THREE.BoxHelper.prototype = Object.create( THREE.LineSegments.prototype );
 THREE.BoxHelper.prototype.constructor = THREE.BoxHelper;
 
 THREE.BoxHelper.prototype.update = function ( object ) {
diff --git a/src/extras/helpers/CameraHelper.js b/src/extras/helpers/CameraHelper.js
@@ -91,7 +91,7 @@ THREE.CameraHelper = function ( camera ) {
 
 	}
 
-	THREE.SegmentsLine.call( this, geometry, material );
+	THREE.LineSegments.call( this, geometry, material );
 
 	this.camera = camera;
 	this.matrix = camera.matrixWorld;
@@ -103,7 +103,7 @@ THREE.CameraHelper = function ( camera ) {
 
 };
 
-THREE.CameraHelper.prototype = Object.create( THREE.SegmentsLine.prototype );
+THREE.CameraHelper.prototype = Object.create( THREE.LineSegments.prototype );
 THREE.CameraHelper.prototype.constructor = THREE.CameraHelper;
 
 THREE.CameraHelper.prototype.update = function () {
diff --git a/src/extras/helpers/EdgesHelper.js b/src/extras/helpers/EdgesHelper.js
@@ -12,12 +12,12 @@ THREE.EdgesHelper = function ( object, hex, thresholdAngle ) {
 
 	var color = ( hex !== undefined ) ? hex : 0xffffff;
 
-	THREE.SegmentsLine.call( this, new THREE.EdgesGeometry( object.geometry, thresholdAngle ), new THREE.LineBasicMaterial( { color: color } ) );
+	THREE.LineSegments.call( this, new THREE.EdgesGeometry( object.geometry, thresholdAngle ), new THREE.LineBasicMaterial( { color: color } ) );
 
 	this.matrix = object.matrixWorld;
 	this.matrixAutoUpdate = false;
 
 };
 
-THREE.EdgesHelper.prototype = Object.create( THREE.SegmentsLine.prototype );
+THREE.EdgesHelper.prototype = Object.create( THREE.LineSegments.prototype );
 THREE.EdgesHelper.prototype.constructor = THREE.EdgesHelper;
diff --git a/src/extras/helpers/FaceNormalsHelper.js b/src/extras/helpers/FaceNormalsHelper.js
@@ -23,7 +23,7 @@ THREE.FaceNormalsHelper = function ( object, size, hex, linewidth ) {
 
 	}
 
-	THREE.SegmentsLine.call( this, geometry, new THREE.LineBasicMaterial( { color: color, linewidth: width } ) );
+	THREE.LineSegments.call( this, geometry, new THREE.LineBasicMaterial( { color: color, linewidth: width } ) );
 
 	this.matrixAutoUpdate = false;
 
@@ -33,7 +33,7 @@ THREE.FaceNormalsHelper = function ( object, size, hex, linewidth ) {
 
 };
 
-THREE.FaceNormalsHelper.prototype = Object.create( THREE.SegmentsLine.prototype );
+THREE.FaceNormalsHelper.prototype = Object.create( THREE.LineSegments.prototype );
 THREE.FaceNormalsHelper.prototype.constructor = THREE.FaceNormalsHelper;
 
 THREE.FaceNormalsHelper.prototype.update = function () {
diff --git a/src/extras/helpers/GridHelper.js b/src/extras/helpers/GridHelper.js
@@ -23,11 +23,11 @@ THREE.GridHelper = function ( size, step ) {
 
 	}
 
-	THREE.SegmentsLine.call( this, geometry, material );
+	THREE.LineSegments.call( this, geometry, material );
 
 };
 
-THREE.GridHelper.prototype = Object.create( THREE.SegmentsLine.prototype );
+THREE.GridHelper.prototype = Object.create( THREE.LineSegments.prototype );
 THREE.GridHelper.prototype.constructor = THREE.GridHelper;
 
 THREE.GridHelper.prototype.setColors = function( colorCenterLine, colorGrid ) {
diff --git a/src/extras/helpers/SkeletonHelper.js b/src/extras/helpers/SkeletonHelper.js
@@ -28,7 +28,7 @@ THREE.SkeletonHelper = function ( object ) {
 
 	var material = new THREE.LineBasicMaterial( { vertexColors: THREE.VertexColors, depthTest: false, depthWrite: false, transparent: true } );
 
-	THREE.SegmentsLine.call( this, geometry, material );
+	THREE.LineSegments.call( this, geometry, material );
 
 	this.root = object;
 
@@ -40,7 +40,7 @@ THREE.SkeletonHelper = function ( object ) {
 };
 
 
-THREE.SkeletonHelper.prototype = Object.create( THREE.SegmentsLine.prototype );
+THREE.SkeletonHelper.prototype = Object.create( THREE.LineSegments.prototype );
 THREE.SkeletonHelper.prototype.constructor = THREE.SkeletonHelper;
 
 THREE.SkeletonHelper.prototype.getBoneList = function( object ) {
diff --git a/src/extras/helpers/VertexNormalsHelper.js b/src/extras/helpers/VertexNormalsHelper.js
@@ -29,7 +29,7 @@ THREE.VertexNormalsHelper = function ( object, size, hex, linewidth ) {
 
 	}
 
-	THREE.SegmentsLine.call( this, geometry, new THREE.LineBasicMaterial( { color: color, linewidth: width } ) );
+	THREE.LineSegments.call( this, geometry, new THREE.LineBasicMaterial( { color: color, linewidth: width } ) );
 
 	this.matrixAutoUpdate = false;
 
@@ -39,7 +39,7 @@ THREE.VertexNormalsHelper = function ( object, size, hex, linewidth ) {
 
 };
 
-THREE.VertexNormalsHelper.prototype = Object.create( THREE.SegmentsLine.prototype );
+THREE.VertexNormalsHelper.prototype = Object.create( THREE.LineSegments.prototype );
 THREE.VertexNormalsHelper.prototype.constructor = THREE.VertexNormalsHelper;
 
 THREE.VertexNormalsHelper.prototype.update = ( function ( object ) {
diff --git a/src/extras/helpers/VertexTangentsHelper.js b/src/extras/helpers/VertexTangentsHelper.js
@@ -30,15 +30,15 @@ THREE.VertexTangentsHelper = function ( object, size, hex, linewidth ) {
 
 	}
 
-	THREE.SegmentsLine.call( this, geometry, new THREE.LineBasicMaterial( { color: color, linewidth: width } ) );
+	THREE.LineSegments.call( this, geometry, new THREE.LineBasicMaterial( { color: color, linewidth: width } ) );
 
 	this.matrixAutoUpdate = false;
 
 	this.update();
 
 };
 
-THREE.VertexTangentsHelper.prototype = Object.create( THREE.SegmentsLine.prototype );
+THREE.VertexTangentsHelper.prototype = Object.create( THREE.LineSegments.prototype );
 THREE.VertexTangentsHelper.prototype.constructor = THREE.VertexTangentsHelper;
 
 THREE.VertexTangentsHelper.prototype.update = ( function ( object ) {
diff --git a/src/extras/helpers/WireframeHelper.js b/src/extras/helpers/WireframeHelper.js
@@ -6,12 +6,12 @@ THREE.WireframeHelper = function ( object, hex ) {
 
 	var color = ( hex !== undefined ) ? hex : 0xffffff;
 
-	THREE.SegmentsLine.call( this, new THREE.WireframeGeometry( object.geometry ), new THREE.LineBasicMaterial( { color: color } ) );
+	THREE.LineSegments.call( this, new THREE.WireframeGeometry( object.geometry ), new THREE.LineBasicMaterial( { color: color } ) );
 
 	this.matrix = object.matrixWorld;
 	this.matrixAutoUpdate = false;
 
 };
 
-THREE.WireframeHelper.prototype = Object.create( THREE.SegmentsLine.prototype );
+THREE.WireframeHelper.prototype = Object.create( THREE.LineSegments.prototype );
 THREE.WireframeHelper.prototype.constructor = THREE.WireframeHelper;
diff --git a/src/objects/Line.js b/src/objects/Line.js
diff --git a/src/objects/LineSegments.js b/src/objects/LineSegments.js
diff --git a/src/objects/SegmentsLine.js b/src/objects/SegmentsLine.js
diff --git a/src/renderers/WebGLRenderer.js b/src/renderers/WebGLRenderer.js
diff --git a/test/unit/geometry/EdgesGeometry.js b/test/unit/geometry/EdgesGeometry.js
diff --git a/utils/build/includes/common.json b/utils/build/includes/common.json
