From ef2fdaab863af71f7afcf23b469f4f220c538d8b Mon Sep 17 00:00:00 2001 From: jacekpoz Date: Tue, 13 Aug 2024 14:22:09 +0200 Subject: [PATCH] improve all vector types by deunionifying them --- include/ptk_vec.h | 64 +++++++++++++++++++++++------------------------ 1 file changed, 31 insertions(+), 33 deletions(-) diff --git a/include/ptk_vec.h b/include/ptk_vec.h index 210f020..fa5d1b1 100644 --- a/include/ptk_vec.h +++ b/include/ptk_vec.h @@ -1,65 +1,63 @@ #ifndef PTK_PTK_VEC_H_ #define PTK_PTK_VEC_H_ -typedef union { - struct { // PtkVec2, PtkPos - float x; - float y; - }; - struct { // PtkSize - float w; - float h; - }; - struct { // PtkSize - float width; - float height; - }; +typedef struct { + float x; + float y; } PtkVec2; typedef PtkVec2 PtkPos; -typedef PtkVec2 PtkSize; typedef union { - struct { // PtkVec3 - float x; - float y; - float z; + struct { + float w; + float h; }; - struct { // PtkColor + struct { + float width; + float height; + }; +} PtkSize; + +typedef struct { + float x; + float y; + float z; +} PtkVec3; + +typedef union { + struct { float r; float g; float b; }; - struct { // PtkColor + struct { float red; float green; float blue; }; -} PtkVec3; +} PtkColor; -typedef PtkVec3 PtkColor; +typedef struct { + float x; + float y; + float z; + float w; +} PtkVec4; typedef union { - struct { // PtkVec4 - float x; - float y; - float z; - float w; - }; - struct { // PtkColorA + struct { float r; float g; float b; float a; }; - struct { // PtkColorA + struct { float red; float green; float blue; float alpha; }; -} PtkVec4; - -typedef PtkVec4 PtkColorA; +} PtkColorA; #endif // PTK_PTK_VEC_H_