|
|
@@ -114,9 +114,6 @@ namespace glm
|
|
|
//////////////////////////////////////
|
|
|
// Conversion vector constructors
|
|
|
|
|
|
- //! Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification)
|
|
|
- template <typename U, precision Q>
|
|
|
- GLM_FUNC_DECL explicit tvec1(tvec1<U, Q> const & v);
|
|
|
//! Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification)
|
|
|
template <typename U, precision Q>
|
|
|
GLM_FUNC_DECL explicit tvec1(tvec2<U, Q> const & v);
|
|
|
@@ -127,6 +124,16 @@ namespace glm
|
|
|
template <typename U, precision Q>
|
|
|
GLM_FUNC_DECL explicit tvec1(tvec4<U, Q> const & v);
|
|
|
|
|
|
+# ifdef GLM_FORCE_EXPLICIT_CTOR
|
|
|
+ //! Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification)
|
|
|
+ template <typename U, precision Q>
|
|
|
+ GLM_FUNC_DECL explicit tvec1(tvec1<U, Q> const & v);
|
|
|
+# else
|
|
|
+ //! Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification)
|
|
|
+ template <typename U, precision Q>
|
|
|
+ GLM_FUNC_DECL tvec1(tvec1<U, Q> const & v);
|
|
|
+# endif
|
|
|
+
|
|
|
//////////////////////////////////////
|
|
|
// Swizzle constructors
|
|
|
|