Update colour_t to use a union
This commit is contained in:
@@ -31,7 +31,8 @@ colour_t trace_ray(vec3f_t origin, vec3f_t direction, f32 t_min, f32 t_max,
|
||||
const scene_t *scene, colour_t default_colour);
|
||||
|
||||
i32 main(i32 argc, char *argv[]) {
|
||||
colour_t bg = (colour_t){.r = 27, .g = 38, .b = 79, .a = 255};
|
||||
colour_t bg =
|
||||
(colour_t){.rgba.r = 27, .rgba.g = 38, .rgba.b = 79, .rgba.a = 255};
|
||||
vec3f_t camera = {.x = 0.0f, .y = 0.0f, .z = 0.0f};
|
||||
vec3f_t viewport = {.x = 1.0f, .y = 1.0f, .z = 1.0f};
|
||||
|
||||
@@ -48,17 +49,23 @@ i32 main(i32 argc, char *argv[]) {
|
||||
(sphere_t){
|
||||
.radius = 1.0f,
|
||||
.centre = (vec3f_t){.x = 0.0f, .y = -1.0f, .z = 3.0f},
|
||||
.colour = (colour_t){.r = 245, .g = 238, .b = 158, .a = 255},
|
||||
.colour =
|
||||
(colour_t){
|
||||
.rgba.r = 245, .rgba.g = 238, .rgba.b = 158, .rgba.a = 255},
|
||||
},
|
||||
(sphere_t){
|
||||
.radius = 1.0f,
|
||||
.centre = (vec3f_t){.x = -2.0f, .y = 0.0f, .z = 4.0f},
|
||||
.colour = (colour_t){.r = 59, .g = 142, .b = 165, .a = 255},
|
||||
.colour =
|
||||
(colour_t){
|
||||
.rgba.r = 59, .rgba.g = 142, .rgba.b = 165, .rgba.a = 255},
|
||||
},
|
||||
(sphere_t){
|
||||
.radius = 1.0f,
|
||||
.centre = (vec3f_t){.x = 2.0f, .y = 0.0f, .z = 4.0f},
|
||||
.colour = (colour_t){.r = 171, .g = 52, .b = 40, .a = 255},
|
||||
.colour =
|
||||
(colour_t){
|
||||
.rgba.r = 171, .rgba.g = 52, .rgba.b = 40, .rgba.a = 255},
|
||||
},
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user