Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Doc: Updated Quaternion.setFromRotationMatrix() to specify the matrix needs to be pure #20396

Merged
merged 2 commits into from
Oct 12, 2020
Merged

Doc: Updated Quaternion.setFromRotationMatrix() to specify the matrix needs to be pure #20396

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e694e62
Update Quaternion.html
FlorentMasson Sep 22, 2020
729696c
Update doc for Matrix4
FlorentMasson Sep 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/api/en/math/Matrix4.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ <h2>Extracting position, rotation and scale</h2>
[page:Vector3.setFromMatrixScale]: can be used to extract the scale component.
</li>
<li>
[page:Quaternion.setFromRotationMatrix], [page:Euler.setFromRotationMatrix] or [page:.extractRotation extractRotation] can be used to extract the rotation component.
[page:Quaternion.setFromRotationMatrix], [page:Euler.setFromRotationMatrix] or [page:.extractRotation extractRotation] can be used to extract the rotation component from a pure (unscaled) matrix.
</li>
<li>
[page:.decompose decompose] can be used to extract position, rotation and scale all at once.
Expand Down
2 changes: 2 additions & 0 deletions docs/api/en/math/Quaternion.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,8 @@ <h3>[method:Quaternion setFromEuler]( [param:Euler euler] )</h3>

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