Index: trunk/doc-rnd/hacking/renames =================================================================== --- trunk/doc-rnd/hacking/renames (revision 4987) +++ trunk/doc-rnd/hacking/renames (revision 4988) @@ -662,3 +662,22 @@ HOOK_UNREGISTER -> PCB_HOOK_UNREGISTER HOOK_CALL -> PCB_HOOK_CALL HOOK_REGISTER -> PCB_HOOK_REGISTER +poly_NewContour -> pcb_poly_contour_new +poly_IniContour -> pcb_poly_contour_init +poly_ClrContour -> pcb_poly_contour_clear +poly_DelContour -> pcb_poly_contour_del +poly_CopyContour -> pcb_poly_contour_copy +poly_PreContour -> pcb_poly_contour_pre +poly_InvContour -> pcb_poly_contour_inv +poly_CreateNode -> pcb_poly_node_create +poly_InclVertex -> pcb_poly_vertex_include +poly_ExclVertex -> pcb_poly_vertex_exclude +poly_M_Copy0 -> pcb_poly_m_copy0 +poly_M_Incl -> pcb_poly_m_include +poly_Copy0 -> pcb_poly_copy0 +poly_Copy1 -> pcb_poly_copy1 +poly_InclContour -> pcb_poly_contour_include +poly_ExclContour -> pcb_poly_contour_exclide +poly_ChkContour -> pcb_poly_contour_check +poly_CheckInside -> pcb_poly_contour_inside +Touching -> pcb_poly_touching Index: trunk/src/find_geo.c =================================================================== --- trunk/src/find_geo.c (revision 4987) +++ trunk/src/find_geo.c (revision 4988) @@ -638,7 +638,7 @@ pl1 = PinPoly(PV1, PIN_SIZE(PV1) + Bloat, 0); pl2 = PinPoly(PV2, PIN_SIZE(PV2) + Bloat, 0); - ret = Touching(pl1, pl2); + ret = pcb_poly_touching(pl1, pl2); poly_Free(&pl1); poly_Free(&pl2); return ret; @@ -684,7 +684,7 @@ pl = PinPoly(PV, PIN_SIZE(PV), 0); lp = LinePoly(Line, Line->Thickness + Bloat); - ret = Touching(lp, pl); + ret = pcb_poly_touching(lp, pl); poly_Free(&pl); poly_Free(&lp); return ret; Index: trunk/src/hid_draw_helpers.c =================================================================== --- trunk/src/hid_draw_helpers.c (revision 4987) +++ trunk/src/hid_draw_helpers.c (revision 4988) @@ -82,9 +82,9 @@ int x; clip_poly = RectPoly(clip_box->X1, clip_box->X2, clip_box->Y1, clip_box->Y2); - poly_CopyContour(&pl_copy, pl); + pcb_poly_contour_copy(&pl_copy, pl); piece_poly = poly_Create(); - poly_InclContour(piece_poly, pl_copy); + pcb_poly_contour_include(piece_poly, pl_copy); x = poly_Boolean_free(piece_poly, clip_poly, &clipped_pieces, PBO_ISECT); if (x != err_ok || clipped_pieces == NULL) return; Index: trunk/src/obj_pinvia_therm.c =================================================================== --- trunk/src/obj_pinvia_therm.c (revision 4987) +++ trunk/src/obj_pinvia_therm.c (revision 4988) @@ -68,17 +68,17 @@ v[0] = X + x1; v[1] = Y + y2; - if ((c = poly_NewContour(v)) == NULL) + if ((c = pcb_poly_contour_new(v)) == NULL) return NULL; v[0] = X - x2; v[1] = Y - y1; - poly_InclVertex(c->head.prev, poly_CreateNode(v)); + pcb_poly_vertex_include(c->head.prev, pcb_poly_node_create(v)); v[0] = X - x1; v[1] = Y - y2; - poly_InclVertex(c->head.prev, poly_CreateNode(v)); + pcb_poly_vertex_include(c->head.prev, pcb_poly_node_create(v)); v[0] = X + x2; v[1] = Y + y1; - poly_InclVertex(c->head.prev, poly_CreateNode(v)); + pcb_poly_vertex_include(c->head.prev, pcb_poly_node_create(v)); return ContourToPoly(c); } @@ -97,28 +97,28 @@ /* top (actually bottom since +y is down) */ v[0] = pin->X - in + d; v[1] = pin->Y + in; - if ((c = poly_NewContour(v)) == NULL) + if ((c = pcb_poly_contour_new(v)) == NULL) return NULL; v[0] = pin->X + in - d; - poly_InclVertex(c->head.prev, poly_CreateNode(v)); + pcb_poly_vertex_include(c->head.prev, pcb_poly_node_create(v)); v[0] = pin->X + out - d; v[1] = pin->Y + out; - poly_InclVertex(c->head.prev, poly_CreateNode(v)); + pcb_poly_vertex_include(c->head.prev, pcb_poly_node_create(v)); v[0] = pin->X - out + d; - poly_InclVertex(c->head.prev, poly_CreateNode(v)); + pcb_poly_vertex_include(c->head.prev, pcb_poly_node_create(v)); p = ContourToPoly(c); /* right */ v[0] = pin->X + in; v[1] = pin->Y + in - d; - if ((c = poly_NewContour(v)) == NULL) + if ((c = pcb_poly_contour_new(v)) == NULL) return NULL; v[1] = pin->Y - in + d; - poly_InclVertex(c->head.prev, poly_CreateNode(v)); + pcb_poly_vertex_include(c->head.prev, pcb_poly_node_create(v)); v[0] = pin->X + out; v[1] = pin->Y - out + d; - poly_InclVertex(c->head.prev, poly_CreateNode(v)); + pcb_poly_vertex_include(c->head.prev, pcb_poly_node_create(v)); v[1] = pin->Y + out - d; - poly_InclVertex(c->head.prev, poly_CreateNode(v)); + pcb_poly_vertex_include(c->head.prev, pcb_poly_node_create(v)); p2 = ContourToPoly(c); p->f = p2; p2->b = p; @@ -125,15 +125,15 @@ /* left */ v[0] = pin->X - in; v[1] = pin->Y - in + d; - if ((c = poly_NewContour(v)) == NULL) + if ((c = pcb_poly_contour_new(v)) == NULL) return NULL; v[1] = pin->Y + in - d; - poly_InclVertex(c->head.prev, poly_CreateNode(v)); + pcb_poly_vertex_include(c->head.prev, pcb_poly_node_create(v)); v[0] = pin->X - out; v[1] = pin->Y + out - d; - poly_InclVertex(c->head.prev, poly_CreateNode(v)); + pcb_poly_vertex_include(c->head.prev, pcb_poly_node_create(v)); v[1] = pin->Y - out + d; - poly_InclVertex(c->head.prev, poly_CreateNode(v)); + pcb_poly_vertex_include(c->head.prev, pcb_poly_node_create(v)); p2 = ContourToPoly(c); p->f->f = p2; p2->b = p->f; @@ -140,15 +140,15 @@ /* bottom (actually top since +y is down) */ v[0] = pin->X + in - d; v[1] = pin->Y - in; - if ((c = poly_NewContour(v)) == NULL) + if ((c = pcb_poly_contour_new(v)) == NULL) return NULL; v[0] = pin->X - in + d; - poly_InclVertex(c->head.prev, poly_CreateNode(v)); + pcb_poly_vertex_include(c->head.prev, pcb_poly_node_create(v)); v[0] = pin->X - out + d; v[1] = pin->Y - out; - poly_InclVertex(c->head.prev, poly_CreateNode(v)); + pcb_poly_vertex_include(c->head.prev, pcb_poly_node_create(v)); v[0] = pin->X + out - d; - poly_InclVertex(c->head.prev, poly_CreateNode(v)); + pcb_poly_vertex_include(c->head.prev, pcb_poly_node_create(v)); p2 = ContourToPoly(c); p->f->f->f = p2; p2->f = p; @@ -201,26 +201,26 @@ /* topright */ v[0] = pin->X + in; v[1] = pin->Y + in; - if ((c = poly_NewContour(v)) == NULL) + if ((c = pcb_poly_contour_new(v)) == NULL) return NULL; v[1] = pin->Y + d; - poly_InclVertex(c->head.prev, poly_CreateNode(v)); + pcb_poly_vertex_include(c->head.prev, pcb_poly_node_create(v)); if (style == 2) { v[0] = pin->X + out; - poly_InclVertex(c->head.prev, poly_CreateNode(v)); + pcb_poly_vertex_include(c->head.prev, pcb_poly_node_create(v)); } else frac_circle(c, v[0] + pin->Clearance / 4, v[1], v, 2); v[1] = pin->Y + in; - poly_InclVertex(c->head.prev, poly_CreateNode(v)); + pcb_poly_vertex_include(c->head.prev, pcb_poly_node_create(v)); /* pivot 1/4 circle to next point */ frac_circle(c, pin->X + in, pin->Y + in, v, 4); v[0] = pin->X + d; - poly_InclVertex(c->head.prev, poly_CreateNode(v)); + pcb_poly_vertex_include(c->head.prev, pcb_poly_node_create(v)); if (style == 2) { - poly_InclVertex(c->head.prev, poly_CreateNode(v)); + pcb_poly_vertex_include(c->head.prev, pcb_poly_node_create(v)); v[1] = pin->Y + in; - poly_InclVertex(c->head.prev, poly_CreateNode(v)); + pcb_poly_vertex_include(c->head.prev, pcb_poly_node_create(v)); } else frac_circle(c, v[0], v[1] - pin->Clearance / 4, v, 2); @@ -228,24 +228,24 @@ /* bottom right */ v[0] = pin->X + in; v[1] = pin->Y - d; - if ((c = poly_NewContour(v)) == NULL) + if ((c = pcb_poly_contour_new(v)) == NULL) return NULL; v[1] = pin->Y - in; - poly_InclVertex(c->head.prev, poly_CreateNode(v)); + pcb_poly_vertex_include(c->head.prev, pcb_poly_node_create(v)); v[0] = pin->X + d; - poly_InclVertex(c->head.prev, poly_CreateNode(v)); + pcb_poly_vertex_include(c->head.prev, pcb_poly_node_create(v)); if (style == 2) { v[1] = pin->Y - out; - poly_InclVertex(c->head.prev, poly_CreateNode(v)); + pcb_poly_vertex_include(c->head.prev, pcb_poly_node_create(v)); } else frac_circle(c, v[0], v[1] - pin->Clearance / 4, v, 2); v[0] = pin->X + in; - poly_InclVertex(c->head.prev, poly_CreateNode(v)); + pcb_poly_vertex_include(c->head.prev, pcb_poly_node_create(v)); /* pivot 1/4 circle to next point */ frac_circle(c, pin->X + in, pin->Y - in, v, 4); v[1] = pin->Y - d; - poly_InclVertex(c->head.prev, poly_CreateNode(v)); + pcb_poly_vertex_include(c->head.prev, pcb_poly_node_create(v)); if (style == 5) frac_circle(c, v[0] - pin->Clearance / 4, v[1], v, 2); p2 = ContourToPoly(c); @@ -254,24 +254,24 @@ /* bottom left */ v[0] = pin->X - d; v[1] = pin->Y - in; - if ((c = poly_NewContour(v)) == NULL) + if ((c = pcb_poly_contour_new(v)) == NULL) return NULL; v[0] = pin->X - in; - poly_InclVertex(c->head.prev, poly_CreateNode(v)); + pcb_poly_vertex_include(c->head.prev, pcb_poly_node_create(v)); v[1] = pin->Y - d; - poly_InclVertex(c->head.prev, poly_CreateNode(v)); + pcb_poly_vertex_include(c->head.prev, pcb_poly_node_create(v)); if (style == 2) { v[0] = pin->X - out; - poly_InclVertex(c->head.prev, poly_CreateNode(v)); + pcb_poly_vertex_include(c->head.prev, pcb_poly_node_create(v)); } else frac_circle(c, v[0] - pin->Clearance / 4, v[1], v, 2); v[1] = pin->Y - in; - poly_InclVertex(c->head.prev, poly_CreateNode(v)); + pcb_poly_vertex_include(c->head.prev, pcb_poly_node_create(v)); /* pivot 1/4 circle to next point */ frac_circle(c, pin->X - in, pin->Y - in, v, 4); v[0] = pin->X - d; - poly_InclVertex(c->head.prev, poly_CreateNode(v)); + pcb_poly_vertex_include(c->head.prev, pcb_poly_node_create(v)); if (style == 5) frac_circle(c, v[0], v[1] + pin->Clearance / 4, v, 2); p2 = ContourToPoly(c); @@ -280,24 +280,24 @@ /* top left */ v[0] = pin->X - d; v[1] = pin->Y + out; - if ((c = poly_NewContour(v)) == NULL) + if ((c = pcb_poly_contour_new(v)) == NULL) return NULL; v[0] = pin->X - in; - poly_InclVertex(c->head.prev, poly_CreateNode(v)); + pcb_poly_vertex_include(c->head.prev, pcb_poly_node_create(v)); /* pivot 1/4 circle to next point (x-out, y+in) */ frac_circle(c, pin->X - in, pin->Y + in, v, 4); v[1] = pin->Y + d; - poly_InclVertex(c->head.prev, poly_CreateNode(v)); + pcb_poly_vertex_include(c->head.prev, pcb_poly_node_create(v)); if (style == 2) { v[0] = pin->X - in; - poly_InclVertex(c->head.prev, poly_CreateNode(v)); + pcb_poly_vertex_include(c->head.prev, pcb_poly_node_create(v)); } else frac_circle(c, v[0] + pin->Clearance / 4, v[1], v, 2); v[1] = pin->Y + in; - poly_InclVertex(c->head.prev, poly_CreateNode(v)); + pcb_poly_vertex_include(c->head.prev, pcb_poly_node_create(v)); v[0] = pin->X - d; - poly_InclVertex(c->head.prev, poly_CreateNode(v)); + pcb_poly_vertex_include(c->head.prev, pcb_poly_node_create(v)); if (style == 5) frac_circle(c, v[0], v[1] + pin->Clearance / 4, v, 2); p2 = ContourToPoly(c); Index: trunk/src/polyarea.h =================================================================== --- trunk/src/polyarea.h (revision 4987) +++ trunk/src/polyarea.h (revision 4988) @@ -91,21 +91,21 @@ } Flags; }; -pcb_pline_t *poly_NewContour(pcb_vector_t v); +pcb_pline_t *pcb_poly_contour_new(pcb_vector_t v); -void poly_IniContour(pcb_pline_t * c); -void poly_ClrContour(pcb_pline_t * c); /* clears list of vertices */ -void poly_DelContour(pcb_pline_t ** c); +void pcb_poly_contour_init(pcb_pline_t * c); +void pcb_poly_contour_clear(pcb_pline_t * c); /* clears list of vertices */ +void pcb_poly_contour_del(pcb_pline_t ** c); -pcb_bool poly_CopyContour(pcb_pline_t ** dst, pcb_pline_t * src); +pcb_bool pcb_poly_contour_copy(pcb_pline_t ** dst, pcb_pline_t * src); -void poly_PreContour(pcb_pline_t * c, pcb_bool optimize); /* prepare contour */ -void poly_InvContour(pcb_pline_t * c); /* invert contour */ +void pcb_poly_contour_pre(pcb_pline_t * c, pcb_bool optimize); /* prepare contour */ +void pcb_poly_contour_inv(pcb_pline_t * c); /* invert contour */ -pcb_vnode_t *poly_CreateNode(pcb_vector_t v); +pcb_vnode_t *pcb_poly_node_create(pcb_vector_t v); -void poly_InclVertex(pcb_vnode_t * after, pcb_vnode_t * node); -void poly_ExclVertex(pcb_vnode_t * node); +void pcb_poly_vertex_include(pcb_vnode_t * after, pcb_vnode_t * node); +void pcb_poly_vertex_exclude(pcb_vnode_t * node); /**********************************************************************/ @@ -116,20 +116,20 @@ pcb_rtree_t *contour_tree; }; -pcb_bool poly_M_Copy0(pcb_polyarea_t ** dst, const pcb_polyarea_t * srcfst); -void poly_M_Incl(pcb_polyarea_t ** list, pcb_polyarea_t * a); +pcb_bool pcb_poly_m_copy0(pcb_polyarea_t ** dst, const pcb_polyarea_t * srcfst); +void pcb_poly_m_include(pcb_polyarea_t ** list, pcb_polyarea_t * a); -pcb_bool poly_Copy0(pcb_polyarea_t ** dst, const pcb_polyarea_t * src); -pcb_bool poly_Copy1(pcb_polyarea_t * dst, const pcb_polyarea_t * src); +pcb_bool pcb_poly_copy0(pcb_polyarea_t ** dst, const pcb_polyarea_t * src); +pcb_bool pcb_poly_copy1(pcb_polyarea_t * dst, const pcb_polyarea_t * src); -pcb_bool poly_InclContour(pcb_polyarea_t * p, pcb_pline_t * c); -pcb_bool poly_ExclContour(pcb_polyarea_t * p, pcb_pline_t * c); +pcb_bool pcb_poly_contour_include(pcb_polyarea_t * p, pcb_pline_t * c); +pcb_bool pcb_poly_contour_exclide(pcb_polyarea_t * p, pcb_pline_t * c); -pcb_bool poly_ChkContour(pcb_pline_t * a); +pcb_bool pcb_poly_contour_check(pcb_pline_t * a); -pcb_bool poly_CheckInside(pcb_polyarea_t * c, pcb_vector_t v0); -pcb_bool Touching(pcb_polyarea_t * p1, pcb_polyarea_t * p2); +pcb_bool pcb_poly_contour_inside(pcb_polyarea_t * c, pcb_vector_t v0); +pcb_bool pcb_poly_touching(pcb_polyarea_t * p1, pcb_polyarea_t * p2); /**********************************************************************/ Index: trunk/src/polygon.c =================================================================== --- trunk/src/polygon.c (revision 4987) +++ trunk/src/polygon.c (revision 4988) @@ -204,7 +204,7 @@ if (n->contours->area < PCB->IsleArea) { n->b->f = n->f; n->f->b = n->b; - poly_DelContour(&n->contours); + pcb_poly_contour_del(&n->contours); if (n == p) p = n->f; n = n->f; @@ -238,11 +238,11 @@ pcb_polyarea_t *ContourToPoly(pcb_pline_t * contour) { pcb_polyarea_t *p; - poly_PreContour(contour, pcb_true); + pcb_poly_contour_pre(contour, pcb_true); assert(contour->Flags.orient == PLF_DIR); if (!(p = poly_Create())) return NULL; - poly_InclContour(p, contour); + pcb_poly_contour_include(p, contour); assert(poly_Valid(p)); return p; } @@ -266,23 +266,23 @@ v[0] = p->Points[n].X; v[1] = p->Points[n].Y; if (contour == NULL) { - if ((contour = poly_NewContour(v)) == NULL) + if ((contour = pcb_poly_contour_new(v)) == NULL) return NULL; } else { - poly_InclVertex(contour->head.prev, poly_CreateNode(v)); + pcb_poly_vertex_include(contour->head.prev, pcb_poly_node_create(v)); } /* Is current point last in contour? If so process it. */ if (n == p->PointN - 1 || (hole < p->HoleIndexN && n == p->HoleIndex[hole] - 1)) { - poly_PreContour(contour, pcb_true); + pcb_poly_contour_pre(contour, pcb_true); /* make sure it is a positive contour (outer) or negative (hole) */ if (contour->Flags.orient != (hole ? PLF_INV : PLF_DIR)) - poly_InvContour(contour); + pcb_poly_contour_inv(contour); assert(contour->Flags.orient == (hole ? PLF_INV : PLF_DIR)); - poly_InclContour(np, contour); + pcb_poly_contour_include(np, contour); contour = NULL; assert(poly_Valid(np)); @@ -308,17 +308,17 @@ v[0] = x1; v[1] = y1; - if ((contour = poly_NewContour(v)) == NULL) + if ((contour = pcb_poly_contour_new(v)) == NULL) return NULL; v[0] = x2; v[1] = y1; - poly_InclVertex(contour->head.prev, poly_CreateNode(v)); + pcb_poly_vertex_include(contour->head.prev, pcb_poly_node_create(v)); v[0] = x2; v[1] = y2; - poly_InclVertex(contour->head.prev, poly_CreateNode(v)); + pcb_poly_vertex_include(contour->head.prev, pcb_poly_node_create(v)); v[0] = x1; v[1] = y2; - poly_InclVertex(contour->head.prev, poly_CreateNode(v)); + pcb_poly_vertex_include(contour->head.prev, pcb_poly_node_create(v)); return ContourToPoly(contour); } @@ -358,36 +358,36 @@ /* point 7 */ v[0] = x + ROUND(radius * 0.5) * xm[7]; v[1] = y + ROUND(radius * PCB_TAN_22_5_DEGREE_2) * ym[7]; - if ((contour = poly_NewContour(v)) == NULL) + if ((contour = pcb_poly_contour_new(v)) == NULL) return NULL; /* point 6 */ v[0] = x + ROUND(radius * PCB_TAN_22_5_DEGREE_2) * xm[6]; v[1] = y + ROUND(radius * 0.5) * ym[6]; - poly_InclVertex(contour->head.prev, poly_CreateNode(v)); + pcb_poly_vertex_include(contour->head.prev, pcb_poly_node_create(v)); /* point 5 */ v[0] = x - ROUND(radius * PCB_TAN_22_5_DEGREE_2) * xm[5]; v[1] = y + ROUND(radius * 0.5) * ym[5]; - poly_InclVertex(contour->head.prev, poly_CreateNode(v)); + pcb_poly_vertex_include(contour->head.prev, pcb_poly_node_create(v)); /* point 4 */ v[0] = x - ROUND(radius * 0.5) * xm[4]; v[1] = y + ROUND(radius * PCB_TAN_22_5_DEGREE_2) * ym[4]; - poly_InclVertex(contour->head.prev, poly_CreateNode(v)); + pcb_poly_vertex_include(contour->head.prev, pcb_poly_node_create(v)); /* point 3 */ v[0] = x - ROUND(radius * 0.5) * xm[3]; v[1] = y - ROUND(radius * PCB_TAN_22_5_DEGREE_2) * ym[3]; - poly_InclVertex(contour->head.prev, poly_CreateNode(v)); + pcb_poly_vertex_include(contour->head.prev, pcb_poly_node_create(v)); /* point 2 */ v[0] = x - ROUND(radius * PCB_TAN_22_5_DEGREE_2) * xm[2]; v[1] = y - ROUND(radius * 0.5) * ym[2]; - poly_InclVertex(contour->head.prev, poly_CreateNode(v)); + pcb_poly_vertex_include(contour->head.prev, pcb_poly_node_create(v)); /* point 1 */ v[0] = x + ROUND(radius * PCB_TAN_22_5_DEGREE_2) * xm[1]; v[1] = y - ROUND(radius * 0.5) * ym[1]; - poly_InclVertex(contour->head.prev, poly_CreateNode(v)); + pcb_poly_vertex_include(contour->head.prev, pcb_poly_node_create(v)); /* point 0 */ v[0] = x + ROUND(radius * 0.5) * xm[0]; v[1] = y - ROUND(radius * PCB_TAN_22_5_DEGREE_2) * ym[0]; - poly_InclVertex(contour->head.prev, poly_CreateNode(v)); + pcb_poly_vertex_include(contour->head.prev, pcb_poly_node_create(v)); return ContourToPoly(contour); } @@ -403,7 +403,7 @@ double e1, e2, t1; int i; - poly_InclVertex(c->head.prev, poly_CreateNode(v)); + pcb_poly_vertex_include(c->head.prev, pcb_poly_node_create(v)); /* move vector to origin */ e1 = (v[0] - X) * POLY_CIRC_RADIUS_ADJ; e2 = (v[1] - Y) * POLY_CIRC_RADIUS_ADJ; @@ -417,7 +417,7 @@ e1 = t1; v[0] = X + ROUND(e1); v[1] = Y + ROUND(e2); - poly_InclVertex(c->head.prev, poly_CreateNode(v)); + pcb_poly_vertex_include(c->head.prev, pcb_poly_node_create(v)); } } @@ -431,7 +431,7 @@ return NULL; v[0] = x + radius; v[1] = y; - if ((contour = poly_NewContour(v)) == NULL) + if ((contour = pcb_poly_contour_new(v)) == NULL) return NULL; frac_circle(contour, x, y, v, 1); contour->is_round = pcb_true; @@ -451,20 +451,20 @@ assert(y2 > y1); v[0] = x1 - t; v[1] = y1; - if ((contour = poly_NewContour(v)) == NULL) + if ((contour = pcb_poly_contour_new(v)) == NULL) return NULL; frac_circle(contour, x1, y1, v, 4); v[0] = x2; v[1] = y1 - t; - poly_InclVertex(contour->head.prev, poly_CreateNode(v)); + pcb_poly_vertex_include(contour->head.prev, pcb_poly_node_create(v)); frac_circle(contour, x2, y1, v, 4); v[0] = x2 + t; v[1] = y2; - poly_InclVertex(contour->head.prev, poly_CreateNode(v)); + pcb_poly_vertex_include(contour->head.prev, pcb_poly_node_create(v)); frac_circle(contour, x2, y2, v, 4); v[0] = x1; v[1] = y2 + t; - poly_InclVertex(contour->head.prev, poly_CreateNode(v)); + pcb_poly_vertex_include(contour->head.prev, pcb_poly_node_create(v)); frac_circle(contour, x1, y2, v, 4); return ContourToPoly(contour); } @@ -503,13 +503,13 @@ radius_adj = (M_PI * da / 360) * (M_PI * da / 360) / 2; v[0] = a->X - rx * cos(ang * PCB_M180); v[1] = a->Y + ry * sin(ang * PCB_M180); - if ((contour = poly_NewContour(v)) == NULL) + if ((contour = pcb_poly_contour_new(v)) == NULL) return 0; for (i = 0; i < segs - 1; i++) { ang += da; v[0] = a->X - rx * cos(ang * PCB_M180); v[1] = a->Y + ry * sin(ang * PCB_M180); - poly_InclVertex(contour->head.prev, poly_CreateNode(v)); + pcb_poly_vertex_include(contour->head.prev, pcb_poly_node_create(v)); } /* find last point */ ang = a->StartAngle + a->Delta; @@ -524,7 +524,7 @@ for (i = 0; i < segs; i++) { v[0] = a->X - rx * cos(ang * PCB_M180); v[1] = a->Y + ry * sin(ang * PCB_M180); - poly_InclVertex(contour->head.prev, poly_CreateNode(v)); + pcb_poly_vertex_include(contour->head.prev, pcb_poly_node_create(v)); ang += da; } /* now add other round cap */ @@ -600,21 +600,21 @@ } v[0] = l->Point1.X - dx; v[1] = l->Point1.Y - dy; - if ((contour = poly_NewContour(v)) == NULL) + if ((contour = pcb_poly_contour_new(v)) == NULL) return 0; v[0] = l->Point2.X - dx; v[1] = l->Point2.Y - dy; if (PCB_FLAG_TEST(PCB_FLAG_SQUARE, l)) - poly_InclVertex(contour->head.prev, poly_CreateNode(v)); + pcb_poly_vertex_include(contour->head.prev, pcb_poly_node_create(v)); else frac_circle(contour, l->Point2.X, l->Point2.Y, v, 2); v[0] = l->Point2.X + dx; v[1] = l->Point2.Y + dy; - poly_InclVertex(contour->head.prev, poly_CreateNode(v)); + pcb_poly_vertex_include(contour->head.prev, pcb_poly_node_create(v)); v[0] = l->Point1.X + dx; v[1] = l->Point1.Y + dy; if (PCB_FLAG_TEST(PCB_FLAG_SQUARE, l)) - poly_InclVertex(contour->head.prev, poly_CreateNode(v)); + pcb_poly_vertex_include(contour->head.prev, pcb_poly_node_create(v)); else frac_circle(contour, l->Point1.X, l->Point1.Y, v, 2); /* now we have the line contour */ @@ -669,23 +669,23 @@ v[0] = c->Point1.X - tx; v[1] = c->Point1.Y - ty; - if ((contour = poly_NewContour(v)) == NULL) + if ((contour = pcb_poly_contour_new(v)) == NULL) return 0; frac_circle(contour, (t->Point1.X - tx), (t->Point1.Y - ty), v, 4); v[0] = t->Point2.X - cx; v[1] = t->Point2.Y - cy; - poly_InclVertex(contour->head.prev, poly_CreateNode(v)); + pcb_poly_vertex_include(contour->head.prev, pcb_poly_node_create(v)); frac_circle(contour, (t->Point2.X - tx), (t->Point2.Y - ty), v, 4); v[0] = c->Point2.X + tx; v[1] = c->Point2.Y + ty; - poly_InclVertex(contour->head.prev, poly_CreateNode(v)); + pcb_poly_vertex_include(contour->head.prev, pcb_poly_node_create(v)); frac_circle(contour, (t->Point2.X + tx), (t->Point2.Y + ty), v, 4); v[0] = t->Point1.X + cx; v[1] = t->Point1.Y + cy; - poly_InclVertex(contour->head.prev, poly_CreateNode(v)); + pcb_poly_vertex_include(contour->head.prev, pcb_poly_node_create(v)); frac_circle(contour, (t->Point1.X + tx), (t->Point1.Y + ty), v, 4); /* now we have the line contour */ @@ -1560,7 +1560,7 @@ { pcb_polyarea_t *x; pcb_bool ans; - ans = Touching(a, p->Clipped); + ans = pcb_poly_touching(a, p->Clipped); /* argument may be register, so we must copy it */ x = a; if (fr) @@ -1575,7 +1575,7 @@ pcb_vector_t v; v[0] = X; v[1] = Y; - if (poly_CheckInside(p->Clipped, v)) + if (pcb_poly_contour_inside(p->Clipped, v)) return pcb_true; if (PCB_FLAG_TEST(PCB_FLAG_FULLPOLY, p)) { @@ -1583,7 +1583,7 @@ /* Check all clipped-away regions that are now drawn because of full-poly */ for (tmp.Clipped = p->Clipped->f; tmp.Clipped != p->Clipped; tmp.Clipped = tmp.Clipped->f) - if (poly_CheckInside(tmp.Clipped, v)) + if (pcb_poly_contour_inside(tmp.Clipped, v)) return pcb_true; } @@ -1663,7 +1663,7 @@ main_contour = poly_Create(); /* copy the main poly only */ - poly_Copy1(main_contour, p->Clipped); + pcb_poly_copy1(main_contour, p->Clipped); /* clip to the bounding box */ if (clip) { pcb_polyarea_t *cbox = RectPoly(clip->X1, clip->X2, clip->Y1, clip->Y2); @@ -1740,7 +1740,7 @@ pcb_polyarea_t *t = p; p = p->f; - poly_DelContour(&t->contours); + pcb_poly_contour_del(&t->contours); free(t); } } Index: trunk/src/polygon1.c =================================================================== --- trunk/src/polygon1.c (revision 4987) +++ trunk/src/polygon1.c (revision 4988) @@ -190,7 +190,7 @@ return dest; if (vect_equal(po, dest->next->point)) return dest->next; - p = poly_CreateNode(po); + p = pcb_poly_node_create(po); if (p == NULL) return NULL; p->cvc_prev = p->cvc_next = NULL; @@ -231,13 +231,13 @@ if (side == 'P') { if (a->prev->cvc_prev == (pcb_cvc_list_t *) - 1) a->prev->cvc_prev = a->prev->cvc_next = NULL; - poly_ExclVertex(a->prev); + pcb_poly_vertex_exclude(a->prev); vect_sub(v, a->prev->point, a->point); } else { if (a->next->cvc_prev == (pcb_cvc_list_t *) - 1) a->next->cvc_prev = a->next->cvc_next = NULL; - poly_ExclVertex(a->next); + pcb_poly_vertex_exclude(a->next); vect_sub(v, a->next->point, a->point); } } @@ -1230,7 +1230,7 @@ poly_dump(dest); #endif #endif - poly_DelContour(&curh); + pcb_poly_contour_del(&curh); error(err_bad_parm); } /* Now search the heap for the container. If there was only one item @@ -1263,7 +1263,7 @@ #endif #endif curh->next = NULL; - poly_DelContour(&curh); + pcb_poly_contour_del(&curh); error(err_bad_parm); } else { @@ -1466,14 +1466,14 @@ break; /* add edge to polygon */ if (!*result) { - *result = poly_NewContour(cur->point); + *result = pcb_poly_contour_new(cur->point); if (*result == NULL) return err_no_memory; } else { - if ((newn = poly_CreateNode(cur->point)) == NULL) + if ((newn = pcb_poly_node_create(cur->point)) == NULL) return err_no_memory; - poly_InclVertex((*result)->head.prev, newn); + pcb_poly_vertex_include((*result)->head.prev, newn); } #ifdef DEBUG_GATHER DEBUGP("gather vertex at %#mD\n", cur->point[0], cur->point[1]); @@ -1498,12 +1498,12 @@ int errc = err_ok; if ((errc = Gather(dir == FORW ? cur : cur->next, &p, j_rule, dir)) != err_ok) { if (p != NULL) - poly_DelContour(&p); + pcb_poly_contour_del(&p); error(errc); } if (!p) return; - poly_PreContour(p, pcb_true); + pcb_poly_contour_pre(p, pcb_true); if (p->Count > 2) { #ifdef DEBUG_GATHER DEBUGP("adding contour with %d vertices and direction %c\n", p->Count, p->Flags.orient ? 'F' : 'B'); @@ -1515,7 +1515,7 @@ #ifdef DEBUG_GATHER DEBUGP("Bad contour! Not enough points!!\n"); #endif - poly_DelContour(&p); + pcb_poly_contour_del(&p); } } @@ -1576,7 +1576,7 @@ /* disappear this contour (rtree entry removed in PutContour) */ *A = tmprev->next; tmprev->next = NULL; - poly_InvContour(tmprev); + pcb_poly_contour_inv(tmprev); PutContour(e, tmprev, contours, holes, owner, NULL, NULL); return pcb_true; } @@ -1613,7 +1613,7 @@ switch (action) { case PBO_XOR: case PBO_SUB: - poly_InvContour(*cur); + pcb_poly_contour_inv(*cur); case PBO_ISECT: tmp = *cur; *cur = tmp->next; @@ -1836,7 +1836,7 @@ curc = a->contours; remove_contour(a, NULL, curc, pcb_false); /* Rtree deleted in poly_Free below */ /* a->contours now points to the remaining holes */ - poly_DelContour(&curc); + pcb_poly_contour_del(&curc); if (a->contours != NULL) { /* Find the end of the list of holes */ @@ -1887,7 +1887,7 @@ /* Remove hole from the contour */ remove_contour(a, prev, info.result, pcb_true); - poly_DelContour(&info.result); + pcb_poly_contour_del(&info.result); } /* End check for deleted holes */ @@ -1934,7 +1934,7 @@ if (del_contour) { /* Delete the contour */ - poly_DelContour(&curc); /* NB: Sets curc to NULL */ + pcb_poly_contour_del(&curc); /* NB: Sets curc to NULL */ } else if (hole_contour) { /* Link into the list of holes */ @@ -2024,7 +2024,7 @@ } /* determine if two polygons touch or overlap */ -pcb_bool Touching(pcb_polyarea_t * a, pcb_polyarea_t * b) +pcb_bool pcb_poly_touching(pcb_polyarea_t * a, pcb_polyarea_t * b) { jmp_buf e; int code; @@ -2053,7 +2053,7 @@ { pcb_polyarea_t *a = NULL, *b = NULL; - if (!poly_M_Copy0(&a, a_org) || !poly_M_Copy0(&b, b_org)) + if (!pcb_poly_m_copy0(&a, a_org) || !pcb_poly_m_copy0(&b, b_org)) return err_no_memory; return poly_Boolean_free(a, b, res, action); @@ -2121,7 +2121,7 @@ /* free a_isected */ while ((p = a_isected) != NULL) { a_isected = p->next; - poly_DelContour(&p); + pcb_poly_contour_del(&p); } InsertHoles(&e, *res, &holes); @@ -2129,7 +2129,7 @@ /* delete holes if any left */ while ((p = holes) != NULL) { holes = p->next; - poly_DelContour(&p); + pcb_poly_contour_del(&p); } if (code) { @@ -2190,7 +2190,7 @@ /* delete holes if any left */ while ((p = holes) != NULL) { holes = p->next; - poly_DelContour(&p); + pcb_poly_contour_del(&p); } holes = NULL; clear_marks(a); @@ -2204,7 +2204,7 @@ /* delete holes if any left */ while ((p = holes) != NULL) { holes = p->next; - poly_DelContour(&p); + pcb_poly_contour_del(&p); } @@ -2229,7 +2229,7 @@ return (a == b) || (a->next == b) || (b->next == a) || (a->next == b->next); } -pcb_vnode_t *poly_CreateNode(pcb_vector_t v) +pcb_vnode_t *pcb_poly_node_create(pcb_vector_t v) { pcb_vnode_t *res; pcb_coord_t *c; @@ -2245,7 +2245,7 @@ return res; } -void poly_IniContour(pcb_pline_t * c) +void pcb_poly_contour_init(pcb_pline_t * c) { if (c == NULL) return; @@ -2259,7 +2259,7 @@ c->radius = 0; } -pcb_pline_t *poly_NewContour(pcb_vector_t v) +pcb_pline_t *pcb_poly_contour_new(pcb_vector_t v) { pcb_pline_t *res; @@ -2267,7 +2267,7 @@ if (res == NULL) return NULL; - poly_IniContour(res); + pcb_poly_contour_init(res); if (v != NULL) { Vcopy(res->head.point, v); @@ -2277,19 +2277,19 @@ return res; } -void poly_ClrContour(pcb_pline_t * c) +void pcb_poly_contour_clear(pcb_pline_t * c) { pcb_vnode_t *cur; assert(c != NULL); while ((cur = c->head.next) != &c->head) { - poly_ExclVertex(cur); + pcb_poly_vertex_exclude(cur); free(cur); } - poly_IniContour(c); + pcb_poly_contour_init(c); } -void poly_DelContour(pcb_pline_t ** c) +void pcb_poly_contour_del(pcb_pline_t ** c) { pcb_vnode_t *cur, *prev; @@ -2315,7 +2315,7 @@ free(*c), *c = NULL; } -void poly_PreContour(pcb_pline_t * C, pcb_bool optimize) +void pcb_poly_contour_pre(pcb_pline_t * C, pcb_bool optimize) { double area = 0; pcb_vnode_t *p, *c; @@ -2335,7 +2335,7 @@ */ if (vect_det2(p1, p2) == 0) { - poly_ExclVertex(c); + pcb_poly_vertex_exclude(c); free(c); c = p; } @@ -2368,7 +2368,7 @@ return R_DIR_FOUND_CONTINUE; } -void poly_InvContour(pcb_pline_t * c) +void pcb_poly_contour_inv(pcb_pline_t * c) { pcb_vnode_t *cur, *next; int r; @@ -2389,7 +2389,7 @@ } } -void poly_ExclVertex(pcb_vnode_t * node) +void pcb_poly_vertex_exclude(pcb_vnode_t * node) { assert(node != NULL); if (node->cvc_next) { @@ -2400,7 +2400,7 @@ node->next->prev = node->prev; } -void poly_InclVertex(pcb_vnode_t * after, pcb_vnode_t * node) +void pcb_poly_vertex_include(pcb_vnode_t * after, pcb_vnode_t * node) { double a, b; assert(after != NULL); @@ -2424,13 +2424,13 @@ } } -pcb_bool poly_CopyContour(pcb_pline_t ** dst, pcb_pline_t * src) +pcb_bool pcb_poly_contour_copy(pcb_pline_t ** dst, pcb_pline_t * src) { pcb_vnode_t *cur, *newnode; assert(src != NULL); *dst = NULL; - *dst = poly_NewContour(src->head.point); + *dst = pcb_poly_contour_new(src->head.point); if (*dst == NULL) return pcb_false; @@ -2441,10 +2441,10 @@ (*dst)->area = src->area; for (cur = src->head.next; cur != &src->head; cur = cur->next) { - if ((newnode = poly_CreateNode(cur->point)) == NULL) + if ((newnode = pcb_poly_node_create(cur->point)) == NULL) return pcb_false; /* newnode->Flags = cur->Flags; */ - poly_InclVertex((*dst)->head.prev, newnode); + pcb_poly_vertex_include((*dst)->head.prev, newnode); } (*dst)->tree = (pcb_rtree_t *) make_edge_tree(*dst); return pcb_true; @@ -2453,7 +2453,7 @@ /**********************************************************************/ /* polygon routines */ -pcb_bool poly_Copy0(pcb_polyarea_t ** dst, const pcb_polyarea_t * src) +pcb_bool pcb_poly_copy0(pcb_polyarea_t ** dst, const pcb_polyarea_t * src) { *dst = NULL; if (src != NULL) @@ -2462,10 +2462,10 @@ return pcb_false; (*dst)->contour_tree = r_create_tree(NULL, 0, 0); - return poly_Copy1(*dst, src); + return pcb_poly_copy1(*dst, src); } -pcb_bool poly_Copy1(pcb_polyarea_t * dst, const pcb_polyarea_t * src) +pcb_bool pcb_poly_copy1(pcb_polyarea_t * dst, const pcb_polyarea_t * src) { pcb_pline_t *cur, **last = &dst->contours; @@ -2473,7 +2473,7 @@ dst->f = dst->b = dst; for (cur = src->contours; cur != NULL; cur = cur->next) { - if (!poly_CopyContour(last, cur)) + if (!pcb_poly_contour_copy(last, cur)) return pcb_false; r_insert_entry(dst->contour_tree, (pcb_box_t *) * last, 0); last = &(*last)->next; @@ -2481,7 +2481,7 @@ return pcb_true; } -void poly_M_Incl(pcb_polyarea_t ** list, pcb_polyarea_t * a) +void pcb_poly_m_include(pcb_polyarea_t ** list, pcb_polyarea_t * a) { if (*list == NULL) a->f = a->b = a, *list = a; @@ -2492,7 +2492,7 @@ } } -pcb_bool poly_M_Copy0(pcb_polyarea_t ** dst, const pcb_polyarea_t * srcfst) +pcb_bool pcb_poly_m_copy0(pcb_polyarea_t ** dst, const pcb_polyarea_t * srcfst) { const pcb_polyarea_t *src = srcfst; pcb_polyarea_t *di; @@ -2501,15 +2501,15 @@ if (src == NULL) return pcb_false; do { - if ((di = poly_Create()) == NULL || !poly_Copy1(di, src)) + if ((di = poly_Create()) == NULL || !pcb_poly_copy1(di, src)) return pcb_false; - poly_M_Incl(dst, di); + pcb_poly_m_include(dst, di); } while ((src = src->f) != srcfst); return pcb_true; } -pcb_bool poly_InclContour(pcb_polyarea_t * p, pcb_pline_t * c) +pcb_bool pcb_poly_contour_include(pcb_polyarea_t * p, pcb_pline_t * c) { pcb_pline_t *tmp; @@ -2594,7 +2594,7 @@ return info.f; } -pcb_bool poly_CheckInside(pcb_polyarea_t * p, pcb_vector_t v0) +pcb_bool pcb_poly_contour_inside(pcb_polyarea_t * p, pcb_vector_t v0) { pcb_pline_t *cur; @@ -2618,7 +2618,7 @@ return pcb_false; cur = p; do { - if (poly_CheckInside(cur, v0)) + if (pcb_poly_contour_inside(cur, v0)) return pcb_true; } while ((cur = cur->f) != p); @@ -2799,7 +2799,7 @@ while ((pl = *pline) != NULL) { *pline = pl->next; - poly_DelContour(&pl); + pcb_poly_contour_del(&pl); } } @@ -2842,7 +2842,7 @@ } /* inside_sector */ /* returns pcb_true if bad contour */ -pcb_bool poly_ChkContour(pcb_pline_t * a) +pcb_bool pcb_poly_contour_check(pcb_pline_t * a) { pcb_vnode_t *a1, *a2, *hit1, *hit2; pcb_vector_t i1, i2; @@ -2933,13 +2933,13 @@ if ((p == NULL) || (p->contours == NULL)) return pcb_false; - if (p->contours->Flags.orient == PLF_INV || poly_ChkContour(p->contours)) { + if (p->contours->Flags.orient == PLF_INV || pcb_poly_contour_check(p->contours)) { #ifndef NDEBUG pcb_vnode_t *v, *n; DEBUGP("Invalid Outer pcb_pline_t\n"); if (p->contours->Flags.orient == PLF_INV) DEBUGP("failed orient\n"); - if (poly_ChkContour(p->contours)) + if (pcb_poly_contour_check(p->contours)) DEBUGP("failed self-intersection\n"); v = &p->contours->head; do { @@ -2951,13 +2951,13 @@ return pcb_false; } for (c = p->contours->next; c != NULL; c = c->next) { - if (c->Flags.orient == PLF_DIR || poly_ChkContour(c) || !poly_ContourInContour(p->contours, c)) { + if (c->Flags.orient == PLF_DIR || pcb_poly_contour_check(c) || !poly_ContourInContour(p->contours, c)) { #ifndef NDEBUG pcb_vnode_t *v, *n; DEBUGP("Invalid Inner pcb_pline_t orient = %d\n", c->Flags.orient); if (c->Flags.orient == PLF_DIR) DEBUGP("failed orient\n"); - if (poly_ChkContour(c)) + if (pcb_poly_contour_check(c)) DEBUGP("failed self-intersection\n"); if (!poly_ContourInContour(p->contours, c)) DEBUGP("failed containment\n"); Index: trunk/src_plugins/jostle/jostle.c =================================================================== --- trunk/src_plugins/jostle/jostle.c (revision 4987) +++ trunk/src_plugins/jostle/jostle.c (revision 4988) @@ -393,7 +393,7 @@ inside++; } lp = LinePoly(line, line->Thickness); - if (!Touching(lp, info->brush)) { + if (!pcb_poly_touching(lp, info->brush)) { /* not a factor */ return 0; } @@ -410,7 +410,7 @@ * around. Use a very fine line. XXX can still graze. */ lp = LinePoly(line, 1); - if (!poly_M_Copy0(©, info->brush)) + if (!pcb_poly_m_copy0(©, info->brush)) return 0; r = poly_Boolean_free(copy, lp, &tmp, PBO_SUB); if (r != err_ok) { Index: trunk/src_plugins/polycombine/polycombine.c =================================================================== --- trunk/src_plugins/polycombine/polycombine.c (revision 4987) +++ trunk/src_plugins/polycombine/polycombine.c (revision 4988) @@ -59,16 +59,16 @@ v[0] = p->Points[n].X; v[1] = p->Points[n].Y; if (contour == NULL) { - if ((contour = poly_NewContour(v)) == NULL) + if ((contour = pcb_poly_contour_new(v)) == NULL) return NULL; } else { - poly_InclVertex(contour->head.prev, poly_CreateNode(v)); + pcb_poly_vertex_include(contour->head.prev, pcb_poly_node_create(v)); } /* Is current point last in contour? If so process it. */ if (n == p->PointN - 1 || (hole < p->HoleIndexN && n == p->HoleIndex[hole] - 1)) { - poly_PreContour(contour, pcb_true); + pcb_poly_contour_pre(contour, pcb_true); /* Log the direction in which the outer contour was specified */ if (hole == 0) @@ -76,10 +76,10 @@ /* make sure it is a positive contour (outer) or negative (hole) */ if (contour->Flags.orient != (hole ? PLF_INV : PLF_DIR)) - poly_InvContour(contour); + pcb_poly_contour_inv(contour); assert(contour->Flags.orient == (hole ? PLF_INV : PLF_DIR)); - poly_InclContour(np, contour); + pcb_poly_contour_include(np, contour); contour = NULL; assert(poly_Valid(np)); @@ -131,7 +131,7 @@ { /* int contours_isect;*/ /* Should check outer contours don't intersect? */ -/* contours_isect = Touching (outer, inner);*/ +/* contours_isect = pcb_poly_touching(outer, inner);*/ /* Cheat and assume simple single contour polygons for now */ /* return contours_isect ? 0 : poly_ContourInContour (outer->contours, inner->contours);*/