diff --git a/examples/amogus.c b/examples/amogus.c index f87c477..ce9bc1f 100644 --- a/examples/amogus.c +++ b/examples/amogus.c @@ -8,7 +8,7 @@ int main(void) { return EXIT_FAILURE; } - const PtkColor red = { .r = 1.0f, .g = 0.0f, .b = 0.0f }; + const PtkRGB red = { .r = 1.0f, .g = 0.0f, .b = 0.0f }; return ptk_run(PTK_BOX( ptk_rect((PtkPos){ .x = 250.0f, .y = 200.0f }, (PtkSize){ .w = 300.0f, .h = 200.0f }, red), @@ -16,6 +16,6 @@ int main(void) { ptk_rect((PtkPos){ .x = 450.0f, .y = 400.0f }, (PtkSize){ .w = 100.0f, .h = 100.0f }, red), ptk_circle((PtkPos){ .x = 400.0f, .y = 200.0f }, 150.0f, red), ptk_rect((PtkPos){ .x = 200.0f, .y = 200.0f }, (PtkSize){ .w = 50.0f, .h = 125.0f }, red), - ptk_ellipse((PtkPos){ .x = 500.0f, .y = 200.0f }, (PtkSize){ .w = 100.0f, .h = 50.0f }, (PtkColor){ .r = 1.0f, .g = 1.0f, .b = 1.0f }), + ptk_ellipse((PtkPos){ .x = 500.0f, .y = 200.0f }, (PtkSize){ .w = 100.0f, .h = 50.0f }, (PtkRGB){ .r = 1.0f, .g = 1.0f, .b = 1.0f }), )); } diff --git a/examples/button.c b/examples/button.c index 8bb7b24..be4a0a0 100644 --- a/examples/button.c +++ b/examples/button.c @@ -35,7 +35,7 @@ int main(void) { r = (PtkRect *)ptk_rect( (PtkPos){ .x = 100.0f, .y = 100.0f }, (PtkSize){ .w = 100.0f, .h = 50.0f }, - (PtkColor){ .r = 1.0f, .g = 1.0f, .b = 1.0f } + (PtkRGB){ .r = 1.0f, .g = 1.0f, .b = 1.0f } ); return ptk_run( diff --git a/include/ptk.h b/include/ptk.h index 0926f89..fb266ba 100644 --- a/include/ptk.h +++ b/include/ptk.h @@ -42,19 +42,19 @@ PTK_COMPONENT_DEFINE(PtkComponent, ); PTK_COMPONENT_DEFINE(PtkTriangle, PtkPos vertices[3]; - PtkColor color; + PtkRGB color; ); PTK_COMPONENT_DEFINE(PtkRect, PtkPos top_left; PtkSize size; - PtkColor color; + PtkRGB color; ); PTK_COMPONENT_DEFINE(PtkEllipse, PtkPos center; PtkSize radii; - PtkColor color; + PtkRGB color; ); typedef void (*MouseButtonCallback)(const int button, const int mods); @@ -64,11 +64,11 @@ PTK_COMPONENT_DEFINE(PtkClickable, ); PtkHandle ptk_box(const size_t child_count, PtkHandle *children); -PtkHandle ptk_triangle(const PtkPos vertices[3], const PtkColor color); -PtkHandle ptk_rect(const PtkPos top_left, const PtkSize size, const PtkColor color); -PtkHandle ptk_square(const PtkPos top_left, const float size, const PtkColor color); -PtkHandle ptk_ellipse(const PtkPos center, const PtkSize radii, const PtkColor color); -PtkHandle ptk_circle(const PtkPos center, const float radius, const PtkColor color); +PtkHandle ptk_triangle(const PtkPos vertices[3], const PtkRGB color); +PtkHandle ptk_rect(const PtkPos top_left, const PtkSize size, const PtkRGB color); +PtkHandle ptk_square(const PtkPos top_left, const float size, const PtkRGB color); +PtkHandle ptk_ellipse(const PtkPos center, const PtkSize radii, const PtkRGB color); +PtkHandle ptk_circle(const PtkPos center, const float radius, const PtkRGB color); PtkHandle ptk_clickable(PtkHandle hitbox, const MouseButtonCallback on_press); #define PTK_BOX(...) ptk_box(sizeof((PtkHandle []){ __VA_ARGS__ }) / sizeof(PtkHandle), (PtkHandle []) { __VA_ARGS__ }) diff --git a/include/ptk_color.h b/include/ptk_color.h index b94a5e8..103a7d4 100644 --- a/include/ptk_color.h +++ b/include/ptk_color.h @@ -12,7 +12,7 @@ typedef union { float green; float blue; }; -} PtkColor; +} PtkRGB; typedef union { struct { @@ -40,7 +40,7 @@ typedef union { float blue; float alpha; }; -} PtkColorA; +} PtkRGBA; typedef union { struct { diff --git a/src/ptk.c b/src/ptk.c index f2e674b..da1d76f 100644 --- a/src/ptk.c +++ b/src/ptk.c @@ -143,7 +143,7 @@ PtkHandle ptk_box(const size_t child_count, PtkHandle *children) { return (PtkHandle)ret; } -PtkHandle ptk_triangle(const PtkPos vertices[3], const PtkColor color) { +PtkHandle ptk_triangle(const PtkPos vertices[3], const PtkRGB color) { PtkTriangle *ret = malloc(sizeof(PtkTriangle)); *ret = (PtkTriangle){ .type = PTK_COMPONENT_TYPE_TRIANGLE, @@ -154,7 +154,7 @@ PtkHandle ptk_triangle(const PtkPos vertices[3], const PtkColor color) { return (PtkHandle)ret; } -PtkHandle ptk_rect(const PtkPos top_left, const PtkSize size, const PtkColor color) { +PtkHandle ptk_rect(const PtkPos top_left, const PtkSize size, const PtkRGB color) { PtkRect *ret = malloc(sizeof(PtkRect)); *ret = (PtkRect){ .type = PTK_COMPONENT_TYPE_RECT, @@ -166,11 +166,11 @@ PtkHandle ptk_rect(const PtkPos top_left, const PtkSize size, const PtkColor col return (PtkHandle)ret; } -PtkHandle ptk_square(const PtkPos top_left, const float size, const PtkColor color) { +PtkHandle ptk_square(const PtkPos top_left, const float size, const PtkRGB color) { return ptk_rect(top_left, (PtkSize){ .w = size, .h = size }, color); } -PtkHandle ptk_ellipse(const PtkPos center, const PtkSize radii, const PtkColor color) { +PtkHandle ptk_ellipse(const PtkPos center, const PtkSize radii, const PtkRGB color) { PtkEllipse *ret = malloc(sizeof(PtkEllipse)); *ret = (PtkEllipse){ .type = PTK_COMPONENT_TYPE_ELLIPSE, @@ -182,7 +182,7 @@ PtkHandle ptk_ellipse(const PtkPos center, const PtkSize radii, const PtkColor c return (PtkHandle)ret; } -PtkHandle ptk_circle(const PtkPos center, const float radius, const PtkColor color) { +PtkHandle ptk_circle(const PtkPos center, const float radius, const PtkRGB color) { return ptk_ellipse(center, (PtkSize){ .w = radius, .h = radius }, color); } diff --git a/src/ptk_vk/components.h b/src/ptk_vk/components.h index 79373c1..666ddf6 100644 --- a/src/ptk_vk/components.h +++ b/src/ptk_vk/components.h @@ -8,7 +8,7 @@ typedef struct { PtkPos pos; - PtkColor color; + PtkRGB color; PtkComponentType shape_type; PtkVec2 uv; } Vertex;