From 0262431a3c78738a0bf44d6f4e54b0942651f59e Mon Sep 17 00:00:00 2001 From: Julian T Date: Mon, 9 Mar 2020 15:44:21 +0100 Subject: Added redundant lambert stuff --- main.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) (limited to 'main.c') diff --git a/main.c b/main.c index 508efa7..f1b49e7 100644 --- a/main.c +++ b/main.c @@ -23,24 +23,18 @@ int main() material_t m; vector_set(&m.color, 1, 1, 1); - m.defuse = 0.0; - m.specular = 0.0; - m.shine = 40; + material_set_phong(&m, 0, 0, 40); m.reflective = 0.5; material_t m2; vector_set(&m2.color, 0.1, 1, 0.7); - m2.defuse = 1; - m2.specular = 0.7; - m2.shine = 10; + material_set_phong(&m2, 1, 0.7, 10); m2.reflective = 0.0; material_t mpl; //vector_set(&mpl.color, 0, 0.396, 0.7019); vector_set(&mpl.color, 1, 1, 1); - mpl.defuse = 1; - mpl.specular = 0.0; - mpl.shine = 50; + material_set_phong(&mpl, 1, 0.0, 50); mpl.reflective = 0.0; vector_set(&s.view.position, 0, 14, 8); @@ -54,8 +48,9 @@ int main() add_sphere(&s, vector_set(NULL, 3, -1, 5), 5, &m); add_sphere(&s, vector_set(NULL, 3, 7, 3), 2, &m2); add_plane(&s, vector_set(NULL, 0, 0, 2), vector_set(NULL, 0, 0, 1), &mpl); - add_plane(&s, vector_set(NULL, 0, -20, 0), vector_set(NULL, 0, 1, 0), &mpl); - add_light(&s, vector_set(NULL, 20, 0, 20), color_set(NULL, 255, 255, 255), color_set(NULL, 150, 150, 150)); + //add_plane(&s, vector_set(NULL, 0, -20, 0), vector_set(NULL, 0, 1, 0), &mpl); + //add_light(&s, vector_set(NULL, 20, 0, 20), color_set(NULL, 255, 255, 255), color_set(NULL, 150, 150, 150)); + add_light(&s, vector_set(NULL, 20, 0, 30), color_set(NULL, 255, 255, 255), color_set(NULL, 150, 150, 150)); //add_light(&s, vector_set(NULL, 0, 10, 20), color_set(NULL, 255, 255, 255), color_set(NULL, 150, 150, 150)); pgm_write_header(stdout, TESTW, TESTH); -- cgit v1.2.3