Merge pull request #3284 from yutopp/patch-1

change type of THREE.Quaternion.setFromUnitVectors
This commit is contained in:
Masahiro Wakame
2014-12-11 23:03:09 +09:00
+1 -1
View File
@@ -3189,7 +3189,7 @@ declare module THREE {
* Sets this quaternion from rotation component of m. Adapted from http://www.euclideanspace.com/maths/geometry/rotations/conversions/matrixToQuaternion/index.htm.
*/
setFromRotationMatrix(m: Matrix4): Quaternion;
setFromUnitVectors(vFrom: Vector3, vTo: Vector4): Quaternion;
setFromUnitVectors(vFrom: Vector3, vTo: Vector3): Quaternion;
/**
* Inverts this quaternion.
*/