X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=libs%2Fcanvas%2Fpolygon.cc;h=fdc1061d743dd3c201367f50a740f720ff468251;hb=ac1f7e0b9fe67fd2c0f848349396524f23e9f316;hp=43d7c60cf4c2013bdede7e376f8cf340eaf00cac;hpb=54bf06e63cee78dfa218f604d862e577d0f5754c;p=ardour.git

diff --git a/libs/canvas/polygon.cc b/libs/canvas/polygon.cc
index 43d7c60cf4..fdc1061d74 100644
--- a/libs/canvas/polygon.cc
+++ b/libs/canvas/polygon.cc
@@ -21,26 +21,49 @@
 
 using namespace ArdourCanvas;
 
-Polygon::Polygon (Group* parent)
-	: Item (parent)
-	, PolyItem (parent)
-	, Fill (parent)
+Polygon::Polygon (Canvas* c)
+	: PolyItem (c)
+	, multiple (0)
+	, constant (0)
+	, cached_size (0)
 {
+}
 
+Polygon::Polygon (Item* parent)
+	: PolyItem (parent)
+	, multiple (0)
+	, constant (0)
+	, cached_size (0)
+{
+}
+
+Polygon::~Polygon ()
+{
+	delete [] multiple;
+	delete [] constant;
 }
 
 void
 Polygon::render (Rect const & area, Cairo::RefPtr<Cairo::Context> context) const
 {
-	if (_outline) {
-		setup_outline_context (context);
+	if (_outline || _fill) {
 		render_path (area, context);
 		
 		if (!_points.empty ()) {
-			context->move_to (_points.front().x, _points.front().y);
+			/* close path */
+			Duple p = item_to_window (Duple (_points.front().x, _points.front().y));
+			context->line_to (p.x, p.y);
 		}
 
-		context->stroke_preserve ();
+	}
+
+	if (_outline) {
+		setup_outline_context (context);
+		if (_fill) {
+			context->stroke_preserve ();
+		} else {
+			context->stroke ();
+		}
 	}
 
 	if (_fill) {
@@ -49,3 +72,72 @@ Polygon::render (Rect const & area, Cairo::RefPtr<Cairo::Context> context) const
 	}
 }
 
+void 
+Polygon::cache_shape_computation () const
+{
+	Points::size_type npoints = _points.size();
+
+	if (npoints == 0) {
+		return;
+	}
+
+	Points::size_type i;
+	Points::size_type j = npoints -1;
+
+	if (cached_size < npoints) {
+		cached_size = npoints;
+		delete [] multiple;
+		multiple = new float[cached_size];
+		delete [] constant;
+		constant = new float[cached_size];
+	}
+
+	for (i = 0; i < npoints; i++) {
+		if (_points[j].y == _points[i].y) {
+			constant[i] = _points[i].x;
+			multiple[i] = 0; 
+		} else {
+			constant[i] = _points[i].x-(_points[i].y*_points[j].x)/(_points[j].y-_points[i].y)+(_points[i].y*_points[i].x)/(_points[j].y-_points[i].y);
+			multiple[i] = (_points[j].x-_points[i].x)/(_points[j].y-_points[i].y); 
+		}
+
+		j = i; 
+	}
+}
+
+bool 
+Polygon::covers (Duple const & point) const
+{
+	Duple p = window_to_item (point);
+
+	Points::size_type npoints = _points.size();
+
+	if (npoints == 0) {
+		return false;
+	}
+
+	Points::size_type i;
+	Points::size_type j = npoints -1;
+	bool oddNodes = false;
+	
+	if (_bounding_box_dirty) {
+		compute_bounding_box ();
+	}
+	
+	for (i = 0; i < npoints; i++) {
+		if (((_points[i].y < p.y && _points[j].y >= p.y) || (_points[j].y < p.y && _points[i].y >= p.y))) {
+			oddNodes ^= (p.y * multiple[i] + constant[i] < p.x); 
+		}
+		j = i; 
+	}
+
+	return oddNodes; 
+} 
+
+void
+Polygon::compute_bounding_box () const
+{
+	PolyItem::compute_bounding_box ();
+	cache_shape_computation ();
+}
+