From 54e1ad43c7629d85f88cefbecdfe3e60e8c42294 Mon Sep 17 00:00:00 2001 From: Tavian Barnes Date: Tue, 17 Nov 2009 16:06:13 -0500 Subject: Use "diffuse" instead of "specular" for diffuse finish. --- libdimension/dimension/finishes.h | 4 ++-- libdimension/finishes.c | 8 ++++---- tests/libdimension/tests.c | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libdimension/dimension/finishes.h b/libdimension/dimension/finishes.h index da18a6f..5f00d43 100644 --- a/libdimension/dimension/finishes.h +++ b/libdimension/dimension/finishes.h @@ -25,7 +25,7 @@ #ifndef DIMENSION_FINISHES_H #define DIMENSION_FINISHES_H -/* A specular finish */ -dmnsn_finish *dmnsn_new_specular_finish(); +/* A diffuse finish */ +dmnsn_finish *dmnsn_new_diffuse_finish(); #endif /* DIMENSION_FINISHES_H */ diff --git a/libdimension/finishes.c b/libdimension/finishes.c index d78bc96..befe6c6 100644 --- a/libdimension/finishes.c +++ b/libdimension/finishes.c @@ -22,20 +22,20 @@ #include /* For malloc */ static dmnsn_color -dmnsn_specular_finish_fn(const dmnsn_finish *finish, +dmnsn_diffuse_finish_fn(const dmnsn_finish *finish, dmnsn_color color, dmnsn_vector x0, dmnsn_vector normal, dmnsn_vector reflected) { return dmnsn_color_mul(dmnsn_vector_dot(normal, reflected), color); } -/* A specular finish */ +/* A diffuse finish */ dmnsn_finish * -dmnsn_new_specular_finish() +dmnsn_new_diffuse_finish() { dmnsn_finish *finish = dmnsn_new_finish(); if (finish) { - finish->finish_fn = &dmnsn_specular_finish_fn; + finish->finish_fn = &dmnsn_diffuse_finish_fn; } return finish; } diff --git a/tests/libdimension/tests.c b/tests/libdimension/tests.c index 5daa5be..85c43a6 100644 --- a/tests/libdimension/tests.c +++ b/tests/libdimension/tests.c @@ -31,7 +31,7 @@ dmnsn_new_default_scene() } /* Default finish */ - scene->default_texture->finish = dmnsn_new_specular_finish(); + scene->default_texture->finish = dmnsn_new_diffuse_finish(); /* Background color */ dmnsn_sRGB sRGB = { .R = 0.0, .G = 0.0, .B = 0.1 }; -- cgit v1.2.3