From ace4d4b31d861e454ab699353966a0427f7f4f65 Mon Sep 17 00:00:00 2001 From: Ben Houston Date: Sat, 2 Feb 2013 20:15:08 -0500 Subject: [PATCH] Vector3: project->projectOn, ortho->orthoTo per @WestLangley --- src/math/Vector3.js | 8 ++++---- test/unit/math/Vector3.js | 20 ++++++++++---------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/math/Vector3.js b/src/math/Vector3.js index 771262c192..29b5cd96e9 100644 --- a/src/math/Vector3.js +++ b/src/math/Vector3.js @@ -521,20 +521,20 @@ THREE.extend( THREE.Vector3.prototype, { }, - project: function( normal ) { + projectOn: function( normal ) { var d = this.dot( normal ); return this.copy( normal ).multiplyScalar( d ); }, - ortho: function () { + orthoTo: function () { var v1 = new THREE.Vector3(); return function( normal ) { - v1.copy( this ).project( normal ); + v1.copy( this ).projectOn( normal ); return this.sub( v1 ); @@ -548,7 +548,7 @@ THREE.extend( THREE.Vector3.prototype, { return function ( normal ) { - v1.copy( this ).project( normal ).multiplyScalar( 2 ); + v1.copy( this ).projectOn( normal ).multiplyScalar( 2 ); return this.subVectors( v1, this ); diff --git a/test/unit/math/Vector3.js b/test/unit/math/Vector3.js index 7de8006b0d..60ac3e4b31 100644 --- a/test/unit/math/Vector3.js +++ b/test/unit/math/Vector3.js @@ -239,39 +239,39 @@ test( "setLength", function() { }); -test( "project", function() { +test( "projectOn", function() { var a = new THREE.Vector3( 1, 0, 0 ); var b = new THREE.Vector3(); var normal = new THREE.Vector3( 1, 0, 0 ); - ok( b.copy( a ).project( normal ).equals( new THREE.Vector3( 1, 0, 0 ) ), "Passed!" ); + ok( b.copy( a ).projectOn( normal ).equals( new THREE.Vector3( 1, 0, 0 ) ), "Passed!" ); a.set( 0, 1, 0 ); - ok( b.copy( a ).project( normal ).equals( new THREE.Vector3( 0, 0, 0 ) ), "Passed!" ); + ok( b.copy( a ).projectOn( normal ).equals( new THREE.Vector3( 0, 0, 0 ) ), "Passed!" ); a.set( 0, 0, -1 ); - ok( b.copy( a ).project( normal ).equals( new THREE.Vector3( 0, 0, 0 ) ), "Passed!" ); + ok( b.copy( a ).projectOn( normal ).equals( new THREE.Vector3( 0, 0, 0 ) ), "Passed!" ); a.set( -1, 0, 0 ); - ok( b.copy( a ).project( normal ).equals( new THREE.Vector3( -1, 0, 0 ) ), "Passed!" ); + ok( b.copy( a ).projectOn( normal ).equals( new THREE.Vector3( -1, 0, 0 ) ), "Passed!" ); }); -test( "ortho", function() { +test( "orthoTo", function() { var a = new THREE.Vector3( 1, 0, 0 ); var b = new THREE.Vector3(); var normal = new THREE.Vector3( 1, 0, 0 ); - ok( b.copy( a ).ortho( normal ).equals( new THREE.Vector3( 0, 0, 0 ) ), "Passed!" ); + ok( b.copy( a ).orthoTo( normal ).equals( new THREE.Vector3( 0, 0, 0 ) ), "Passed!" ); a.set( 0, 1, 0 ); - ok( b.copy( a ).ortho( normal ).equals( new THREE.Vector3( 0, 1, 0 ) ), "Passed!" ); + ok( b.copy( a ).orthoTo( normal ).equals( new THREE.Vector3( 0, 1, 0 ) ), "Passed!" ); a.set( 0, 0, -1 ); - ok( b.copy( a ).ortho( normal ).equals( new THREE.Vector3( 0, 0, -1 ) ), "Passed!" ); + ok( b.copy( a ).orthoTo( normal ).equals( new THREE.Vector3( 0, 0, -1 ) ), "Passed!" ); a.set( -1, 0, 0 ); - ok( b.copy( a ).ortho( normal ).equals( new THREE.Vector3( 0, 0, 0 ) ), "Passed!" ); + ok( b.copy( a ).orthoTo( normal ).equals( new THREE.Vector3( 0, 0, 0 ) ), "Passed!" ); }); -- GitLab