X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Fmod_gradient%2Fcurvegradient.cpp;h=7d48f05f55a6ee4d9fd698020111ae56db81b363;hb=c3ad95144d148602f672e95ddda1f18fc35502f8;hp=3864c2d462e6e31c50e04d9b07cd570308d961f9;hpb=cc54c38609ee9745ad678e5e9b9d7d2912be9c95;p=synfig.git diff --git a/synfig-core/trunk/src/modules/mod_gradient/curvegradient.cpp b/synfig-core/trunk/src/modules/mod_gradient/curvegradient.cpp index 3864c2d..7d48f05 100644 --- a/synfig-core/trunk/src/modules/mod_gradient/curvegradient.cpp +++ b/synfig-core/trunk/src/modules/mod_gradient/curvegradient.cpp @@ -2,6 +2,8 @@ /*! \file curvegradient.cpp ** \brief Template Header ** +** $Id$ +** ** \legal ** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley ** @@ -77,12 +79,14 @@ inline float calculate_distance(const std::vector& bline) float dist(0); + if (bline.empty()) return dist; + next=bline.begin(); //if(loop) // iter=--bline.end(); //else - iter=next++; + iter=next++; for(;next!=end;iter=next++) { @@ -91,8 +95,7 @@ inline float calculate_distance(const std::vector& bline) iter->get_vertex(), next->get_vertex(), iter->get_tangent2(), - next->get_tangent1() - ); + next->get_tangent1()); // dist+=calculate_distance(*iter,*next); dist+=curve.length(); @@ -102,7 +105,7 @@ inline float calculate_distance(const std::vector& bline) } std::vector::const_iterator -find_closest(const std::vector& bline,const Point& p,bool loop=false,float *bline_dist_ret=0) +find_closest(bool fast, const std::vector& bline,const Point& p,float& t,bool loop=false,float *bline_dist_ret=0) { std::vector::const_iterator iter,next,ret; std::vector::const_iterator end(bline.end()); @@ -115,6 +118,7 @@ find_closest(const std::vector& bline,const Point& p,bool lo float best_bline_dist(0); float best_bline_len(0); float total_bline_dist(0); + float best_pos(0); etl::hermite best_curve; if(loop) @@ -131,8 +135,7 @@ find_closest(const std::vector& bline,const Point& p,bool lo iter->get_vertex(), next->get_vertex(), iter->get_tangent2(), - next->get_tangent1() - ); + next->get_tangent1()); /* const float t(curve.find_closest(p,6,0.01,0.99)); @@ -147,23 +150,43 @@ find_closest(const std::vector& bline,const Point& p,bool lo len=curve.length(); } + if (fast) + { #define POINT_CHECK(x) bp=curve(x); thisdist=(bp-p).mag_squared(); if(thisdist& bline,const Point& p,bool lo inline void CurveGradient::sync() { - diff=(p2-p1); - const Real mag(diff.inv_mag()); - diff*=mag*mag; - curve_length_=calculate_distance(bline); } CurveGradient::CurveGradient(): - p1(1,1), - p2(-1,-1), offset(0,0), width(0.25), gradient(Color::black(), Color::white()), loop(false), zigzag(false), - perpendicular(false) + perpendicular(false), + fast(true) { bline.push_back(BLinePoint()); bline.push_back(BLinePoint()); @@ -230,6 +248,7 @@ CurveGradient::color_func(const Point &point_, int quality, float supersample)co } else { + float t; Point point(point_-offset); std::vector::const_iterator iter,next; @@ -238,76 +257,77 @@ CurveGradient::color_func(const Point &point_, int quality, float supersample)co // Taking into account looping. if(perpendicular) { - next=find_closest(bline,point,bline_loop,&perp_dist); + next=find_closest(fast,bline,point,t,bline_loop,&perp_dist); perp_dist/=curve_length_; } else { - next=find_closest(bline,point,bline_loop); + next=find_closest(fast,bline,point,t,bline_loop); } - iter=next++; - if(next==bline.end()) next=bline.begin(); - - // Setup the curve - etl::hermite curve( - iter->get_vertex(), - next->get_vertex(), - iter->get_tangent2(), - next->get_tangent1() + + iter=next++; + if(next==bline.end()) next=bline.begin(); + + // Setup the curve + etl::hermite curve( + iter->get_vertex(), + next->get_vertex(), + iter->get_tangent2(), + next->get_tangent1() ); - // Setup the derivative function - etl::derivative > deriv(curve); + // Setup the derivative function + etl::derivative > deriv(curve); - int search_iterations(7); + int search_iterations(7); - /*if(quality==0)search_iterations=8; - else if(quality<=2)search_iterations=10; - else if(quality<=4)search_iterations=8; - */ - if(!perpendicular) - { - if(quality<=6)search_iterations=7; - else if(quality<=7)search_iterations=6; - else if(quality<=8)search_iterations=5; - else search_iterations=4; - } - else - { - if(quality>7) - search_iterations=4; - } + /*if(quality==0)search_iterations=8; + else if(quality<=2)search_iterations=10; + else if(quality<=4)search_iterations=8; + */ + if(!perpendicular) + { + if(quality<=6)search_iterations=7; + else if(quality<=7)search_iterations=6; + else if(quality<=8)search_iterations=5; + else search_iterations=4; + } + else + { + if(quality>7) + search_iterations=4; + } - // Figure out the closest point on the curve - const float t(curve.find_closest(point,search_iterations)); + // Figure out the closest point on the curve + if (fast) + t = curve.find_closest(fast, point,search_iterations); - // Calculate our values - p1=curve(t); - tangent=deriv(t).norm(); + // Calculate our values + p1=curve(t); + tangent=deriv(t).norm(); - if(perpendicular) - { - tangent*=curve_length_; - p1-=tangent*perp_dist; - tangent=-tangent.perp(); - } - else - { - thickness=(next->get_width()-iter->get_width())*t+iter->get_width(); - } + if(perpendicular) + { + tangent*=curve_length_; + p1-=tangent*perp_dist; + tangent=-tangent.perp(); + } + else + { + thickness=(next->get_width()-iter->get_width())*t+iter->get_width(); + } //} } - if(!perpendicular) { - diff=tangent.perp()*thickness*width; - p1-=diff*0.5; - const Real mag(diff.inv_mag()); - supersample=supersample*mag; - diff*=mag*mag; - dist=((point_-offset)*diff-p1*diff); + diff=tangent.perp()*thickness*width; + p1-=diff*0.5; + const Real mag(diff.inv_mag()); + supersample=supersample*mag; + diff*=mag*mag; + dist=((point_-offset)*diff-p1*diff); } else { @@ -322,12 +342,12 @@ CurveGradient::color_func(const Point &point_, int quality, float supersample)co } else { - diff=tangent.perp(); - //p1-=diff*0.5; - const Real mag(diff.inv_mag()); - supersample=supersample*mag; - diff*=mag*mag; - dist=((point_-offset)*diff-p1*diff); + diff=tangent.perp(); + //p1-=diff*0.5; + const Real mag(diff.inv_mag()); + supersample=supersample*mag; + diff*=mag*mag; + dist=((point_-offset)*diff-p1*diff); } } @@ -345,14 +365,20 @@ CurveGradient::color_func(const Point &point_, int quality, float supersample)co { if(dist+supersample*0.5>1.0) { - Color pool(gradient(dist,supersample*0.5).premult_alpha()*(1.0-(dist-supersample*0.5))); - pool+=gradient((dist+supersample*0.5)-1.0,supersample*0.5).premult_alpha()*((dist+supersample*0.5)-1.0); + float left(supersample*0.5-(dist-1.0)); + float right(supersample*0.5+(dist-1.0)); + Color pool(gradient(1.0-(left*0.5),left).premult_alpha()*left/supersample); + if (zigzag) pool+=gradient(1.0-right*0.5,right).premult_alpha()*right/supersample; + else pool+=gradient(right*0.5,right).premult_alpha()*right/supersample; return pool.demult_alpha(); } if(dist-supersample*0.5<0.0) { - Color pool(gradient(dist,supersample*0.5).premult_alpha()*(dist+supersample*0.5)); - pool+=gradient(1.0-(dist-supersample*0.5),supersample*0.5).premult_alpha()*(-(dist-supersample*0.5)); + float left(supersample*0.5-dist); + float right(supersample*0.5+dist); + Color pool(gradient(right*0.5,right).premult_alpha()*right/supersample); + if (zigzag) pool+=gradient(left*0.5,left).premult_alpha()*left/supersample; + else pool+=gradient(1.0-left*0.5,left).premult_alpha()*left/supersample; return pool.demult_alpha(); } } @@ -360,9 +386,8 @@ CurveGradient::color_func(const Point &point_, int quality, float supersample)co } float -CurveGradient::calc_supersample(const synfig::Point &x, float pw,float ph)const +CurveGradient::calc_supersample(const synfig::Point &/*x*/, float pw,float /*ph*/)const { -// return pw/(p2-p1).mag(); return pw; } @@ -381,24 +406,11 @@ CurveGradient::hit_check(synfig::Context context, const synfig::Point &point)con bool CurveGradient::set_param(const String & param, const ValueBase &value) { - if(param=="p1" && value.same_as(p1)) - { - p1=value.get(p1); - sync(); - return true; - } - if(param=="p2" && value.same_as(p2)) - { - p2=value.get(p2); - sync(); - return true; - } - //IMPORT(p1); - //IMPORT(p2); IMPORT(offset); IMPORT(perpendicular); + IMPORT(fast); if(param=="bline" && value.get_type()==ValueBase::TYPE_LIST) { @@ -421,13 +433,12 @@ CurveGradient::get_param(const String & param)const { EXPORT(offset); EXPORT(bline); - EXPORT(p1); - EXPORT(p2); EXPORT(gradient); EXPORT(loop); EXPORT(zigzag); EXPORT(width); EXPORT(perpendicular); + EXPORT(fast); EXPORT_NAME(); EXPORT_VERSION(); @@ -440,35 +451,29 @@ CurveGradient::get_param_vocab()const { Layer::Vocab ret(Layer_Composite::get_param_vocab()); - ret.push_back(ParamDesc("offset") - .set_local_name(_("Offset")) - ); + ret.push_back(ParamDesc("offset") + .set_local_name(_("Offset"))); ret.push_back(ParamDesc("width") - .set_is_distance() - .set_local_name(_("Width")) - ); + .set_is_distance() + .set_local_name(_("Width"))); ret.push_back(ParamDesc("bline") - .set_local_name(_("Vertices")) - .set_origin("offset") - .set_scalar("width") - .set_description(_("A list of BLine Points")) - ); - + .set_local_name(_("Vertices")) + .set_origin("offset") + .set_scalar("width") + .set_description(_("A list of BLine Points"))); ret.push_back(ParamDesc("gradient") - .set_local_name(_("Gradient")) - ); + .set_local_name(_("Gradient"))); ret.push_back(ParamDesc("loop") - .set_local_name(_("Loop")) - ); + .set_local_name(_("Loop"))); ret.push_back(ParamDesc("zigzag") - .set_local_name(_("ZigZag")) - ); + .set_local_name(_("ZigZag"))); ret.push_back(ParamDesc("perpendicular") - .set_local_name(_("Perpendicular")) - ); + .set_local_name(_("Perpendicular"))); + ret.push_back(ParamDesc("fast") + .set_local_name(_("Fast"))); return ret; }