提交 1e50c948 编写于 作者: W WestLangley

Rename Matrix*.multiplyVector3Array() to Matrix*.applyToVector3Array()

上级 12bf304a
...@@ -92,12 +92,12 @@ ...@@ -92,12 +92,12 @@
Multiply every component of the matrix by a scalar value. Multiply every component of the matrix by a scalar value.
</div> </div>
<h3>.multiplyVector3Array([page:Array array]) [page:Array]</h3> <h3>.applyToVector3Array([page:Array array]) [page:Array]</h3>
<div> <div>
array -- An array in the form [vector1x, vector1y, vector1z, vector2x, vector2y, vector2z, ...] array -- An array in the form [vector1x, vector1y, vector1z, vector2x, vector2y, vector2z, ...]
</div> </div>
<div> <div>
Multiply (apply) this matrix against every vector3 in the array. Multiply (apply) this matrix to every vector3 in the array.
</div> </div>
<h3>.getNormalMatrix([page:Matrix4 matrix4]) [page:Matrix3 this]</h3> <h3>.getNormalMatrix([page:Matrix4 matrix4]) [page:Matrix3 this]</h3>
......
...@@ -229,12 +229,12 @@ ...@@ -229,12 +229,12 @@
Clones this matrix. Clones this matrix.
</div> </div>
<h3>.multiplyVector3Array([page:Array a]) [page:Array]</h3> <h3>.applyToVector3Array([page:Array a]) [page:Array]</h3>
<div> <div>
array -- An array in the form [vector1x, vector1y, vector1z, vector2x, vector2y, vector2z, ...] array -- An array in the form [vector1x, vector1y, vector1z, vector2x, vector2y, vector2z, ...]
</div> </div>
<div> <div>
Multiply (apply) this matrix against every vector3 in the array. Multiply (apply) this matrix to every vector3 in the array.
</div> </div>
<h3>.getMaxScaleOnAxis() [page:Float]</h3> <h3>.getMaxScaleOnAxis() [page:Float]</h3>
......
...@@ -66,7 +66,7 @@ THREE.BufferGeometry.prototype = { ...@@ -66,7 +66,7 @@ THREE.BufferGeometry.prototype = {
if ( position !== undefined ) { if ( position !== undefined ) {
matrix.multiplyVector3Array( position.array ); matrix.applyToVector3Array( position.array );
position.needsUpdate = true; position.needsUpdate = true;
} }
...@@ -77,7 +77,7 @@ THREE.BufferGeometry.prototype = { ...@@ -77,7 +77,7 @@ THREE.BufferGeometry.prototype = {
var normalMatrix = new THREE.Matrix3().getNormalMatrix( matrix ); var normalMatrix = new THREE.Matrix3().getNormalMatrix( matrix );
normalMatrix.multiplyVector3Array( normal.array ); normalMatrix.applyToVector3Array( normal.array );
normal.needsUpdate = true; normal.needsUpdate = true;
} }
......
...@@ -70,7 +70,14 @@ THREE.Matrix3.prototype = { ...@@ -70,7 +70,14 @@ THREE.Matrix3.prototype = {
}, },
multiplyVector3Array: function() { multiplyVector3Array: function ( a ) {
console.warn( 'DEPRECATED: Matrix3\'s .multiplyVector3Array() has been renamed. Use matrix.applyToVector3Array( array ) instead.' );
return this.applyToVector3Array( a );
},
applyToVector3Array: function() {
var v1 = new THREE.Vector3(); var v1 = new THREE.Vector3();
...@@ -82,7 +89,7 @@ THREE.Matrix3.prototype = { ...@@ -82,7 +89,7 @@ THREE.Matrix3.prototype = {
v1.y = a[ i + 1 ]; v1.y = a[ i + 1 ];
v1.z = a[ i + 2 ]; v1.z = a[ i + 2 ];
v1.applyMatrix3(this); v1.applyMatrix3( this );
a[ i ] = v1.x; a[ i ] = v1.x;
a[ i + 1 ] = v1.y; a[ i + 1 ] = v1.y;
......
...@@ -427,7 +427,14 @@ THREE.Matrix4.prototype = { ...@@ -427,7 +427,14 @@ THREE.Matrix4.prototype = {
}, },
multiplyVector3Array: function() { multiplyVector3Array: function ( a ) {
console.warn( 'DEPRECATED: Matrix4\'s .multiplyVector3Array() has been renamed. Use matrix.applyToVector3Array( array ) instead.' );
return this.applyToVector3Array( a );
},
applyToVector3Array: function() {
var v1 = new THREE.Vector3(); var v1 = new THREE.Vector3();
...@@ -439,7 +446,7 @@ THREE.Matrix4.prototype = { ...@@ -439,7 +446,7 @@ THREE.Matrix4.prototype = {
v1.y = a[ i + 1 ]; v1.y = a[ i + 1 ];
v1.z = a[ i + 2 ]; v1.z = a[ i + 2 ];
v1.applyProjection( this ); v1.applyMatrix4( this );
a[ i ] = v1.x; a[ i ] = v1.x;
a[ i + 1 ] = v1.y; a[ i + 1 ] = v1.y;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册