X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Fmod_gradient%2Fcurvegradient.cpp;h=8f03bed7c71011c03cfc6c5b334577b7f95815d1;hb=8ef042c40521681cea99944097c4f90a5ac6cf74;hp=d296d4b0fcdd4ae20015e64927414689ba6d3331;hpb=675aca937d23c7f460edf42ac3ec0ffa06205a2c;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 d296d4b..8f03bed 100644 --- a/synfig-core/trunk/src/modules/mod_gradient/curvegradient.cpp +++ b/synfig-core/trunk/src/modules/mod_gradient/curvegradient.cpp @@ -6,6 +6,7 @@ ** ** \legal ** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley +** Copyright (c) 2007 Chris Moore ** ** This package is free software; you can redistribute it and/or ** modify it under the terms of the GNU General Public License as @@ -53,8 +54,8 @@ SYNFIG_LAYER_INIT(CurveGradient); SYNFIG_LAYER_SET_NAME(CurveGradient,"curve_gradient"); -SYNFIG_LAYER_SET_LOCAL_NAME(CurveGradient,_("Curve Gradient")); -SYNFIG_LAYER_SET_CATEGORY(CurveGradient,_("Gradients")); +SYNFIG_LAYER_SET_LOCAL_NAME(CurveGradient,N_("Curve Gradient")); +SYNFIG_LAYER_SET_CATEGORY(CurveGradient,N_("Gradients")); SYNFIG_LAYER_SET_VERSION(CurveGradient,"0.0"); SYNFIG_LAYER_SET_CVS_ID(CurveGradient,"$Id$"); @@ -72,7 +73,7 @@ inline float calculate_distance(const synfig::BLinePoint& a,const synfig::BLineP #endif } -inline float calculate_distance(const std::vector& bline) +inline float calculate_distance(const std::vector& bline, bool bline_loop) { std::vector::const_iterator iter,next,ret; std::vector::const_iterator end(bline.end()); @@ -83,9 +84,9 @@ inline float calculate_distance(const std::vector& bline) next=bline.begin(); - //if(loop) - // iter=--bline.end(); - //else + if(bline_loop) + iter=--bline.end(); + else iter=next++; for(;next!=end;iter=next++) @@ -95,8 +96,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(); @@ -106,7 +106,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()); @@ -119,6 +119,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) @@ -135,8 +136,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)); @@ -151,23 +151,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); + curve_length_=calculate_distance(bline, bline_loop); } 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()); @@ -223,6 +238,7 @@ CurveGradient::color_func(const Point &point_, int quality, float supersample)co Real dist; float perp_dist; + bool edge_case = false; if(bline.size()==0) return Color::alpha(); @@ -234,6 +250,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; @@ -242,78 +259,92 @@ 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 + else // not perpendicular { - 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() - ); - // Setup the derivative function - etl::derivative > deriv(curve); + iter=next++; + if(next==bline.end()) next=bline.begin(); - int search_iterations(7); + // Setup the curve + etl::hermite curve( + iter->get_vertex(), + next->get_vertex(), + iter->get_tangent2(), + next->get_tangent1() + ); - /*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; - } + // Setup the derivative function + etl::derivative > deriv(curve); - // Figure out the closest point on the curve - const float t(curve.find_closest(point,search_iterations)); + 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>7) + search_iterations=4; + } + else // not 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; + } - // Calculate our values - p1=curve(t); - tangent=deriv(t).norm(); + // Figure out the closest point on the curve + if (fast) + t = curve.find_closest(fast, point,search_iterations); - if(perpendicular) + // Calculate our values + p1=curve(t); // the closest point on the curve + tangent=deriv(t).norm(); // the unit tangent at that point + + // if the point we're nearest to is at either end of the + // bline, our distance from the curve is the distance from the + // point on the curve. we need to know which side of the + // curve we're on, so find the average of the two tangents at + // this point + if (t<0.00001 || t>0.99999) + { + if (t<0.5) { - tangent*=curve_length_; - p1-=tangent*perp_dist; - tangent=-tangent.perp(); + if (iter->get_split_tangent_flag()) + { + tangent=(iter->get_tangent1().norm()+tangent).norm(); + edge_case=true; + } } else { - thickness=(next->get_width()-iter->get_width())*t+iter->get_width(); + if (next->get_split_tangent_flag()) + { + tangent=(next->get_tangent2().norm()+tangent).norm(); + edge_case=true; + } } - //} - } - + } - 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); + if(perpendicular) + { + tangent*=curve_length_; + p1-=tangent*perp_dist; + tangent=-tangent.perp(); + } + else // not perpendicular + // the width of the bline at the closest point on the curve + thickness=(next->get_width()-iter->get_width())*t+iter->get_width(); } - else + + if(perpendicular) { if(quality>7) { @@ -326,13 +357,30 @@ CurveGradient::color_func(const Point &point_, int quality, float supersample)co } else { - diff=tangent.perp(); - //p1-=diff*0.5; + 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); + } + } + else // not perpendicular + { + if (edge_case) + { + diff=(p1-(point_-offset)); + if(diff*tangent.perp()<0) diff=-diff; + diff=diff.norm()*thickness*width; + } + else + 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); - } } if(loop) @@ -370,9 +418,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; } @@ -391,24 +438,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) { @@ -431,13 +465,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(); @@ -450,35 +483,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; }