Browse Source

Better name for parameter in VectorN constructor from VectorN-1.

vectorfields
Vladimír Vondruš 14 years ago
parent
commit
88e6221ac3
  1. 6
      src/Math/Vector3.h
  2. 6
      src/Math/Vector4.h

6
src/Math/Vector3.h

@ -68,10 +68,10 @@ template<class T> class Vector3: public Vector<3, T> {
/**
* @brief Constructor
* @param other Two component vector
* @param z Z value
* @param xy Two component vector
* @param z Z value
*/
inline constexpr Vector3(const Vector<2, T>& other, T z): Vector<3, T>(other[0], other[1], z) {}
inline constexpr Vector3(const Vector<2, T>& xy, T z): Vector<3, T>(xy[0], xy[1], z) {}
inline constexpr T x() const { return (*this)[0]; } /**< @brief X component */
inline constexpr T y() const { return (*this)[1]; } /**< @brief Y component */

6
src/Math/Vector4.h

@ -50,12 +50,12 @@ template<class T> class Vector4: public Vector<4, T> {
/**
* @brief Constructor
* @param other Three component vector
* @param w W value
* @param xyz Three component vector
* @param w W value
*/
/* Not marked as explicit, because conversion from Vector3 to Vector4
is fairly common, nearly always with W set to 1 */
inline constexpr Vector4(const Vector<3, T>& other, T w = T(1)): Vector<4, T>(other[0], other[1], other[2], w) {}
inline constexpr Vector4(const Vector<3, T>& xyz, T w = T(1)): Vector<4, T>(xyz[0], xyz[1], xyz[2], w) {}
inline constexpr T x() const { return (*this)[0]; } /**< @brief X component */
inline constexpr T y() const { return (*this)[1]; } /**< @brief Y component */

Loading…
Cancel
Save