X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fcolor.cpp;h=d70ed3f752b1020d87ec7f726a48df31de959360;hb=76bc5e374b4f97da13e0ec38f3bd47f2704f864a;hp=101e883ee4e0189931c12c64e59d3bd2d537ff1f;hpb=e8a065f2385c219c511b57dac52786120bfa097d;p=synfig.git diff --git a/synfig-core/trunk/src/synfig/color.cpp b/synfig-core/trunk/src/synfig/color.cpp index 101e883..d70ed3f 100644 --- a/synfig-core/trunk/src/synfig/color.cpp +++ b/synfig-core/trunk/src/synfig/color.cpp @@ -1,8 +1,8 @@ /* === S Y N F I G ========================================================= */ -/*! \file color.h +/*! \file color.cpp ** \brief Color Class ** -** $Id: color.cpp,v 1.2 2005/01/23 04:03:21 darco Exp $ +** $Id$ ** ** \legal ** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley @@ -32,6 +32,8 @@ #include #include "color.h" #include +#include +#include #endif @@ -45,12 +47,70 @@ using namespace std; /* === G L O B A L S ======================================================= */ +String Color::hex_; + /* === P R O C E D U R E S ================================================= */ /* === M E T H O D S ======================================================= */ +ColorReal +Color::hex2real(String s) +{ + std::istringstream i(s); + int n; + i.fill('0'); + if (!(i >> hex >> n)) + throw String("bad conversion from hex string \"") + s + String("\""); + return n / 255.0f; +} + +const String +Color::real2hex(ColorReal c) +{ + std::ostringstream o; + o.width(2); + o.fill('0'); + if (c<0) c = 0; + if (c>1) c = 1; + o << hex << int(c*255.0f); + return o.str(); +} + +void +Color::set_hex(String& hex) +{ + value_type r, g, b; + try + { + if (hex.size() == 1) + { + r = hex2real(hex.substr(0,1)+hex.substr(0,1)); + r_ = g_ = b_ = r; + } + else if (hex.size() == 3) + { + r = hex2real(hex.substr(0,1)+hex.substr(0,1)); + g = hex2real(hex.substr(1,1)+hex.substr(1,1)); + b = hex2real(hex.substr(2,1)+hex.substr(2,1)); + r_ = r; g_ = g; b_ = b; + } + else if (hex.size() == 6) + { + r = hex2real(hex.substr(0,2)); + g = hex2real(hex.substr(2,2)); + b = hex2real(hex.substr(4,2)); + r_ = r; g_ = g; b_ = b; + } + } + catch (string s) + { + printf("caught <%s>\n", s.c_str()); + return; + } +} + #if 0 Color& Color::rotate_uv(const Angle& theta)const @@ -66,7 +126,7 @@ Color::rotate_uv(const Angle& theta)const const float u(get_u()), v(get_v()); - + return set_uv(b*u-a*v,a*u+b*v); //return YUV(get_y(),b*u-a*v,a*u+b*v,get_a()); //*/ @@ -77,7 +137,7 @@ Color Color::clamped_negative()const { Color ret=*this; - + if(ret.a_==0) return alpha(); @@ -162,13 +222,13 @@ blendfunc_COMPOSITE(Color &src,Color &dest,float amount) // if a_arc==0.0 //if(fabsf(a_src)COLOR_EPSILON) // if(a_out>COLOR_EPSILON || a_out<-COLOR_EPSILON) @@ -230,7 +290,7 @@ static Color blendfunc_BRIGHTEN(Color &a,Color &b,float amount) { const float alpha(a.get_a()*amount); - + if(b.get_r()(a.get_r()-1.0f)*alpha+1.0f) b.set_r((a.get_r()-1.0f)*alpha+1.0f); @@ -257,7 +317,7 @@ blendfunc_DARKEN(Color &a,Color &b,float amount) if(b.get_b()>(a.get_b()-1.0f)*alpha+1.0f) b.set_b((a.get_b()-1.0f)*alpha+1.0f); - + return b; } @@ -318,7 +378,7 @@ blendfunc_DIVIDE(Color &a,Color &b,float amount) // This causes DIVIDE to bias toward positive values, but the effect is // really neglegable. There is a reason why we use COLOR_EPSILON--we // want the change to be imperceptable. - + b.set_r(((b.get_r()/(a.get_r()+COLOR_EPSILON))-b.get_r())*(amount)+b.get_r()); b.set_g(((b.get_g()/(a.get_g()+COLOR_EPSILON))-b.get_g())*(amount)+b.get_g()); b.set_b(((b.get_b()/(a.get_b()+COLOR_EPSILON))-b.get_b())*(amount)+b.get_b()); @@ -331,7 +391,7 @@ blendfunc_COLOR(Color &a,Color &b,float amount) { Color temp(b); temp.set_uv(a.get_u(),a.get_v()); - return (temp-b)*amount*a.get_a()+b; + return (temp-b)*amount*a.get_a()+b; } static Color @@ -390,13 +450,13 @@ blendfunc_SCREEN(Color &a,Color &b,float amount) a.set_r(1.0-(1.0f-a.get_r())*(1.0f-b.get_r())); a.set_g(1.0-(1.0f-a.get_g())*(1.0f-b.get_g())); a.set_b(1.0-(1.0f-a.get_b())*(1.0f-b.get_b())); - + return blendfunc_ONTO(a,b,amount); } static Color blendfunc_OVERLAY(Color &a,Color &b,float amount) -{ +{ if(amount<0) a=~a, amount=-amount; Color rm; @@ -410,7 +470,7 @@ blendfunc_OVERLAY(Color &a,Color &b,float amount) rs.set_b(1.0-(1.0f-a.get_b())*(1.0f-b.get_b())); Color& ret(a); - + ret.set_r(a.get_r()*rs.get_r() + (1.0-a.get_r())*rm.get_r()); ret.set_g(a.get_g()*rs.get_g() + (1.0-a.get_g())*rm.get_g()); ret.set_b(a.get_b()*rs.get_b() + (1.0-a.get_b())*rm.get_b()); @@ -467,7 +527,7 @@ Color::blend(Color a, Color b,float amount, Color::BlendMethod type) #endif } #endif - + /* if(!a.is_valid()&&b.is_valid()) return b; @@ -484,17 +544,17 @@ Color::blend(Color a, Color b,float amount, Color::BlendMethod type) #endif } */ - + // No matter what blend method is being used, // if the amount is equal to zero, then only B // will shine through if(fabsf(amount)<=COLOR_EPSILON)return b; - + assert(type