Rename Triangle3.js to Triangle.js per @mrdoob's suggestion here: https://github.com/mrdoob/three.js/issues/2750#issuecomment-11063983

src/core/Raycaster.js

@@ -130,7 +130,7 @@
 					b = vertices[ face.b ];
 					c = vertices[ face.c ];
 
-					if ( ! THREE.Triangle3.containsPoint( intersectPoint, a, b, c ) ) continue;
+					if ( ! THREE.Triangle.containsPoint( intersectPoint, a, b, c ) ) continue;
 
 				} else if ( face instanceof THREE.Face4 ) {
 
@@ -139,8 +139,8 @@
 					c = vertices[ face.c ];
 					d = vertices[ face.d ];
 
-					if ( ( ! THREE.Triangle3.containsPoint( intersectPoint, a, b, d ) ) &&
-						 ( ! THREE.Triangle3.containsPoint( intersectPoint, b, c, d ) ) ) continue;
+					if ( ( ! THREE.Triangle.containsPoint( intersectPoint, a, b, d ) ) &&
+						 ( ! THREE.Triangle.containsPoint( intersectPoint, b, c, d ) ) ) continue;
 
 				} else {
 

src/math/Triangle3.js → src/math/Triangle.js

@@ -3,7 +3,7 @@
  * @author mrdoob / http://mrdoob.com/
  */
 
-THREE.Triangle3 = function ( a, b, c ) {
+THREE.Triangle = function ( a, b, c ) {
 
 	this.a = new THREE.Vector3();
 	this.b = new THREE.Vector3();
@@ -20,17 +20,17 @@ THREE.Triangle3 = function ( a, b, c ) {
 };
 
 // static/instance method to calculate barycoordinates
-THREE.Triangle3.barycoordFromPoint = function ( point, a, b, c, optionalTarget ) {
+THREE.Triangle.barycoordFromPoint = function ( point, a, b, c, optionalTarget ) {
 
-	THREE.Triangle3.__v0.sub( c, a );
-	THREE.Triangle3.__v1.sub( b, a );
-	THREE.Triangle3.__v2.sub( point, a );
+	THREE.Triangle.__v0.sub( c, a );
+	THREE.Triangle.__v1.sub( b, a );
+	THREE.Triangle.__v2.sub( point, a );
 
-	var dot00 = THREE.Triangle3.__v0.dot( THREE.Triangle3.__v0 );
-	var dot01 = THREE.Triangle3.__v0.dot( THREE.Triangle3.__v1 );
-	var dot02 = THREE.Triangle3.__v0.dot( THREE.Triangle3.__v2 );
-	var dot11 = THREE.Triangle3.__v1.dot( THREE.Triangle3.__v1 );
-	var dot12 = THREE.Triangle3.__v1.dot( THREE.Triangle3.__v2 );
+	var dot00 = THREE.Triangle.__v0.dot( THREE.Triangle.__v0 );
+	var dot01 = THREE.Triangle.__v0.dot( THREE.Triangle.__v1 );
+	var dot02 = THREE.Triangle.__v0.dot( THREE.Triangle.__v2 );
+	var dot11 = THREE.Triangle.__v1.dot( THREE.Triangle.__v1 );
+	var dot12 = THREE.Triangle.__v1.dot( THREE.Triangle.__v2 );
 
 	var denom = ( dot00 * dot11 - dot01 * dot01 );
 
@@ -51,17 +51,17 @@ THREE.Triangle3.barycoordFromPoint = function ( point, a, b, c, optionalTarget )
 	return result.set( 1 - u - v, v, u );
 };
 
-THREE.Triangle3.containsPoint = function ( point, a, b, c ) {
+THREE.Triangle.containsPoint = function ( point, a, b, c ) {
 
 	// NOTE: need to use __v3 here because __v0, __v1 and __v2 are used in barycoordFromPoint.
-	var result = THREE.Triangle3.barycoordFromPoint( point, a, b, c, THREE.Triangle3.__v3 );
+	var result = THREE.Triangle.barycoordFromPoint( point, a, b, c, THREE.Triangle.__v3 );
 
 	return ( result.x >= 0 ) && ( result.y >= 0 ) && ( ( result.x + result.y ) <= 1 );
 };
 
-THREE.Triangle3.prototype = {
+THREE.Triangle.prototype = {
 
-	constructor: THREE.Triangle3,
+	constructor: THREE.Triangle,
 
 	set: function ( a, b, c ) {
 
@@ -95,10 +95,10 @@ THREE.Triangle3.prototype = {
 
 	area: function () {
 
-		THREE.Triangle3.__v0.sub( this.c, this.b );
-		THREE.Triangle3.__v1.sub( this.a, this.b );
+		THREE.Triangle.__v0.sub( this.c, this.b );
+		THREE.Triangle.__v1.sub( this.a, this.b );
 
-		return THREE.Triangle3.__v0.crossSelf( THREE.Triangle3.__v1 ).length() * 0.5;
+		return THREE.Triangle.__v0.crossSelf( THREE.Triangle.__v1 ).length() * 0.5;
 
 	},
 
@@ -114,8 +114,8 @@ THREE.Triangle3.prototype = {
 		var result = optionalTarget || new THREE.Vector3();
 
 		result.sub( this.c, this.b );
-		THREE.Triangle3.__v0.sub( this.a, this.b );
-		result.crossSelf( THREE.Triangle3.__v0 );
+		THREE.Triangle.__v0.sub( this.a, this.b );
+		result.crossSelf( THREE.Triangle.__v0 );
 
 		var resultLengthSq = result.lengthSq();
 		if( resultLengthSq > 0 ) {
@@ -138,13 +138,13 @@ THREE.Triangle3.prototype = {
 
 	barycoordFromPoint: function ( point, optionalTarget ) {
 
-		return THREE.Triangle3.barycoordFromPoint( point, this.a, this.b, this.c, optionalTarget );
+		return THREE.Triangle.barycoordFromPoint( point, this.a, this.b, this.c, optionalTarget );
 
 	},
 
 	containsPoint: function ( point ) {
 
-		return THREE.Triangle3.containsPoint( point, this.a, this.b, this.c );
+		return THREE.Triangle.containsPoint( point, this.a, this.b, this.c );
 
 	},
 
@@ -156,13 +156,13 @@ THREE.Triangle3.prototype = {
 
 	clone: function () {
 
-		return new THREE.Triangle3().copy( this );
+		return new THREE.Triangle().copy( this );
 
 	}
 
 };
 
-THREE.Triangle3.__v0 = new THREE.Vector3();
-THREE.Triangle3.__v1 = new THREE.Vector3();
-THREE.Triangle3.__v2 = new THREE.Vector3();
-THREE.Triangle3.__v3 = new THREE.Vector3();
+THREE.Triangle.__v0 = new THREE.Vector3();
+THREE.Triangle.__v1 = new THREE.Vector3();
+THREE.Triangle.__v2 = new THREE.Vector3();
+THREE.Triangle.__v3 = new THREE.Vector3();

test/core/Triangle3.js → test/core/Triangle.js

@@ -2,23 +2,23 @@
  * @author bhouston / http://exocortex.com
  */
 
-module( "Triangle3" );
+module( "Triangle" );
 
 test( "constructor", function() {
-	var a = new THREE.Triangle3();
+	var a = new THREE.Triangle();
 	ok( a.a.equals( zero3 ), "Passed!" );
 	ok( a.b.equals( zero3 ), "Passed!" );
 	ok( a.c.equals( zero3 ), "Passed!" );
 
-	a = new THREE.Triangle3( one3.clone().negate(), one3, two3 );
+	a = new THREE.Triangle( one3.clone().negate(), one3, two3 );
 	ok( a.a.equals( one3.clone().negate() ), "Passed!" );
 	ok( a.b.equals( one3 ), "Passed!" );
 	ok( a.c.equals( two3 ), "Passed!" );
 });
 
 test( "copy", function() {
-	var a = new THREE.Triangle3( one3.clone().negate(), one3, two3 );
-	var b = new THREE.Triangle3().copy( a );
+	var a = new THREE.Triangle( one3.clone().negate(), one3, two3 );
+	var b = new THREE.Triangle().copy( a );
 	ok( b.a.equals( one3.clone().negate() ), "Passed!" );
 	ok( b.b.equals( one3 ), "Passed!" );
 	ok( b.c.equals( two3 ), "Passed!" );
@@ -33,7 +33,7 @@ test( "copy", function() {
 });
 
 test( "setFromPointsAndIndices", function() {
-	var a = new THREE.Triangle3();
+	var a = new THREE.Triangle();
 
 	var points = [ one3, one3.clone().negate(), two3 ];
 	a.setFromPointsAndIndices( points, 1, 0, 2 );
@@ -44,7 +44,7 @@ test( "setFromPointsAndIndices", function() {
 });
 
 test( "set", function() {
-	var a = new THREE.Triangle3();
+	var a = new THREE.Triangle();
 
 	a.set( one3.clone().negate(), one3, two3 );
 	ok( a.a.equals( one3.clone().negate() ), "Passed!" );
@@ -54,47 +54,47 @@ test( "set", function() {
 });
 
 test( "area", function() {
-	var a = new THREE.Triangle3();
+	var a = new THREE.Triangle();
 
 	ok( a.area() == 0, "Passed!" );
 
-	a = new THREE.Triangle3( new THREE.Vector3( 0, 0, 0 ), new THREE.Vector3( 1, 0, 0 ), new THREE.Vector3( 0, 1, 0 ) );
+	a = new THREE.Triangle( new THREE.Vector3( 0, 0, 0 ), new THREE.Vector3( 1, 0, 0 ), new THREE.Vector3( 0, 1, 0 ) );
 	ok( a.area() == 0.5, "Passed!" );
 
-	a = new THREE.Triangle3( new THREE.Vector3( 2, 0, 0 ), new THREE.Vector3( 0, 0, 0 ), new THREE.Vector3( 0, 0, 2 ) );
+	a = new THREE.Triangle( new THREE.Vector3( 2, 0, 0 ), new THREE.Vector3( 0, 0, 0 ), new THREE.Vector3( 0, 0, 2 ) );
 	ok( a.area() == 2, "Passed!" );
 
 	// colinear triangle.
-	a = new THREE.Triangle3( new THREE.Vector3( 2, 0, 0 ), new THREE.Vector3( 0, 0, 0 ), new THREE.Vector3( 3, 0, 0 ) );
+	a = new THREE.Triangle( new THREE.Vector3( 2, 0, 0 ), new THREE.Vector3( 0, 0, 0 ), new THREE.Vector3( 3, 0, 0 ) );
 	ok( a.area() == 0, "Passed!" );
 });
 
 test( "midpoint", function() {
-	var a = new THREE.Triangle3();
+	var a = new THREE.Triangle();
 
 	ok( a.midpoint().equals( new THREE.Vector3( 0, 0, 0 ) ), "Passed!" );
 
-	a = new THREE.Triangle3( new THREE.Vector3( 0, 0, 0 ), new THREE.Vector3( 1, 0, 0 ), new THREE.Vector3( 0, 1, 0 ) );
+	a = new THREE.Triangle( new THREE.Vector3( 0, 0, 0 ), new THREE.Vector3( 1, 0, 0 ), new THREE.Vector3( 0, 1, 0 ) );
 	ok( a.midpoint().equals( new THREE.Vector3( 1/3, 1/3, 0 ) ), "Passed!" );
 
-	a = new THREE.Triangle3( new THREE.Vector3( 2, 0, 0 ), new THREE.Vector3( 0, 0, 0 ), new THREE.Vector3( 0, 0, 2 ) );
+	a = new THREE.Triangle( new THREE.Vector3( 2, 0, 0 ), new THREE.Vector3( 0, 0, 0 ), new THREE.Vector3( 0, 0, 2 ) );
 	ok( a.midpoint().equals( new THREE.Vector3( 2/3, 0, 2/3 ) ), "Passed!" );
 });
 
 test( "normal", function() {
-	var a = new THREE.Triangle3();
+	var a = new THREE.Triangle();
 
 	ok( a.normal().equals( new THREE.Vector3( 0, 0, 0 ) ), "Passed!" );
 
-	a = new THREE.Triangle3( new THREE.Vector3( 0, 0, 0 ), new THREE.Vector3( 1, 0, 0 ), new THREE.Vector3( 0, 1, 0 ) );
+	a = new THREE.Triangle( new THREE.Vector3( 0, 0, 0 ), new THREE.Vector3( 1, 0, 0 ), new THREE.Vector3( 0, 1, 0 ) );
 	ok( a.normal().equals( new THREE.Vector3( 0, 0, 1 ) ), "Passed!" );
 
-	a = new THREE.Triangle3( new THREE.Vector3( 2, 0, 0 ), new THREE.Vector3( 0, 0, 0 ), new THREE.Vector3( 0, 0, 2 ) );
+	a = new THREE.Triangle( new THREE.Vector3( 2, 0, 0 ), new THREE.Vector3( 0, 0, 0 ), new THREE.Vector3( 0, 0, 2 ) );
 	ok( a.normal().equals( new THREE.Vector3( 0, 1, 0 ) ), "Passed!" );
 });
 
 test( "plane", function() {
-	var a = new THREE.Triangle3();
+	var a = new THREE.Triangle();
 
 	// artificial normal is created in this case.
 	ok( a.plane().distanceToPoint( a.a ) == 0, "Passed!" );
@@ -102,13 +102,13 @@ test( "plane", function() {
 	ok( a.plane().distanceToPoint( a.c ) == 0, "Passed!" );
 	ok( a.plane().normal.equals( a.normal() ), "Passed!" );
 
-	a = new THREE.Triangle3( new THREE.Vector3( 0, 0, 0 ), new THREE.Vector3( 1, 0, 0 ), new THREE.Vector3( 0, 1, 0 ) );
+	a = new THREE.Triangle( new THREE.Vector3( 0, 0, 0 ), new THREE.Vector3( 1, 0, 0 ), new THREE.Vector3( 0, 1, 0 ) );
 	ok( a.plane().distanceToPoint( a.a ) == 0, "Passed!" );
 	ok( a.plane().distanceToPoint( a.b ) == 0, "Passed!" );
 	ok( a.plane().distanceToPoint( a.c ) == 0, "Passed!" );
 	ok( a.plane().normal.equals( a.normal() ), "Passed!" );
 
-	a = new THREE.Triangle3( new THREE.Vector3( 2, 0, 0 ), new THREE.Vector3( 0, 0, 0 ), new THREE.Vector3( 0, 0, 2 ) );
+	a = new THREE.Triangle( new THREE.Vector3( 2, 0, 0 ), new THREE.Vector3( 0, 0, 0 ), new THREE.Vector3( 0, 0, 2 ) );
 	ok( a.plane().distanceToPoint( a.a ) == 0, "Passed!" );
 	ok( a.plane().distanceToPoint( a.b ) == 0, "Passed!" );
 	ok( a.plane().distanceToPoint( a.c ) == 0, "Passed!" );
@@ -116,7 +116,7 @@ test( "plane", function() {
 });
 
 test( "barycoordFromPoint", function() {
-	var a = new THREE.Triangle3();
+	var a = new THREE.Triangle();
 
 	var bad = new THREE.Vector3( -2, -1, -1 );
 
@@ -124,13 +124,13 @@ test( "barycoordFromPoint", function() {
 	ok( a.barycoordFromPoint( a.b ).equals( bad ), "Passed!" );
 	ok( a.barycoordFromPoint( a.c ).equals( bad ), "Passed!" );
 
-	a = new THREE.Triangle3( new THREE.Vector3( 0, 0, 0 ), new THREE.Vector3( 1, 0, 0 ), new THREE.Vector3( 0, 1, 0 ) );
+	a = new THREE.Triangle( new THREE.Vector3( 0, 0, 0 ), new THREE.Vector3( 1, 0, 0 ), new THREE.Vector3( 0, 1, 0 ) );
 	ok( a.barycoordFromPoint( a.a ).equals( new THREE.Vector3( 1, 0, 0 ) ), "Passed!" );
 	ok( a.barycoordFromPoint( a.b ).equals( new THREE.Vector3( 0, 1, 0 ) ), "Passed!" );
 	ok( a.barycoordFromPoint( a.c ).equals( new THREE.Vector3( 0, 0, 1 ) ), "Passed!" );
 	ok( a.barycoordFromPoint( a.midpoint() ).distanceTo( new THREE.Vector3( 1/3, 1/3, 1/3 ) ) < 0.0001, "Passed!" );
 
-	a = new THREE.Triangle3( new THREE.Vector3( 2, 0, 0 ), new THREE.Vector3( 0, 0, 0 ), new THREE.Vector3( 0, 0, 2 ) );
+	a = new THREE.Triangle( new THREE.Vector3( 2, 0, 0 ), new THREE.Vector3( 0, 0, 0 ), new THREE.Vector3( 0, 0, 2 ) );
 	ok( a.barycoordFromPoint( a.a ).equals( new THREE.Vector3( 1, 0, 0 ) ), "Passed!" );
 	ok( a.barycoordFromPoint( a.b ).equals( new THREE.Vector3( 0, 1, 0 ) ), "Passed!" );
 	ok( a.barycoordFromPoint( a.c ).equals( new THREE.Vector3( 0, 0, 1 ) ), "Passed!" );
@@ -138,20 +138,20 @@ test( "barycoordFromPoint", function() {
 });
 
 test( "containsPoint", function() {
-	var a = new THREE.Triangle3();
+	var a = new THREE.Triangle();
 
 	ok( ! a.containsPoint( a.a ), "Passed!" );
 	ok( ! a.containsPoint( a.b ), "Passed!" );
 	ok( ! a.containsPoint( a.c ), "Passed!" );
 
-	a = new THREE.Triangle3( new THREE.Vector3( 0, 0, 0 ), new THREE.Vector3( 1, 0, 0 ), new THREE.Vector3( 0, 1, 0 ) );
+	a = new THREE.Triangle( new THREE.Vector3( 0, 0, 0 ), new THREE.Vector3( 1, 0, 0 ), new THREE.Vector3( 0, 1, 0 ) );
 	ok( a.containsPoint( a.a ), "Passed!" );
 	ok( a.containsPoint( a.b ), "Passed!" );
 	ok( a.containsPoint( a.c ), "Passed!" );
 	ok( a.containsPoint( a.midpoint() ), "Passed!" );
 	ok( ! a.containsPoint( new THREE.Vector3( -1, -1, -1 ) ), "Passed!" );
 
-	a = new THREE.Triangle3( new THREE.Vector3( 2, 0, 0 ), new THREE.Vector3( 0, 0, 0 ), new THREE.Vector3( 0, 0, 2 ) );
+	a = new THREE.Triangle( new THREE.Vector3( 2, 0, 0 ), new THREE.Vector3( 0, 0, 0 ), new THREE.Vector3( 0, 0, 2 ) );
 	ok( a.containsPoint( a.a ), "Passed!" );
 	ok( a.containsPoint( a.b ), "Passed!" );
 	ok( a.containsPoint( a.c ), "Passed!" );

test/sources.html

@@ -20,7 +20,7 @@
   <script src="../src/math/Plane.js"></script>
   <script src="../src/math/Ray.js"></script>
   <script src="../src/math/Sphere.js"></script>
-  <script src="../src/math/Triangle3.js"></script>
+  <script src="../src/math/Triangle.js"></script>
   <script src="../src/math/Matrix3.js"></script>
   <script src="../src/math/Matrix4.js"></script>
 
@@ -32,7 +32,7 @@
   <script src="core/Plane.js"></script>
   <script src="core/Ray.js"></script>
   <script src="core/Sphere.js"></script>
-  <script src="core/Triangle3.js"></script>
+  <script src="core/Triangle.js"></script>
   <script src="core/Vector2.js"></script>
   <script src="core/Vector3.js"></script>
   <script src="core/Vector4.js"></script>

test/three-math.html

@@ -21,7 +21,7 @@
   <script src="core/Plane.js"></script>
   <script src="core/Ray.js"></script>
   <script src="core/Sphere.js"></script>
-  <script src="core/Triangle3.js"></script>
+  <script src="core/Triangle.js"></script>
   <script src="core/Vector2.js"></script>
   <script src="core/Vector3.js"></script>
   <script src="core/Vector4.js"></script>

test/three.html

@@ -21,7 +21,7 @@
   <script src="core/Plane.js"></script>
   <script src="core/Ray.js"></script>
   <script src="core/Sphere.js"></script>
-  <script src="core/Triangle3.js"></script>
+  <script src="core/Triangle.js"></script>
   <script src="core/Vector2.js"></script>
   <script src="core/Vector3.js"></script>
   <script src="core/Vector4.js"></script>

test/three.min.html

@@ -21,7 +21,7 @@
   <script src="core/Plane.js"></script>
   <script src="core/Ray.js"></script>
   <script src="core/Sphere.js"></script>
-  <script src="core/Triangle3.js"></script>
+  <script src="core/Triangle.js"></script>
   <script src="core/Vector2.js"></script>
   <script src="core/Vector3.js"></script>
   <script src="core/Vector4.js"></script>

utils/includes/canvas.json

@@ -13,7 +13,7 @@
 	"../src/math/Frustum.js",
 	"../src/math/Rectangle.js",
 	"../src/math/Math.js",
-	"../src/math/Triangle3.js",
+	"../src/math/Triangle.js",
 	"../src/math/Quaternion.js",
 	"../src/math/Vertex.js",
 	"../src/math/UV.js",

utils/includes/common.json

@@ -16,7 +16,7 @@
 	"../src/math/Math.js",
 	"../src/math/Quaternion.js",
 	"../src/math/Spline.js",
-	"../src/math/Triangle3.js",
+	"../src/math/Triangle.js",
 	"../src/math/Vertex.js",
 	"../src/math/UV.js",
 	"../src/core/Clock.js",

utils/includes/css3d.json

@@ -10,7 +10,7 @@
 	"../src/math/Box2.js",
 	"../src/math/Box3.js",
 	"../src/math/Sphere.js",
-	"../src/math/Triangle3.js",
+	"../src/math/Triangle.js",
 	"../src/math/Plane.js",
 	"../src/core/EventTarget.js",
 	"../src/core/Raycaster.js",

utils/includes/math.json

@@ -16,5 +16,5 @@
 	"../src/math/Math.js",
 	"../src/math/Quaternion.js",
 	"../src/math/Spline.js",
-	"../src/math/Triangle3.js"
+	"../src/math/Triangle.js"
 ]

utils/includes/webgl.json

@@ -15,7 +15,7 @@
 	"../src/math/Spline.js",
 	"../src/math/Box2.js",
 	"../src/math/Box3.js",
-	"../src/math/Triangle3.js",
+	"../src/math/Triangle.js",
 	"../src/math/Sphere.js",
 	"../src/math/Plane.js",
 	"../src/core/Clock.js",