diff --git a/src/types/gryphn_color.h b/src/types/gryphn_color.h index 4c0d66a..50b21f6 100644 --- a/src/types/gryphn_color.h +++ b/src/types/gryphn_color.h @@ -1,8 +1,6 @@ #include "../math/gryphn_vec4.h" -#ifdef GN_UTILS_CPP -struct gnColor { -public: +typedef struct gnColor { union { struct { int r, g, b; @@ -14,7 +12,8 @@ public: float alpha; }; }; -public: + + #ifdef GN_UTILS_CPP gnColor(int red, int green, int blue, float alpha = 1.0) { this->red = red; this->green = green; @@ -28,19 +27,5 @@ public: this->blue = color; this->alpha = alpha; } -}; -#else -typedef struct gnColor { - union { - struct { - int r, g, b; - float a; - }; - - struct { - int red, green, blue; - float alpha; - }; - }; + #endif } gnColor; -#endif