X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fcanvas%2Fpolygon.cc;h=53fea1c5f4f9bdacaa419f0e7270c20d2b95ff1e;hb=6bbb2c72f0cef9e12ec45c2a11f88391a2593494;hp=aa16a6017844c2cc6f3ba816eabac5b8ecd5f08d;hpb=ad017365f7a73f8ba57f667cc1aa36478b48c50e;p=ardour.git diff --git a/libs/canvas/polygon.cc b/libs/canvas/polygon.cc index aa16a60178..53fea1c5f4 100644 --- a/libs/canvas/polygon.cc +++ b/libs/canvas/polygon.cc @@ -48,11 +48,11 @@ Polygon::render (Rect const & area, Cairo::RefPtr context) const { if (_outline || _fill) { render_path (area, context); - + if (!_points.empty ()) { /* close path */ Duple p = item_to_window (Duple (_points.front().x, _points.front().y)); - context->move_to (p.x, p.y); + context->line_to (p.x, p.y); } } @@ -72,7 +72,7 @@ Polygon::render (Rect const & area, Cairo::RefPtr context) const } } -void +void Polygon::cache_shape_computation () const { Points::size_type npoints = _points.size(); @@ -95,17 +95,17 @@ Polygon::cache_shape_computation () const for (i = 0; i < npoints; i++) { if (_points[j].y == _points[i].y) { constant[i] = _points[i].x; - multiple[i] = 0; + 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); + multiple[i] = (_points[j].x-_points[i].x)/(_points[j].y-_points[i].y); } - j = i; + j = i; } } -bool +bool Polygon::covers (Duple const & point) const { Duple p = window_to_item (point); @@ -119,20 +119,20 @@ Polygon::covers (Duple const & point) const 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); + oddNodes ^= (p.y * multiple[i] + constant[i] < p.x); } - j = i; + j = i; } - return oddNodes; -} + return oddNodes; +} void Polygon::compute_bounding_box () const