Browse Source

Minor code cleanup.

pull/7/head
Vladimír Vondruš 14 years ago
parent
commit
538601fc06
  1. 5
      src/Math/Quaternion.h
  2. 4
      src/Math/Vector.h

5
src/Math/Quaternion.h

@ -50,7 +50,7 @@ template<class T> class Quaternion {
* @brief Angle between normalized quaternions (in radians)
*
* Expects that both quaternions are normalized. @f[
* \theta = acos \left(\frac{p \cdot q}{|p| \cdot |q|} \right)
* \theta = acos \left( \frac{p \cdot q}{|p| \cdot |q|} \right)
* @f]
*/
inline static T angle(const Quaternion<T>& normalizedA, const Quaternion<T>& normalizedB) {
@ -71,7 +71,8 @@ template<class T> class Quaternion {
*/
inline static Quaternion<T> lerp(const Quaternion<T>& normalizedA, const Quaternion<T>& normalizedB, T t) {
CORRADE_ASSERT(MathTypeTraits<T>::equals(normalizedA.dot(), T(1)) && MathTypeTraits<T>::equals(normalizedB.dot(), T(1)),
"Math::Quaternion::lerp(): quaternions must be normalized", Quaternion<T>({}, std::numeric_limits<T>::quiet_NaN()));
"Math::Quaternion::lerp(): quaternions must be normalized",
Quaternion<T>({}, std::numeric_limits<T>::quiet_NaN()));
return ((T(1) - t)*normalizedA + t*normalizedB).normalized();
}

4
src/Math/Vector.h

@ -41,7 +41,7 @@ template<std::size_t size, class T> class Vector: public RectangularMatrix<1, si
* @brief Dot product
*
* @f[
* a \cdot b = \sum_{i=0}^{n-1} a_ib_i
* a \cdot b = \sum_{i=0}^{n-1} a_ib_i
* @f]
* @see dot() const
*/
@ -58,7 +58,7 @@ template<std::size_t size, class T> class Vector: public RectangularMatrix<1, si
* @brief Angle between normalized vectors (in radians)
*
* Expects that both vectors are normalized. @f[
* \theta = acos \left(\frac{a \cdot b}{|a| \cdot |b|} \right)
* \theta = acos \left( \frac{a \cdot b}{|a| \cdot |b|} \right)
* @f]
*/
inline static T angle(const Vector<size, T>& normalizedA, const Vector<size, T>& normalizedB) {

Loading…
Cancel
Save