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=3fb1afb1e27555c04f453ef98d62bccccc776de0;hp=a40b17b068163faf9936572a0f1d665efe472867;hb=HEAD;hpb=b64142b983e53a7f0bfe8422efc3bb4f4ebb897c

diff --git a/cinelerra-5.1/plugins/sketcher/sketcher.h b/cinelerra-5.1/plugins/sketcher/sketcher.h
index a40b17b0..3fb1afb1 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;
 
@@ -46,6 +46,7 @@ public:
 	int n;
 	uint8_t *msk;
 
+	int draw_mask(int x, int y);
 	SketcherVPen(VFrame *vfrm, int n)
 	 : VFrame(vfrm->get_data(), -1, vfrm->get_y()-vfrm->get_data(),
 	    vfrm->get_u()-vfrm->get_data(), vfrm->get_v()-vfrm->get_data(),
@@ -57,51 +58,49 @@ public:
 	}
 	~SketcherVPen() { delete [] msk; }
 
-	void draw_line(float x1, float y1, float x2, float y2) {
-		VFrame::draw_line(int(x1+.5f),int(y1+.5f), int(x2+.5f),int(y2+.5f));
-	}
 	void draw_smooth(float x1, float y1, float x2, float y2, float x3, float y3) {
 		VFrame::draw_smooth(int(x1+.5f),int(y1+.5f),
 			int(x2+.5f),int(y2+.5f), int(x3+.5f),int(y3+.5f));
 	}
 
-	virtual int draw_pixel(int x, int y) = 0;
+	virtual int draw_pixel(float x, float y, float a) = 0;
+	int draw_pixel(float x, float y, float frac, int axis);
 };
 
 class SketcherPenSquare : public SketcherVPen
 {
 public:
 	SketcherPenSquare(VFrame *vfrm, int n) : SketcherVPen(vfrm, n) {}
-	int draw_pixel(int x, int y);
+	int draw_pixel(float x, float y, float a);
 };
 class SketcherPenPlus : public SketcherVPen
 {
 public:
 	SketcherPenPlus(VFrame *vfrm, int n) : SketcherVPen(vfrm, n) {}
-	int draw_pixel(int x, int y);
+	int draw_pixel(float x, float y, float a);
 };
 class SketcherPenSlant : public SketcherVPen
 {
 public:
 	SketcherPenSlant(VFrame *vfrm, int n) : SketcherVPen(vfrm, n) {}
-	int draw_pixel(int x, int y);
+	int draw_pixel(float x, float y, float a);
 };
 class SketcherPenXlant : public SketcherVPen
 {
 public:
 	SketcherPenXlant(VFrame *vfrm, int n) : SketcherVPen(vfrm, n) {}
-	int draw_pixel(int x, int y);
+	int draw_pixel(float x, float y, float a);
 };
 
 
 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 +108,8 @@ 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];
+	void update_parameter(SketcherPoint *the, SketcherPoint *src);
 };
 class SketcherPoints : public ArrayList<SketcherPoint *>
 {
@@ -140,7 +140,8 @@ public:
 	double nearest_point(int &pi, coord x, coord y);
 
 	SketcherVPen *new_vpen(VFrame *out);
-	void draw(VFrame *img);
+	void draw(VFrame *img, int flags);
+	void update_parameter(SketcherCurve *the, SketcherCurve *src);
 };
 class SketcherCurves : public ArrayList<SketcherCurve *>
 {
@@ -155,6 +156,8 @@ class SketcherConfig
 public:
 	SketcherConfig();
 	~SketcherConfig();
+	void read_data(KeyFrame *keyframe);
+	void save_data(KeyFrame *keyframe);
 
 	SketcherCurves curves;
 	int equivalent(SketcherConfig &that);
@@ -162,11 +165,11 @@ public:
 	void interpolate(SketcherConfig &prev, SketcherConfig &next,
 		long prev_frame, long next_frame, long current_frame);
 	double nearest_point(int &ci, int &pi, coord x, coord y);
+	int new_curve(int pen, int width, int color);
 	void limits();
 	void dump();
 
-	int drag;
-	int cv_selected, pt_selected;
+	int aliasing;
 };
 
 class Sketcher : public PluginVClient
@@ -176,13 +179,19 @@ public:
 	~Sketcher();
 	PLUGIN_CLASS_MEMBERS2(SketcherConfig)
 	int is_realtime();
+	int is_synthesis();
 	void update_gui();
+	void render_gui(void *data);
+	int is_dragging();
 	void save_data(KeyFrame *keyframe);
 	void read_data(KeyFrame *keyframe);
+	void span_keyframes(KeyFrame *src, int64_t start, int64_t end);
+	void update_parameter(SketcherConfig &prev_config, SketcherConfig &src_config,
+		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);
@@ -192,6 +201,8 @@ public:
 	OverlayFrame *overlay_frame;
 	int w, h, color_model, bpp, comp;
 	int is_yuv, is_float;
+	int drag;
+	int cv_selected, pt_selected;
 };
 
 #endif