X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fcolor.cpp;h=db89efe32c3876231129c2227d8a35deb5115276;hb=d62300935546505305385dba525025a548c7b26b;hp=2799fc1bbfbec74070901699f18c71aac1385d87;hpb=28f28705612902c15cd0702cc891fba35bf2d2df;p=synfig.git diff --git a/synfig-core/trunk/src/synfig/color.cpp b/synfig-core/trunk/src/synfig/color.cpp index 2799fc1..db89efe 100644 --- a/synfig-core/trunk/src/synfig/color.cpp +++ b/synfig-core/trunk/src/synfig/color.cpp @@ -1,20 +1,21 @@ /* === 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 $ ** ** \legal -** Copyright (c) 2002 Robert B. Quattlebaum Jr. +** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley ** -** This software and associated documentation -** are CONFIDENTIAL and PROPRIETARY property of -** the above-mentioned copyright holder. +** This package is free software; you can redistribute it and/or +** modify it under the terms of the GNU General Public License as +** published by the Free Software Foundation; either version 2 of +** the License, or (at your option) any later version. ** -** You may not copy, print, publish, or in any -** other way distribute this software without -** a prior written agreement with -** the copyright holder. +** This package is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +** General Public License for more details. ** \endlegal */ /* ========================================================================= */ @@ -65,7 +66,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()); //*/ @@ -76,7 +77,7 @@ Color Color::clamped_negative()const { Color ret=*this; - + if(ret.a_==0) return alpha(); @@ -161,13 +162,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) @@ -229,7 +230,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); @@ -256,7 +257,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; } @@ -317,7 +318,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()); @@ -330,7 +331,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 @@ -389,13 +390,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; @@ -409,7 +410,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()); @@ -466,7 +467,7 @@ Color::blend(Color a, Color b,float amount, Color::BlendMethod type) #endif } #endif - + /* if(!a.is_valid()&&b.is_valid()) return b; @@ -483,17 +484,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