X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fplugins%2Fsketcher%2Fsketcher.h;h=1ddd5a478635d795b1dc3d441e861cce29078100;hb=6ff8b339d215bb1c2cef589fd7959aa2e1834105;hp=be0f46b9f1e478289f3d001f183d96a48a59852f;hpb=b46dd3711f7aaa94d2df9f27cd2ce16f7487693a;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/plugins/sketcher/sketcher.h b/cinelerra-5.1/plugins/sketcher/sketcher.h
index be0f46b9..1ddd5a47 100644
--- a/cinelerra-5.1/plugins/sketcher/sketcher.h
+++ b/cinelerra-5.1/plugins/sketcher/sketcher.h
@@ -24,6 +24,8 @@
 #define __SKETCHERS_H__
 
 #include "pluginvclient.h"
+#include "overlayframe.inc"
+#include "vframe.h"
 
 class Sketcher;
 
@@ -32,23 +34,38 @@ class Sketcher;
 #define CV_COLOR WHITE
 
 enum { PT_ID, PT_TY, PT_X, PT_Y, PT_SZ };
-enum { CV_ID, CV_RAD, CV_PEN, CV_CLR, CV_SZ };
-enum { PTY_OFF, PTY_LINE, PTY_CURVE, PTY_SZ };
+enum { CV_ID, CV_RAD, CV_PEN, CV_CLR, CV_ALP, CV_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;
 
 class SketcherVPen : public VFrame
 {
 public:
+	VFrame *vfrm;
+	int n;
+	uint8_t *msk;
+
 	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(),
 	    vfrm->get_w(), vfrm->get_h(), vfrm->get_color_model(),
 	    vfrm->get_bytes_per_line()) {
 		this->vfrm = vfrm;  this->n = n;
+		int sz = vfrm->get_w()*vfrm->get_h();
+		this->msk = (uint8_t*)memset(new uint8_t[sz],0,sz);
+	}
+	~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;
-	VFrame *vfrm;
-	int n;
 };
 
 class SketcherPenSquare : public SketcherVPen
@@ -80,11 +97,11 @@ public:
 class SketcherPoint
 {
 public:
-	int id, pty;
-	int x, y;
+	int id, arc;
+	coord x, y;
 
-	void init(int id, int pty, int x, int y);
-	SketcherPoint(int id, int pty, int x, int 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();
@@ -92,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<SketcherPoint *>
 {
@@ -106,13 +123,13 @@ public:
 class SketcherCurve
 {
 public:
-	int id, pen, radius, color;
+	int id, pen, width, color;
 	static const char *pens[PEN_SZ];
 
 	SketcherPoints points;
 
-	void init(int id, int pen, int radius, int color);
-	SketcherCurve(int id, int pen, int radius, int color);
+	void init(int id, int pen, int width, int color);
+	SketcherCurve(int id, int pen, int width, int color);
 	SketcherCurve(int id=-1);
 	~SketcherCurve();
 	SketcherCurve(SketcherCurve &cv);
@@ -120,8 +137,10 @@ public:
 	void copy_from(SketcherCurve &that);
 	void save_data(FileXML &output);
 	void read_data(FileXML &input);
-	VFrame *new_vpen(VFrame *out);
-	void draw(VFrame *out);
+	double nearest_point(int &pi, coord x, coord y);
+
+	SketcherVPen *new_vpen(VFrame *out);
+	void draw(VFrame *img);
 };
 class SketcherCurves : public ArrayList<SketcherCurve *>
 {
@@ -142,7 +161,9 @@ public:
 	void copy_from(SketcherConfig &that);
 	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);
 	void limits();
+	void dump();
 
 	int drag;
 	int cv_selected, pt_selected;
@@ -155,18 +176,21 @@ public:
 	~Sketcher();
 	PLUGIN_CLASS_MEMBERS2(SketcherConfig)
 	int is_realtime();
+	int is_synthesis();
 	void update_gui();
 	void save_data(KeyFrame *keyframe);
 	void read_data(KeyFrame *keyframe);
-	int new_curve(int pen, int radius, int color);
+	int new_curve(int pen, int width, int color);
 	int new_curve();
-	int new_point(SketcherCurve *cv, int pty, int x, int 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);
 
 	VFrame *input, *output;
+	VFrame *img, *out;
+	OverlayFrame *overlay_frame;
 	int w, h, color_model, bpp, comp;
 	int is_yuv, is_float;
 };