Skip to content

Commit bf27a80

Browse files
authored
Merge pull request #20396 from FlorentMasson/patch-1
Doc: Updated Quaternion.setFromRotationMatrix() to specify the matrix needs to be pure
2 parents 379046c + 729696c commit bf27a80

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

docs/api/en/math/Matrix4.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ <h2>Extracting position, rotation and scale</h2>
8888
[page:Vector3.setFromMatrixScale]: can be used to extract the scale component.
8989
</li>
9090
<li>
91-
[page:Quaternion.setFromRotationMatrix], [page:Euler.setFromRotationMatrix] or [page:.extractRotation extractRotation] can be used to extract the rotation component.
91+
[page:Quaternion.setFromRotationMatrix], [page:Euler.setFromRotationMatrix] or [page:.extractRotation extractRotation] can be used to extract the rotation component from a pure (unscaled) matrix.
9292
</li>
9393
<li>
9494
[page:.decompose decompose] can be used to extract position, rotation and scale all at once.

docs/api/en/math/Quaternion.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,8 @@ <h3>[method:Quaternion setFromEuler]( [param:Euler euler] )</h3>
179179

180180
<h3>[method:Quaternion setFromRotationMatrix]( [param:Matrix4 m] )</h3>
181181
<p>
182+
[page:Matrix4 m] - a [page:Matrix4] of which the upper 3x3 of matrix is a pure
183+
[link:https://en.wikipedia.org/wiki/Rotation_matrix rotation matrix] (i.e. unscaled).<br />
182184
Sets this quaternion from rotation component of [page:Matrix4 m].<br />
183185
Adapted from the method [link:http://www.euclideanspace.com/maths/geometry/rotations/conversions/matrixToQuaternion/index.htm here].
184186
</p>

0 commit comments

Comments
 (0)