X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Flyr_std%2Fcurvewarp.h;h=a287887987c7ed6bd746e8dd7086020e8265612c;hb=ce5ffc46ee746fc74cc716b4a4eebdebc471e2e0;hp=da9c1b7a9aed837fa96b15d7bbdfbc446501a1a3;hpb=5ae346e017651b10ea2b2b6e1391db5d4bc4243f;p=synfig.git diff --git a/synfig-core/trunk/src/modules/lyr_std/curvewarp.h b/synfig-core/trunk/src/modules/lyr_std/curvewarp.h index da9c1b7..a287887 100644 --- a/synfig-core/trunk/src/modules/lyr_std/curvewarp.h +++ b/synfig-core/trunk/src/modules/lyr_std/curvewarp.h @@ -53,7 +53,7 @@ private: std::vector bline; Point origin; - Real width; + Real perp_width; Point start_point; Point end_point; Real curve_length_; @@ -62,16 +62,12 @@ private: void sync(); - synfig::Color color_func(const synfig::Point &x, int quality=10, float supersample=0)const; - - float calc_supersample(const synfig::Point &x, float pw,float ph)const; - public: CurveWarp(); virtual bool set_param(const String ¶m, const ValueBase &value); virtual ValueBase get_param(const String ¶m)const; - virtual Point transform(const Point &point_, int quality=10, float supersample=0)const; + virtual Point transform(const Point &point_, Real *dist=NULL, Real *along=0, int quality=10)const; virtual Color get_color(Context context, const Point &pos)const; virtual bool accelerated_render(Context context,Surface *surface,int quality, const RendDesc &renddesc, ProgressCallback *cb)const; synfig::Layer::Handle hit_check(synfig::Context context, const synfig::Point &point)const;