Geometry2: Renamed positions to vertices.

src/core/Geometry2.js

@@ -9,7 +9,7 @@ THREE.Geometry2 = function ( size ) {
 
 	this.name = '';
 
-	this.positions = size !== undefined ? new Float32Array( size * 3 ) : [];
+	this.vertices = size !== undefined ? new Float32Array( size * 3 ) : [];
 	this.normals = size !== undefined ? new Float32Array( size * 3 ) : [];
 	this.uvs = size !== undefined ? new Float32Array( size * 2 ) : [];
 
@@ -24,7 +24,7 @@ THREE.Geometry2.prototype = {
 
 	applyMatrix: function ( matrix ) {
 
-		matrix.multiplyVector3Array( this.positions );
+		matrix.multiplyVector3Array( this.vertices );
 
 	},
 
@@ -43,12 +43,12 @@ THREE.Geometry2.prototype = {
 
 			box.makeEmpty();
 
-			var positions = this.positions;
+			var vertices = this.vertices;
 			var center = this.boundingSphere.center;
 
-			for ( var i = 0, il = positions.length; i < il; i += 3 ) {
+			for ( var i = 0, il = vertices.length; i < il; i += 3 ) {
 
-				vector.set( positions[ i ], positions[ i + 1 ], positions[ i + 2 ] );
+				vector.set( vertices[ i ], vertices[ i + 1 ], vertices[ i + 2 ] );
 				box.addPoint( vector );
 
 			}
@@ -57,9 +57,9 @@ THREE.Geometry2.prototype = {
 
 			var maxRadiusSq = 0;
 
-			for ( var i = 0, il = positions.length; i < il; i += 3 ) {
+			for ( var i = 0, il = vertices.length; i < il; i += 3 ) {
 
-				vector.set( positions[ i ], positions[ i + 1 ], positions[ i + 2 ] );
+				vector.set( vertices[ i ], vertices[ i + 1 ], vertices[ i + 2 ] );
 				maxRadiusSq = Math.max( maxRadiusSq, center.distanceToSquared( vector ) );
 
 			}

src/core/Projector.js

@@ -184,7 +184,7 @@ THREE.Projector = function () {
 
 		};
 
-		var handleVertex = function ( x, y, z ) {
+		var pushVertex = function ( x, y, z ) {
 
 			_vertex = getNextVertexInPool();
 			_vertex.position.set( x, y, z );
@@ -213,7 +213,7 @@ THREE.Projector = function () {
 
 		};
 
-		var handleLine = function ( a, b ) {
+		var pushLine = function ( a, b ) {
 
 			var v1 = _vertexPool[ a ];
 			var v2 = _vertexPool[ b ];
@@ -231,7 +231,7 @@ THREE.Projector = function () {
 
 		};
 
-		var handleTriangle = function ( a, b, c ) {
+		var pushTriangle = function ( a, b, c ) {
 
 			var v1 = _vertexPool[ a ];
 			var v2 = _vertexPool[ b ];
@@ -259,9 +259,9 @@ THREE.Projector = function () {
 			setObject: setObject,
 			projectVertex: projectVertex,
 			checkTriangleVisibility: checkTriangleVisibility,
-			handleVertex: handleVertex,
-			handleLine: handleLine,
-			handleTriangle: handleTriangle
+			pushVertex: pushVertex,
+			pushLine: pushLine,
+			pushTriangle: pushTriangle
 		}
 
 	};
@@ -314,7 +314,7 @@ THREE.Projector = function () {
 
 						for ( var i = 0, l = positions.length; i < l; i += 3 ) {
 
-							renderList.handleVertex( positions[ i ], positions[ i + 1 ], positions[ i + 2 ] );
+							renderList.pushVertex( positions[ i ], positions[ i + 1 ], positions[ i + 2 ] );
 
 						}
 
@@ -324,7 +324,7 @@ THREE.Projector = function () {
 
 							for ( var i = 0, l = indices.length; i < l; i += 3 ) {
 
-								renderList.handleTriangle( indices[ i ], indices[ i + 1 ], indices[ i + 2 ] );
+								renderList.pushTriangle( indices[ i ], indices[ i + 1 ], indices[ i + 2 ] );
 
 							}
 
@@ -332,7 +332,7 @@ THREE.Projector = function () {
 
 							for ( var i = 0, l = positions.length / 3; i < l; i += 3 ) {
 
-								renderList.handleTriangle( i, i + 1, i + 2 );
+								renderList.pushTriangle( i, i + 1, i + 2 );
 
 							}
 
@@ -342,17 +342,17 @@ THREE.Projector = function () {
 
 				} else if ( geometry instanceof THREE.Geometry2 ) {
 
-					var positions = geometry.positions;
+					vertices = geometry.vertices;
 
-					for ( var i = 0, l = positions.length; i < l; i += 3 ) {
+					for ( var i = 0, l = vertices.length; i < l; i += 3 ) {
 
-						renderList.handleVertex( positions[ i ], positions[ i + 1 ], positions[ i + 2 ] );
+						renderList.pushVertex( vertices[ i ], vertices[ i + 1 ], vertices[ i + 2 ] );
 
 					}
 
-					for ( var i = 0, l = positions.length / 3; i < l; i += 3 ) {
+					for ( var i = 0, l = vertices.length / 3; i < l; i += 3 ) {
 
-						renderList.handleTriangle( i, i + 1, i + 2 );
+						renderList.pushTriangle( i, i + 1, i + 2 );
 
 					}
 
@@ -370,7 +370,7 @@ THREE.Projector = function () {
 					for ( var v = 0, vl = vertices.length; v < vl; v ++ ) {
 
 						var vertex = vertices[ v ];
-						renderList.handleVertex( vertex.x, vertex.y, vertex.z );
+						renderList.pushVertex( vertex.x, vertex.y, vertex.z );
 
 					}
 
@@ -521,7 +521,7 @@ THREE.Projector = function () {
 
 						for ( var i = 0, l = positions.length; i < l; i += 3 ) {
 
-							renderList.handleVertex( positions[ i ], positions[ i + 1 ], positions[ i + 2 ] );
+							renderList.pushVertex( positions[ i ], positions[ i + 1 ], positions[ i + 2 ] );
 
 						}
 
@@ -531,7 +531,7 @@ THREE.Projector = function () {
 
 							for ( var i = 0, l = indices.length; i < l; i += 2 ) {
 
-								renderList.handleLine( indices[ i ], indices[ i + 1 ] );
+								renderList.pushLine( indices[ i ], indices[ i + 1 ] );
 
 							}
 
@@ -539,7 +539,7 @@ THREE.Projector = function () {
 
 							for ( var i = 0, l = ( positions.length / 3 ) - 1; i < l; i ++ ) {
 
-								renderList.handleLine( i, i + 1 );
+								renderList.pushLine( i, i + 1 );
 
 							}
 

src/extras/geometries/BoxGeometry2.js

@@ -23,28 +23,14 @@ THREE.BoxGeometry2 = function ( width, height, depth, widthSegments, heightSegme
 
 	var vector = new THREE.Vector3();
 
-	var vertices = [];
-	var positions = [];
+	var vectors = [];
+	var vertices = this.vertices;
 
-	var addPosition = function ( a, b, c ) {
+	var addVertex = function ( a, b, c ) {
 
-		positions.push(
-			vertices[ a ],
-			vertices[ a + 1 ],
-			vertices[ a + 2 ]
-		);
-
-		positions.push(
-			vertices[ b ],
-			vertices[ b + 1 ],
-			vertices[ b + 2 ]
-		);
-
-		positions.push(
-			vertices[ c ],
-			vertices[ c + 1 ],
-			vertices[ c + 2 ]
-		);
+		vertices.push( vectors[ a ], vectors[ a + 1 ], vectors[ a + 2 ] );
+		vertices.push( vectors[ b ], vectors[ b + 1 ], vectors[ b + 2 ] );
+		vertices.push( vectors[ c ], vectors[ c + 1 ], vectors[ c + 2 ] );
 
 	};
 
@@ -62,7 +48,7 @@ THREE.BoxGeometry2 = function ( width, height, depth, widthSegments, heightSegme
 		gridY = scope.heightSegments,
 		width_half = width / 2,
 		height_half = height / 2,
-		offset = vertices.length;
+		offset = vectors.length;
 
 		if ( ( u === 'x' && v === 'y' ) || ( u === 'y' && v === 'x' ) ) {
 
@@ -96,7 +82,7 @@ THREE.BoxGeometry2 = function ( width, height, depth, widthSegments, heightSegme
 				vector[ v ] = ( iy * segment_height - height_half ) * vdir;
 				vector[ w ] = depth;
 
-				vertices.push( vector.x, vector.y, vector.z );
+				vectors.push( vector.x, vector.y, vector.z );
 
 			}
 
@@ -111,8 +97,8 @@ THREE.BoxGeometry2 = function ( width, height, depth, widthSegments, heightSegme
 				var c = ( ix + 1 ) + gridX1 * ( iy + 1 );
 				var d = ( ix + 1 ) + gridX1 * iy;
 
-				addPosition( a * 3 + offset, b * 3 + offset, d * 3 + offset );
-				addPosition( b * 3 + offset, c * 3 + offset, d * 3 + offset );
+				addVertex( a * 3 + offset, b * 3 + offset, d * 3 + offset );
+				addVertex( b * 3 + offset, c * 3 + offset, d * 3 + offset );
 
 			}
 
@@ -120,7 +106,7 @@ THREE.BoxGeometry2 = function ( width, height, depth, widthSegments, heightSegme
 
 	}
 
-	this.positions = new Float32Array( positions );
+	this.vertices = new Float32Array( vertices );
 
 };
 

src/extras/geometries/PlaneGeometry2.js

@@ -7,7 +7,7 @@ THREE.PlaneGeometry2 = function ( width, height, widthSegments, heightSegments )
 
 	THREE.Geometry2.call( this, ( widthSegments * heightSegments ) * 2 * 3 );
 
-	var positions = this.positions;
+	var vertices = this.vertices;
 	var normals = this.normals;
 	var uvs = this.uvs;
 
@@ -40,33 +40,33 @@ THREE.PlaneGeometry2 = function ( width, height, widthSegments, heightSegments )
 			var x1 = ix * segmentWidth - widthHalf;
 			var x2 = ( ix + 1 ) * segmentWidth - widthHalf;
 
-			positions[ offset ++ ] = x1;
-			positions[ offset ++ ] = y1;
+			vertices[ offset ++ ] = x1;
+			vertices[ offset ++ ] = y1;
 
 			offset ++;
 
-			positions[ offset ++ ] = x2;
-			positions[ offset ++ ] = y1;
+			vertices[ offset ++ ] = x2;
+			vertices[ offset ++ ] = y1;
 
 			offset ++;
 
-			positions[ offset ++ ] = x1;
-			positions[ offset ++ ] = y2;
+			vertices[ offset ++ ] = x1;
+			vertices[ offset ++ ] = y2;
 
 			offset ++;
 
-			positions[ offset ++ ] = x2;
-			positions[ offset ++ ] = y1;
+			vertices[ offset ++ ] = x2;
+			vertices[ offset ++ ] = y1;
 
 			offset ++;
 
-			positions[ offset ++ ] = x2;
-			positions[ offset ++ ] = y2;
+			vertices[ offset ++ ] = x2;
+			vertices[ offset ++ ] = y2;
 
 			offset ++;
 
-			positions[ offset ++ ] = x1;
-			positions[ offset ++ ] = y2;
+			vertices[ offset ++ ] = x1;
+			vertices[ offset ++ ] = y2;
 
 			offset ++;