External/cglm
1
0
Fork 0
mirror of https://github.com/recp/cglm.git synced 2025-10-04 09:08:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Re-order struct type contents array-first

Browse Source 
So that initializers will prefer the array entry, rather than trying to
initialize the anonymous struct.
This commit is contained in:
Carsten Hartenfels
2019-11-24 13:33:38 -05:00
parent 11dae5126b
commit c8211b3a62
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
include/cglm/types-struct.h
View File

@@ -11,16 +11,17 @@
#include "types.h" #include "types.h"
typedef union vec2s { typedef union vec2s {
vec2 raw;
#ifndef CGLM_NO_ANONYMOUS_STRUCT #ifndef CGLM_NO_ANONYMOUS_STRUCT
struct { struct {
float x; float x;
float y; float y;
}; };
#endif #endif
vec2 raw;
} vec2s; } vec2s;
typedef union vec3s { typedef union vec3s {
vec3 raw;
#ifndef CGLM_NO_ANONYMOUS_STRUCT #ifndef CGLM_NO_ANONYMOUS_STRUCT
struct { struct {
float x; float x;
@@ -28,10 +29,10 @@ typedef union vec3s {
float z; float z;
}; };
#endif #endif
vec3 raw;
} vec3s; } vec3s;
typedef union ivec3s { typedef union ivec3s {
ivec3 raw;
#ifndef CGLM_NO_ANONYMOUS_STRUCT #ifndef CGLM_NO_ANONYMOUS_STRUCT
struct { struct {
int x; int x;
@@ -39,10 +40,10 @@ typedef union ivec3s {
int z; int z;
}; };
#endif #endif
ivec3 raw;
} ivec3s; } ivec3s;
typedef union CGLM_ALIGN_IF(16) vec4s { typedef union CGLM_ALIGN_IF(16) vec4s {
vec4 raw;
#ifndef CGLM_NO_ANONYMOUS_STRUCT #ifndef CGLM_NO_ANONYMOUS_STRUCT
struct { struct {
float x; float x;
@@ -51,10 +52,10 @@ typedef union CGLM_ALIGN_IF(16) vec4s {
float w; float w;
}; };
#endif #endif
vec4 raw;
} vec4s; } vec4s;
typedef union CGLM_ALIGN_IF(16) versors { typedef union CGLM_ALIGN_IF(16) versors {
vec4 raw;
#ifndef CGLM_NO_ANONYMOUS_STRUCT #ifndef CGLM_NO_ANONYMOUS_STRUCT
struct { struct {
float x; float x;
@@ -68,10 +69,11 @@ typedef union CGLM_ALIGN_IF(16) versors {
float real; float real;
}; };
#endif #endif
vec4 raw;
} versors; } versors;
typedef union mat3s { typedef union mat3s {
mat3 raw;
vec3s col[3];
#ifndef CGLM_NO_ANONYMOUS_STRUCT #ifndef CGLM_NO_ANONYMOUS_STRUCT
struct { struct {
float m00, m01, m02; float m00, m01, m02;
@@ -79,11 +81,11 @@ typedef union mat3s {
float m20, m21, m22; float m20, m21, m22;
}; };
#endif #endif
vec3s col[3];
mat3 raw;
} mat3s; } mat3s;
typedef union CGLM_ALIGN_MAT mat4s { typedef union CGLM_ALIGN_MAT mat4s {
mat4 raw;
vec4s col[4];
#ifndef CGLM_NO_ANONYMOUS_STRUCT #ifndef CGLM_NO_ANONYMOUS_STRUCT
struct { struct {
float m00, m01, m02, m03; float m00, m01, m02, m03;
@@ -92,8 +94,6 @@ typedef union CGLM_ALIGN_MAT mat4s {
float m30, m31, m32, m33; float m30, m31, m32, m33;
}; };
#endif #endif
vec4s col[4];
mat4 raw;
} mat4s; } mat4s;
#endif /* cglm_types_struct_h */ #endif /* cglm_types_struct_h */