Merge branch 'master' into cglm-structs

This commit is contained in:
Alejandro Coto Gutiérrez
2019-05-08 10:10:10 -05:00
committed by GitHub
4 changed files with 5 additions and 10 deletions

View File

@@ -38,12 +38,7 @@ typedef int ivec3[3];
typedef CGLM_ALIGN_IF(16) float vec4[4];
typedef vec4 versor;
typedef vec3 mat3[3];
#ifdef __AVX__
typedef CGLM_ALIGN_IF(32) vec4 mat4[4];
#else
typedef CGLM_ALIGN_IF(16) vec4 mat4[4];
#endif
typedef CGLM_ALIGN_MAT vec4 mat4[4];
#define GLM_E 2.71828182845904523536028747135266250 /* e */
#define GLM_LOG2E 1.44269504088896340735992468100189214 /* log2(e) */

View File

@@ -10,6 +10,6 @@
#define CGLM_VERSION_MAJOR 0
#define CGLM_VERSION_MINOR 5
#define CGLM_VERSION_PATCH 4
#define CGLM_VERSION_PATCH 5
#endif /* cglm_version_h */