Skip to content

Commit bb31515

Browse files
WestLangleyWestLangley
committed
Vector3.get*FromMatrix() -> Vector3.setFromMatrix*()
1 parent bedeb31 commit bb31515

21 files changed

Lines changed: 80 additions & 57 deletions

‎docs/api/math/Vector3.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -159,12 +159,12 @@ <h3>.crossVectors( [page:Vector3 a], [page:Vector3 b] ) [page:Vector3 this]</h3>
159159
Sets this vector to cross product of *a* and *b*.
160160
</div>
161161

162-
<h3>.getPositionFromMatrix( [page:Matrix4 m] ) [page:Vector3 this]</h3>
162+
<h3>.setFromMatrixPosition( [page:Matrix4 m] ) [page:Vector3 this]</h3>
163163
<div>
164164
Sets this vector extracting position from matrix transform.
165165
</div>
166166

167-
<h3>.getScaleFromMatrix( [page:Matrix4 m] ) [page:Vector3 this]</h3>
167+
<h3>.setFromMatrixScale( [page:Matrix4 m] ) [page:Vector3 this]</h3>
168168
<div>
169169
Sets this vector extracting scale from matrix transform.
170170
</div>
@@ -321,7 +321,7 @@ <h3>.angleTo([page:Vector3 v]) [page:Float]</h3>
321321
Returns the angle between this vector and vector v in radians.
322322
</div>
323323

324-
<h3>.getColumnFromMatrix([page:Integer index], [page:Matrix4 matrix]) [page:Vector3 this]</h3>
324+
<h3>.setFromMatrixColumn([page:Integer index], [page:Matrix4 matrix]) [page:Vector3 this]</h3>
325325
<div>
326326
index -- 0, 1, 2, or 3 <br />
327327
matrix -- [page:Matrix4]

‎examples/js/AudioObject.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,8 @@ THREE.AudioObject = function ( url, volume, playbackRate, loop ) {
110110
oldSoundPosition.copy( soundPosition );
111111
oldCameraPosition.copy( cameraPosition );
112112

113-
soundPosition.getPositionFromMatrix( this.matrixWorld );
114-
cameraPosition.getPositionFromMatrix( camera.matrixWorld );
113+
soundPosition.setFromMatrixPosition( this.matrixWorld );
114+
cameraPosition.setFromMatrixPosition( camera.matrixWorld );
115115

116116
soundDelta.subVectors( soundPosition, oldSoundPosition );
117117
cameraDelta.subVectors( cameraPosition, oldCameraPosition );

‎examples/js/Mirror.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,8 +180,8 @@ THREE.Mirror.prototype.updateTextureMatrix = function () {
180180
this.updateMatrixWorld();
181181
this.camera.updateMatrixWorld();
182182

183-
this.mirrorWorldPosition.getPositionFromMatrix( this.matrixWorld );
184-
this.cameraWorldPosition.getPositionFromMatrix( this.camera.matrixWorld );
183+
this.mirrorWorldPosition.setFromMatrixPosition( this.matrixWorld );
184+
this.cameraWorldPosition.setFromMatrixPosition( this.camera.matrixWorld );
185185

186186
this.rotationMatrix.extractRotation( this.matrixWorld );
187187

‎examples/js/Octree.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -686,7 +686,7 @@
686686
} else {
687687

688688
this.radius = this.object.boundRadius;
689-
this.position.getPositionFromMatrix( this.object.matrixWorld );
689+
this.position.setFromMatrixPosition( this.object.matrixWorld );
690690

691691
}
692692

‎examples/js/controls/TransformControls.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -819,11 +819,11 @@ THREE.TransformControls = function ( camera, domElement ) {
819819
if ( scope.object === undefined ) return;
820820

821821
scope.object.updateMatrixWorld();
822-
worldPosition.getPositionFromMatrix( scope.object.matrixWorld );
822+
worldPosition.setFromMatrixPosition( scope.object.matrixWorld );
823823
worldRotation.setFromRotationMatrix( tempMatrix.extractRotation( scope.object.matrixWorld ) );
824824

825825
camera.updateMatrixWorld();
826-
camPosition.getPositionFromMatrix( camera.matrixWorld );
826+
camPosition.setFromMatrixPosition( camera.matrixWorld );
827827
camRotation.setFromRotationMatrix( tempMatrix.extractRotation( camera.matrixWorld ) );
828828

829829
scale = worldPosition.distanceTo( camPosition ) / 6 * scope.size;
@@ -900,7 +900,7 @@ THREE.TransformControls = function ( camera, domElement ) {
900900
worldRotationMatrix.extractRotation( scope.object.matrixWorld );
901901

902902
parentRotationMatrix.extractRotation( scope.object.parent.matrixWorld );
903-
parentScale.getScaleFromMatrix( tempMatrix.getInverse( scope.object.parent.matrixWorld ) );
903+
parentScale.setFromMatrixScale( tempMatrix.getInverse( scope.object.parent.matrixWorld ) );
904904

905905
offset.copy( planeIntersect.point );
906906

‎examples/js/renderers/CSS2DRenderer.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ THREE.CSS2DRenderer = function () {
6464

6565
if ( object instanceof THREE.CSS2DObject ) {
6666

67-
vector.getPositionFromMatrix( object.matrixWorld );
67+
vector.setFromMatrixPosition( object.matrixWorld );
6868
vector.applyProjection( viewProjectionMatrix );
6969

7070
var element = object.element;

‎examples/js/renderers/SVGRenderer.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ THREE.SVGRenderer = function () {
222222

223223
if ( light instanceof THREE.DirectionalLight ) {
224224

225-
var lightPosition = _vector3.getPositionFromMatrix( light.matrixWorld ).normalize();
225+
var lightPosition = _vector3.setFromMatrixPosition( light.matrixWorld ).normalize();
226226

227227
var amount = normal.dot( lightPosition );
228228

@@ -236,7 +236,7 @@ THREE.SVGRenderer = function () {
236236

237237
} else if ( light instanceof THREE.PointLight ) {
238238

239-
var lightPosition = _vector3.getPositionFromMatrix( light.matrixWorld );
239+
var lightPosition = _vector3.setFromMatrixPosition( light.matrixWorld );
240240

241241
var amount = normal.dot( _vector3.subVectors( lightPosition, position ).normalize() );
242242

‎examples/js/renderers/WebGLDeferredRenderer.js‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -333,12 +333,12 @@ THREE.WebGLDeferredRenderer = function ( parameters ) {
333333
lightProxy.scale.set( 1, 1, 1 ).multiplyScalar( distance );
334334
uniforms[ "lightRadius" ].value = distance;
335335

336-
positionVS.getPositionFromMatrix( light.matrixWorld );
336+
positionVS.setFromMatrixPosition( light.matrixWorld );
337337
positionVS.applyMatrix4( currentCamera.matrixWorldInverse );
338338

339339
uniforms[ "lightPositionVS" ].value.copy( positionVS );
340340

341-
lightProxy.position.getPositionFromMatrix( light.matrixWorld );
341+
lightProxy.position.setFromMatrixPosition( light.matrixWorld );
342342

343343
} else {
344344

@@ -425,11 +425,11 @@ THREE.WebGLDeferredRenderer = function ( parameters ) {
425425
var viewMatrix = currentCamera.matrixWorldInverse;
426426
var modelMatrix = light.matrixWorld;
427427

428-
positionVS.getPositionFromMatrix( modelMatrix );
428+
positionVS.setFromMatrixPosition( modelMatrix );
429429
positionVS.applyMatrix4( viewMatrix );
430430

431-
directionVS.getPositionFromMatrix( modelMatrix );
432-
tempVS.getPositionFromMatrix( light.target.matrixWorld );
431+
directionVS.setFromMatrixPosition( modelMatrix );
432+
tempVS.setFromMatrixPosition( light.target.matrixWorld );
433433
directionVS.sub( tempVS );
434434
directionVS.normalize();
435435
directionVS.transformDirection( viewMatrix );
@@ -499,8 +499,8 @@ THREE.WebGLDeferredRenderer = function ( parameters ) {
499499
var light = lightProxy.userData.originalLight;
500500
var uniforms = lightProxy.material.uniforms;
501501

502-
directionVS.getPositionFromMatrix( light.matrixWorld );
503-
tempVS.getPositionFromMatrix( light.target.matrixWorld );
502+
directionVS.setFromMatrixPosition( light.matrixWorld );
503+
tempVS.setFromMatrixPosition( light.target.matrixWorld );
504504
directionVS.sub( tempVS );
505505
directionVS.normalize();
506506
directionVS.transformDirection( currentCamera.matrixWorldInverse );
@@ -566,7 +566,7 @@ THREE.WebGLDeferredRenderer = function ( parameters ) {
566566
var light = lightProxy.userData.originalLight;
567567
var uniforms = lightProxy.material.uniforms;
568568

569-
directionVS.getPositionFromMatrix( light.matrixWorld );
569+
directionVS.setFromMatrixPosition( light.matrixWorld );
570570
directionVS.normalize();
571571
directionVS.transformDirection( currentCamera.matrixWorldInverse );
572572

@@ -635,7 +635,7 @@ THREE.WebGLDeferredRenderer = function ( parameters ) {
635635
var modelMatrix = light.matrixWorld;
636636
var viewMatrix = currentCamera.matrixWorldInverse;
637637

638-
positionVS.getPositionFromMatrix( modelMatrix );
638+
positionVS.setFromMatrixPosition( modelMatrix );
639639
positionVS.applyMatrix4( viewMatrix );
640640

641641
uniforms[ "lightPositionVS" ].value.copy( positionVS );

‎examples/js/renderers/WebGLRenderer3.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -438,7 +438,7 @@ THREE.WebGLRenderer3 = function ( parameters ) {
438438

439439
} else {
440440

441-
vector3.getPositionFromMatrix( object.matrixWorld );
441+
vector3.setFromMatrixPosition( object.matrixWorld );
442442
vector3.applyProjection( cameraViewProjectionMatrix );
443443

444444
object.z = vector3.z;

‎src/core/Object3D.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,9 +115,9 @@ THREE.Object3D.prototype = {
115115

116116
this.matrix.multiplyMatrices( matrix, this.matrix );
117117

118-
this.position.getPositionFromMatrix( this.matrix );
118+
this.position.setFromMatrixPosition( this.matrix );
119119

120-
this.scale.getScaleFromMatrix( this.matrix );
120+
this.scale.setFromMatrixScale( this.matrix );
121121

122122
m1.extractRotation( this.matrix );
123123

0 commit comments

Comments
 (0)