Fixed build

This commit is contained in:
Christophe Riccio 2015-07-19 01:04:07 +02:00
parent 6f1b7c24ce
commit c90f7b0973
21 changed files with 22 additions and 18 deletions

View File

@ -54,7 +54,7 @@ namespace glm
template <typename U, precision Q>
friend tvec2<U, Q> operator/(tvec2<U, Q> const & v, tmat2x2<U, Q> const & m);
# if GLM_META_PROG_HELPERS
# ifdef GLM_META_PROG_HELPERS
# if GLM_HAS_CONSTEXPR
static GLM_CONSTEXPR length_t components = 2;
static GLM_CONSTEXPR length_t columns = 2;

View File

@ -50,7 +50,7 @@ namespace glm
typedef tmat3x2<T, P> transpose_type;
typedef T value_type;
# if GLM_META_PROG_HELPERS
# ifdef GLM_META_PROG_HELPERS
# if GLM_HAS_CONSTEXPR
static GLM_CONSTEXPR length_t components = 2;
static GLM_CONSTEXPR length_t cols = 3;

View File

@ -50,7 +50,7 @@ namespace glm
typedef tmat4x2<T, P> transpose_type;
typedef T value_type;
# if GLM_META_PROG_HELPERS
# ifdef GLM_META_PROG_HELPERS
# if GLM_HAS_CONSTEXPR
static GLM_CONSTEXPR length_t components = 2;
static GLM_CONSTEXPR length_t cols = 4;

View File

@ -50,7 +50,7 @@ namespace glm
typedef tmat2x3<T, P> transpose_type;
typedef T value_type;
# if GLM_META_PROG_HELPERS
# ifdef GLM_META_PROG_HELPERS
# if GLM_HAS_CONSTEXPR
static GLM_CONSTEXPR length_t components = 3;
static GLM_CONSTEXPR length_t cols = 2;

View File

@ -50,7 +50,7 @@ namespace glm
typedef tmat4x3<T, P> transpose_type;
typedef T value_type;
# if GLM_META_PROG_HELPERS
# ifdef GLM_META_PROG_HELPERS
# if GLM_HAS_CONSTEXPR
static GLM_CONSTEXPR length_t components = 3;
static GLM_CONSTEXPR length_t cols = 4;

View File

@ -50,7 +50,7 @@ namespace glm
typedef tmat2x4<T, P> transpose_type;
typedef T value_type;
# if GLM_META_PROG_HELPERS
# ifdef GLM_META_PROG_HELPERS
# if GLM_HAS_CONSTEXPR
static GLM_CONSTEXPR length_t components = 4;
static GLM_CONSTEXPR length_t cols = 2;

View File

@ -50,7 +50,7 @@ namespace glm
typedef tmat3x4<T, P> transpose_type;
typedef T value_type;
# if GLM_META_PROG_HELPERS
# ifdef GLM_META_PROG_HELPERS
# if GLM_HAS_CONSTEXPR
static GLM_CONSTEXPR length_t components = 4;
static GLM_CONSTEXPR length_t cols = 3;

View File

@ -49,7 +49,7 @@ namespace glm
typedef tmat4x4<T, P> transpose_type;
typedef T value_type;
# if GLM_META_PROG_HELPERS
# ifdef GLM_META_PROG_HELPERS
# if GLM_HAS_CONSTEXPR
static GLM_CONSTEXPR length_t components = 4;
static GLM_CONSTEXPR length_t cols = 4;

View File

@ -55,13 +55,13 @@ namespace glm
typedef tvec1<bool, P> bool_type;
typedef T value_type;
# if GLM_META_PROG_HELPERS
# ifdef GLM_META_PROG_HELPERS
# if GLM_HAS_CONSTEXPR
static GLM_CONSTEXPR length_t components = 1;
static GLM_CONSTEXPR precision precision = P;
# else
static const length_t components = 1;
static const precision precision = P;
static const precision prec = P;
# endif
# endif//GLM_META_PROG_HELPERS

View File

@ -55,7 +55,7 @@ namespace glm
typedef tvec2<bool, P> bool_type;
typedef T value_type;
# if GLM_META_PROG_HELPERS
# ifdef GLM_META_PROG_HELPERS
# if GLM_HAS_CONSTEXPR
static GLM_CONSTEXPR length_t components = 2;
static GLM_CONSTEXPR precision prec = P;

View File

@ -55,7 +55,7 @@ namespace glm
typedef tvec3<bool, P> bool_type;
typedef T value_type;
# if GLM_META_PROG_HELPERS
# ifdef GLM_META_PROG_HELPERS
# if GLM_HAS_CONSTEXPR
static GLM_CONSTEXPR length_t components = 3;
static GLM_CONSTEXPR precision prec = P;

View File

@ -109,7 +109,7 @@ namespace detail
typedef tvec4<bool, P> bool_type;
typedef T value_type;
# if GLM_META_PROG_HELPERS
# ifdef GLM_META_PROG_HELPERS
# if GLM_HAS_CONSTEXPR
static GLM_CONSTEXPR length_t components = 4;
static GLM_CONSTEXPR precision prec = P;

View File

@ -65,7 +65,7 @@ namespace glm
typedef tquat<T, P> type;
typedef T value_type;
# if GLM_META_PROG_HELPERS
# ifdef GLM_META_PROG_HELPERS
# if GLM_HAS_CONSTEXPR
static GLM_CONSTEXPR length_t components = 4;
static GLM_CONSTEXPR precision prec = P;

View File

@ -64,7 +64,7 @@ namespace glm
typedef T value_type;
typedef glm::tquat<T, P> part_type;
# if GLM_META_PROG_HELPERS
# ifdef GLM_META_PROG_HELPERS
# if GLM_HAS_CONSTEXPR
static GLM_CONSTEXPR length_t components = 8;
static GLM_CONSTEXPR precision prec = P;

View File

@ -71,7 +71,7 @@ namespace detail
typedef fmat4x4SIMD type;
typedef fmat4x4SIMD transpose_type;
# if GLM_META_PROG_HELPERS
# ifdef GLM_META_PROG_HELPERS
# if GLM_HAS_CONSTEXPR
static GLM_CONSTEXPR length_t components = 4;
static GLM_CONSTEXPR length_t cols = 4;

View File

@ -76,7 +76,7 @@ namespace detail
typedef fquatSIMD type;
typedef tquat<bool, defaultp> bool_type;
# if GLM_META_PROG_HELPERS
# ifdef GLM_META_PROG_HELPERS
# if GLM_HAS_CONSTEXPR
static GLM_CONSTEXPR length_t components = 4;
static GLM_CONSTEXPR precision prec = defaultp;

View File

@ -99,7 +99,7 @@ namespace detail
typedef fvec4SIMD type;
typedef tvec4<bool, highp> bool_type;
# if GLM_META_PROG_HELPERS
# ifdef GLM_META_PROG_HELPERS
# if GLM_HAS_CONSTEXPR
static GLM_CONSTEXPR length_t components = 4;
static GLM_CONSTEXPR precision prec = defaultp;

View File

@ -29,6 +29,7 @@
/// @author Christophe Riccio
///////////////////////////////////////////////////////////////////////////////////
#define GLM_META_PROG_HELPERS
#define GLM_SWIZZLE
#include <glm/vector_relational.hpp>
#include <glm/vec2.hpp>

View File

@ -29,6 +29,7 @@
/// @author Christophe Riccio
///////////////////////////////////////////////////////////////////////////////////
#define GLM_META_PROG_HELPERS
#define GLM_SWIZZLE
#include <glm/vector_relational.hpp>
#include <glm/geometric.hpp>

View File

@ -30,6 +30,7 @@
///////////////////////////////////////////////////////////////////////////////////
//#define GLM_FORCE_AVX2
#define GLM_META_PROG_HELPERS
#define GLM_SWIZZLE
#include <glm/vector_relational.hpp>
#include <glm/vec2.hpp>

View File

@ -29,6 +29,7 @@
/// @author Christophe Riccio
///////////////////////////////////////////////////////////////////////////////////
#define GLM_META_PROG_HELPERS
#include <glm/gtc/quaternion.hpp>
#include <glm/gtc/epsilon.hpp>
#include <glm/vector_relational.hpp>