From c047097ff3ef048c4e86443ad436c53a8f6ad151 Mon Sep 17 00:00:00 2001 From: cnr-isti-vclab Date: Thu, 9 Sep 2004 12:51:28 +0000 Subject: [PATCH] corrected ColorRamp code (template specialization) --- vcg/space/color4.h | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/vcg/space/color4.h b/vcg/space/color4.h index 5c39f535..ce4e0408 100644 --- a/vcg/space/color4.h +++ b/vcg/space/color4.h @@ -24,6 +24,9 @@ History $Log: not supported by cvs2svn $ +Revision 1.10 2004/09/09 08:39:33 cignoni +added a 'template<>' to the specialized constructors from a enum + Revision 1.9 2004/09/03 13:58:48 fasano Corretto errore sintattico nelle specializzazioni parziali (float e char) di due costruttori di Color4 @@ -224,19 +227,19 @@ template inline void Color4::ColorRamp(const float &minf,const float &maxf ,float v ) { if(minf>maxf) { ColorRamp(maxf,minf,maxf+(minf-v)); return; } - if(v < minf ) { *this=Color4(Color4::Red); return; } - + if(v < minf ) { *this=Color4(Color4::Red); return; } + float step=(maxf-minf)/4; v-=minf; - if(v::Red), Color4(Color4::Yellow),v/step); return;} + if(v(Color4::Red), Color4(Color4::Yellow),v/step); return;} v-=step; - if(v::Yellow),Color4(Color4::Green),v/step);return;} + if(v(Color4::Yellow),Color4(Color4::Green),v/step);return;} v-=step; - if(v::Green),Color4(Color4::Cyan),v/step); return;} + if(v(Color4::Green),Color4(Color4::Cyan),v/step); return;} v-=step; - if(v::Cyan),Color4(Color4::Blue),v/step); return;} + if(v(Color4::Cyan),Color4(Color4::Blue),v/step); return;} - *this= Color4(Color4::Blue); + *this= Color4(Color4::Blue); }