X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fplugins%2Fsketcher%2Fsketcher.h;h=3df08768f0037a9c561fbf98c219daf129291506;hp=a40b17b068163faf9936572a0f1d665efe472867;hb=ad498171bc20d8187dfa891da26d7b32a2ff0380;hpb=b64142b983e53a7f0bfe8422efc3bb4f4ebb897c diff --git a/cinelerra-5.1/plugins/sketcher/sketcher.h b/cinelerra-5.1/plugins/sketcher/sketcher.h index a40b17b0..3df08768 100644 --- a/cinelerra-5.1/plugins/sketcher/sketcher.h +++ b/cinelerra-5.1/plugins/sketcher/sketcher.h @@ -35,7 +35,7 @@ class Sketcher; enum { PT_ID, PT_TY, PT_X, PT_Y, PT_SZ }; enum { CV_ID, CV_RAD, CV_PEN, CV_CLR, CV_ALP, CV_SZ }; -enum { PTY_OFF, PTY_LINE, PTY_CURVE, PTY_FILL, PTY_SZ }; +enum { ARC_OFF, ARC_LINE, ARC_CURVE, ARC_FILL, ARC_SZ }; enum { PEN_OFF, PEN_SQUARE, PEN_PLUS, PEN_SLANT, PEN_XLANT, PEN_SZ }; typedef float coord; @@ -97,11 +97,11 @@ public: class SketcherPoint { public: - int id, pty; + int id, arc; coord x, y; - void init(int id, int pty, coord x, coord y); - SketcherPoint(int id, int pty, coord x, coord y); + void init(int id, int arc, coord x, coord y); + SketcherPoint(int id, int arc, coord x, coord y); SketcherPoint(int id=-1); SketcherPoint(SketcherPoint &pt); ~SketcherPoint(); @@ -109,7 +109,7 @@ public: void copy_from(SketcherPoint &that); void save_data(FileXML &output); void read_data(FileXML &input); - static const char *types[PTY_SZ]; + static const char *types[ARC_SZ]; }; class SketcherPoints : public ArrayList { @@ -181,8 +181,8 @@ public: void read_data(KeyFrame *keyframe); int new_curve(int pen, int width, int color); int new_curve(); - int new_point(SketcherCurve *cv, int pty, coord x, coord y, int idx=-1); - int new_point(int idx=-1); + int new_point(SketcherCurve *cv, int arc, coord x, coord y, int idx=-1); + int new_point(int idx, int arc); int process_realtime(VFrame *input, VFrame *output); static void draw_point(VFrame *vfrm, SketcherPoint *pt, int color, int d); void draw_point(VFrame *vfrm, SketcherPoint *pt, int color);