gEDA-cvs: pcb.git: branch: master updated (ab26fd07724fe0e7dfc95fae3bdeb1ecfb8692e5)

[git@xxxxxxxxxx]

The branch, master has been updated
       via  ab26fd07724fe0e7dfc95fae3bdeb1ecfb8692e5 (commit)
      from  45c00744ccb2e7640d506529f80555ec08bdf053 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


=========
 Summary
=========

 src/hid/common/draw_helpers.c |   13 ++++++++++---
 src/polyarea.h                |    4 ++++
 src/polygon.c                 |    4 ++++
 src/polygon1.c                |    4 ++++
 4 files changed, 22 insertions(+), 3 deletions(-)


=================
 Commit Messages
=================

commit ab26fd07724fe0e7dfc95fae3bdeb1ecfb8692e5
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>

    polygons: Tag circular contours so they can be special-cased when drawing.
    
    Tagging circular contours allows GUIs (if they wish) to draw circular
    holes in polygons more accurately, and potentially faster - depending
    on whether they use mask based rendering or rely on the dicer.
    
    When zoomed far out (and using a mask based scheme), the drawing routine
    can use a lower vertex count approximation to the contour - leading to
    rendering speed improvements. This is used to reasonable effect in the
    experimental OpenGL branch.
    
    Modify hid/common/draw_helpers.c to use these tags when thin-drawing
    polygon contours with common_thindraw_pcb_polygon(). This allows the
    GUI to change the level of detail rendered with zoom, and serves to
    test this feature.
    
    DRC checking and output are still done using the fixed resolution
    approximation present in the polygon contour, so in this respect -
    it makes rendering somewhat unfaithful to the final output.

:100644 100644 e975f3b... 1c7ead9... M	src/hid/common/draw_helpers.c
:100644 100644 6652fce... 958498b... M	src/polyarea.h
:100644 100644 71cfd60... 365539a... M	src/polygon.c
:100644 100644 eb4819d... 2ffd7cb... M	src/polygon1.c

=========
 Changes
=========

commit ab26fd07724fe0e7dfc95fae3bdeb1ecfb8692e5
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>

    polygons: Tag circular contours so they can be special-cased when drawing.
    
    Tagging circular contours allows GUIs (if they wish) to draw circular
    holes in polygons more accurately, and potentially faster - depending
    on whether they use mask based rendering or rely on the dicer.
    
    When zoomed far out (and using a mask based scheme), the drawing routine
    can use a lower vertex count approximation to the contour - leading to
    rendering speed improvements. This is used to reasonable effect in the
    experimental OpenGL branch.
    
    Modify hid/common/draw_helpers.c to use these tags when thin-drawing
    polygon contours with common_thindraw_pcb_polygon(). This allows the
    GUI to change the level of detail rendered with zoom, and serves to
    test this feature.
    
    DRC checking and output are still done using the fixed resolution
    approximation present in the polygon contour, so in this respect -
    it makes rendering somewhat unfaithful to the final output.

diff --git a/src/hid/common/draw_helpers.c b/src/hid/common/draw_helpers.c
index e975f3b..1c7ead9 100644
--- a/src/hid/common/draw_helpers.c
+++ b/src/hid/common/draw_helpers.c
@@ -29,13 +29,20 @@ static void thindraw_contour (hidGC gc, PLINE *pl)
   int last_x, last_y;
   int this_x, this_y;
 
+  gui->set_line_width (gc, 0);
+  gui->set_line_cap (gc, Round_Cap);
+
+  /* If the contour is round, use an arc drawing routine. */
+  if (pl->is_round)
+    {
+      gui->draw_arc (gc, pl->cx, pl->cy, pl->radius, pl->radius, 0, 360);
+      return;
+    }
+
   /* Need at least two points in the contour */
   if (pl->head.next == NULL)
     return;
 
-  gui->set_line_width (gc, 0);
-  gui->set_line_cap (gc, Round_Cap);
-
   last_x = pl->head.point[0];
   last_y = pl->head.point[1];
   v = pl->head.next;
diff --git a/src/polyarea.h b/src/polyarea.h
index 6652fce..958498b 100644
--- a/src/polyarea.h
+++ b/src/polyarea.h
@@ -99,6 +99,10 @@ struct PLINE
     unsigned int Count;
     double area;
     rtree_t *tree;
+    int is_round;
+    int cx;
+    int cy;
+    int radius;
     struct {
       unsigned int status:3;
       unsigned int orient:1;
diff --git a/src/polygon.c b/src/polygon.c
index 71cfd60..365539a 100644
--- a/src/polygon.c
+++ b/src/polygon.c
@@ -336,6 +336,10 @@ CirclePoly (LocationType x, LocationType y, BDimension radius)
   if ((contour = poly_NewContour (v)) == NULL)
     return NULL;
   frac_circle (contour, x, y, v, 1);
+  contour->is_round = TRUE;
+  contour->cx = x;
+  contour->cy = y;
+  contour->radius = radius;
   return ContourToPoly (contour);
 }
 
diff --git a/src/polygon1.c b/src/polygon1.c
index eb4819d..2ffd7cb 100644
--- a/src/polygon1.c
+++ b/src/polygon1.c
@@ -1829,6 +1829,10 @@ poly_IniContour (PLINE * c)
   c->head.next = c->head.prev = &c->head;
   c->xmin = c->ymin = 0x7fffffff;
   c->xmax = c->ymax = 0x80000000;
+  c->is_round = FALSE;
+  c->cx = 0;
+  c->cy = 0;
+  c->radius = 0;
 }
 
 PLINE *




_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs