#include "poly.h"
#include "convert.h"
#include "renderpoly.h"
+#include "stroke.h"
gfxline_t*mkstar(int x1, int y1, int x2, int y2)
{
int y = c%200;;
c = crc32_add_byte(c, t^0x55);
int r = c%100;
- b = gfxline_append(b, gfxline_makecircle(x,y,r,r));
+ gfxline_t*c = gfxline_makecircle(x,y,r,r);
+ b = gfxline_append(b, c);
//b = gfxline_append(b, gfxline_makerectangle(10,10,100,100));
}
return b;
}
static windcontext_t onepolygon = {1};
+static windcontext_t twopolygons = {2};
int test_speed()
{
m.ty = 400*1.41/2;
gfxline_t*l = gfxline_clone(b);
gfxline_transform(l, &m);
- gfxcompactpoly_t*poly = gfxcompactpoly_from_gfxline(b, 0.05);
+ gfxpoly_t*poly = gfxpoly_from_fill(b, 0.05);
- gfxpoly_t*poly2 = gfxpoly_process(poly, &windrule_evenodd, &onepolygon);
- gfxcompactpoly_destroy(poly);
+ gfxpoly_t*poly2 = gfxpoly_process(poly, 0, &windrule_evenodd, &onepolygon);
+ gfxpoly_destroy(poly);
gfxpoly_destroy(poly2);
gfxline_free(l);
}
gfxline_free(b);
}
+int testbox(int argn, char*argv[])
+{
+ gfxline_t*box1 = gfxline_makerectangle(-100,-100,100,100);
+ gfxline_t*box2 = gfxline_makerectangle(-50,-50,150,150);
+ gfxpoly_t*poly1 = gfxpoly_from_fill(box1, 0.05);
+ gfxpoly_t*poly2 = gfxpoly_from_fill(box2, 0.05);
+ gfxline_free(box1);
+ gfxline_free(box2);
+
+ gfxpoly_t*poly12 = gfxpoly_process(poly1, poly2, &windrule_intersect, &twopolygons);
+ gfxpoly_dump(poly12);
+ assert(gfxpoly_check(poly12, 0));
+ gfxpoly_destroy(poly12);
+}
+
+int teststroke(int argn, char*argv[])
+{
+ gfxline_t*box1 = gfxline_makerectangle(-100,-100,100,100);
+ assert(gfxpoly_check(gfxpoly_from_stroke(box1, 2.0, gfx_capRound, gfx_joinRound, 0, 0.05), 1));
+}
+
+int test0(int argn, char*argv[])
+{
+ gfxline_t*box1 = gfxline_makerectangle(-100,-100,100,100);
+ gfxline_t*box2 = gfxline_makerectangle(-100,-100,100,100);
+ gfxline_t*box3 = gfxline_makerectangle(-100,-100,100,100);
+ //gfxline_append(box2, box3);
+
+ gfxmatrix_t matrix;
+ memset(&matrix, 0, sizeof(gfxmatrix_t));
+ double ua=M_PI/4;
+ matrix.m00=cos(ua);matrix.m10=sin(ua);
+ matrix.m01=-sin(ua);matrix.m11=cos(ua);
+ gfxline_transform(box1, &matrix);
+
+ //gfxline_t*b = 0;
+ //b = gfxline_append(b, box1);
+ //b = gfxline_append(b, box2);
+ //gfxline_dump(b, stderr, "");
+
+ gfxpoly_t*poly1 = gfxpoly_from_fill(box1, 0.05);
+ gfxpoly_t*poly2 = gfxpoly_from_fill(box2, 0.05);
+
+ gfxline_free(box1);
+ gfxline_free(box2);
+
+ //gfxpoly_t*poly3 = gfxpoly_process(poly1, poly2, &windrule_intersect, &twopolygons);
+ gfxpoly_t*poly3 = gfxpoly_process(poly1, poly2, &windrule_intersect, &twopolygons);
+ gfxpoly_dump(poly3);
+
+ gfxline_t*line = gfxline_from_gfxpoly(poly3);
+
+ gfxline_dump(line, stdout, "");
+ gfxline_free(line);
+ gfxpoly_destroy(poly1);
+ gfxpoly_destroy(poly2);
+ gfxpoly_destroy(poly3);
+}
+
+
int test1(int argn, char*argv[])
{
gfxline_t*box1 = gfxline_makerectangle(50,50,150,150);
gfxline_t*box2 = gfxline_makerectangle(100,100,200,200);
- gfxline_t*box3 = gfxline_makerectangle(100,100,200,200);
+ gfxline_t*box3 = gfxline_makerectangle(200,100,300,200);
+ gfxline_t*box4 = gfxline_makerectangle(300,200,400,400);
+ gfxline_t* board = mkchessboard();
gfxline_t*star = mkstar(50,50, 150,150);
gfxline_t*b = 0;
b = gfxline_append(b, box1);
b = gfxline_append(b, box2);
b = gfxline_append(b, box3);
+ b = gfxline_append(b, box4);
gfxmatrix_t matrix;
memset(&matrix, 0, sizeof(gfxmatrix_t));
- double ua=0.1;
- matrix.m00=cos(ua);matrix.m10=sin(ua);
- matrix.m01=-sin(ua);matrix.m11=cos(ua);
+ matrix.m00 = 1.0;
+ matrix.m11 = 1.0;
+ matrix.tx = 200;
+ matrix.ty = 200;
+ gfxline_transform(board, &matrix);
+ b = gfxline_append(b, board);
//gfxline_transform(b, &matrix);
- gfxline_dump(b, stderr, "");
-
- gfxcompactpoly_t*poly = gfxcompactpoly_from_gfxline(b, 0.05);
+ //gfxline_dump(b, stderr, "");
+ gfxpoly_t*poly = gfxpoly_from_fill(b, 0.05);
+
gfxline_free(box1);
gfxline_free(box2);
gfxline_free(box3);
gfxline_free(star);
- gfxcompactpoly_dump(poly);
- gfxpoly_t*poly2 = gfxpoly_process(poly, &windrule_evenodd, &onepolygon);
- gfxcompactpoly_destroy(poly);
+ //gfxpoly_dump(poly);
+ gfxpoly_t*poly2 = gfxpoly_process(poly, 0, &windrule_evenodd, &onepolygon);
+ //gfxpoly_dump(poly2);
+ gfxpoly_save_arrows(poly2, "test.ps");
+ gfxpoly_destroy(poly);
gfxpoly_destroy(poly2);
}
-static void test_conversion(gfxline_t*line, double gridsize)
-{
- double zoom=1.0;
- gfxcompactpoly_t*poly = gfxcompactpoly_from_gfxline(line, gridsize);
- gfxpoly_t*poly1 = gfxpoly_from_gfxline(line, gridsize);
- gfxpoly_t*poly2 = gfxpoly_from_gfxcompactpoly(poly);
- assert(gfxpoly_check(poly1));
- assert(gfxpoly_check(poly2));
- assert(gfxcompactpoly_check(poly));
- intbbox_t bbox = intbbox_from_polygon(poly1, zoom);
- unsigned char*bitmap1 = render_polygon(poly1, &bbox, zoom, &windrule_evenodd, &onepolygon);
- assert(bitmap_ok(&bbox, bitmap1));
- unsigned char*bitmap2 = render_polygon(poly2, &bbox, zoom, &windrule_evenodd, &onepolygon);
- assert(bitmap_ok(&bbox, bitmap2));
- if(!compare_bitmaps(&bbox, bitmap1, bitmap2)) {
- save_two_bitmaps(&bbox, bitmap1, bitmap2, "error.png");
- assert(!"bitmaps don't match");
- }
-}
-
int test_square(int width, int height, int num, double gridsize, char bitmaptest)
{
int t;
line[num-1].y = line[0].y;
line[num-1].next = 0;
- test_conversion(line, gridsize);
-
- gfxcompactpoly_t*poly = gfxcompactpoly_from_gfxline(line, gridsize);
+ gfxpoly_t*poly1 = gfxpoly_from_fill(line, gridsize);
gfxline_free(line);
- gfxpoly_t*poly1 = gfxpoly_from_gfxcompactpoly(poly);
windrule_t*rule = &windrule_circular;
- gfxpoly_t*poly2 = gfxpoly_process(poly, rule, &onepolygon);
+ gfxpoly_t*poly2 = gfxpoly_process(poly1, 0, rule, &onepolygon);
if(bitmaptest) {
intbbox_t bbox = intbbox_new(0, 0, width, height);
unsigned char*bitmap1 = render_polygon(poly1, &bbox, 1.0, rule, &onepolygon);
}
gfxpoly_destroy(poly1);
gfxpoly_destroy(poly2);
- gfxcompactpoly_destroy(poly);
}
int test2(int argn, char*argv[])
gfxline_t*l = gfxline_clone(line);
gfxline_transform(l, &m);
- test_conversion(l, 0.05);
-
- gfxcompactpoly_t*poly = gfxcompactpoly_from_gfxline(l, 0.05);
- gfxpoly_t*poly2 = gfxpoly_process(poly, rule, &onepolygon);
+ gfxpoly_t*poly1 = gfxpoly_from_fill(l, 0.05);
+
+ gfxpoly_t*poly2 = gfxpoly_process(poly1, 0, rule, &onepolygon);
tag = swf_InsertTag(tag, ST_DEFINESHAPE);
SHAPE* s;
#define FILL
#ifdef FILL
- swf_ShapeSetAll(tag,s,0,0,0,fs,0);
- edge_t*e = poly2->edges;
- while(e) {
+ swf_ShapeSetAll(tag,s,UNDEFINED_COORD,UNDEFINED_COORD,0,fs,0);
+
+ int i,j;
+ gfxpolystroke_t*stroke = poly2->strokes;
+ for(;stroke;stroke=stroke->next) {
+ for(j=0;j<stroke->num_points-1;j++) {
+ point_t a = stroke->points[j];
+ point_t b = stroke->points[j+1];
#define ROTATE
#ifdef ROTATE
- swf_ShapeSetMove(tag, s, e->a.y, e->a.x);
- swf_ShapeSetLine(tag, s, e->b.y - e->a.y, e->b.x - e->a.x);
+ swf_ShapeSetMove(tag, s, a.y, a.x);
+ swf_ShapeSetLine(tag, s, b.y - a.y, b.x - a.x);
#else
- swf_ShapeSetMove(tag, s, e->a.x, e->a.y);
- swf_ShapeSetLine(tag, s, e->b.x - e->a.x, e->b.y - e->a.y);
+ swf_ShapeSetMove(tag, s, a.x, a.y);
+ swf_ShapeSetLine(tag, s, b.x - a.x, b.y - a.y);
#endif
- e = e->next;
- }
+ }
+ }
#else
swf_ShapeSetAll(tag,s,0,0,ls,0,0);
edge_t*e = poly2->edges;
swf_ShapeSetEnd(tag);
swf_ShapeFree(s);
- gfxcompactpoly_destroy(poly);
+ gfxpoly_destroy(poly1);
gfxpoly_destroy(poly2);
gfxline_free(l);
void rotate90(gfxpoly_t*poly)
{
- edge_t*e = poly->edges;
- while(e) {
- point_t a = e->a;
- point_t b = e->b;
- e->a.x = a.y;
- e->a.y = a.x;
- e->b.x = b.y;
- e->b.y = b.x;
- e = e->next;
+ int i,j;
+ gfxpolystroke_t*stroke = poly->strokes;
+ for(;stroke;stroke=stroke->next) {
+ for(j=0;j<stroke->num_points;j++) {
+ point_t a = stroke->points[j];
+ stroke->points[j].x = a.y;
+ stroke->points[j].y = a.x;
+ }
}
}
filename = argv[1];
windrule_t*rule = &windrule_evenodd;
- gfxcompactpoly_t*poly = gfxcompactpoly_from_file(filename, 1.0);//0.01);
+ gfxpoly_t*poly1 = gfxpoly_from_file(filename, 1.0);//0.01);
if(argn!=2)
free(filename);
double zoom = 1.0;
- if(!gfxcompactpoly_check(poly)) {
+ if(!gfxpoly_check(poly1, 0)) {
printf("bad polygon\n");
continue;
}
- gfxpoly_t*poly1 = gfxpoly_from_gfxcompactpoly(poly);
- gfxpoly_t*poly2 = gfxpoly_process(poly, rule, &onepolygon);
+ gfxpoly_t*poly2 = gfxpoly_process(poly1, 0, rule, &onepolygon);
+ assert(gfxpoly_check(poly2, 1));
int pass;
for(pass=0;pass<2;pass++) {
intbbox_t bbox = intbbox_from_polygon(poly1, zoom);
unsigned char*bitmap1 = render_polygon(poly1, &bbox, zoom, rule, &onepolygon);
- unsigned char*bitmap2 = render_polygon(poly2, &bbox, zoom, &windrule_evenodd, &onepolygon);
+ unsigned char*bitmap2 = render_polygon(poly2, &bbox, zoom, &windrule_circular, &onepolygon);
if(!bitmap_ok(&bbox, bitmap1) || !bitmap_ok(&bbox, bitmap2)) {
save_two_bitmaps(&bbox, bitmap1, bitmap2, "error.png");
assert(!"error in bitmaps");
}
free(bitmap1);
free(bitmap2);
-
+
// second pass renders the 90° rotated version
rotate90(poly1);
rotate90(poly2);
gfxpoly_destroy(poly1);
gfxpoly_destroy(poly2);
- gfxcompactpoly_destroy(poly);
if(argn==2)
break;
}
#include "../gfxdevice.h"
#include "../pdf/pdf.h"
+static int max_segments = 0;
+static int max_any_segments = 0;
void extract_polygons_fill(gfxdevice_t*dev, gfxline_t*line, gfxcolor_t*color)
{
- //gfxcompactpoly_t*c = gfxcompactpoly_from_gfxline(line, 0.05);
- //gfxcompactpoly_free(c);
+ //gfxpoly_t*c = gfxpoly_from_fill(line, 0.05);
+ //gfxpoly_free(c);
- gfxcompactpoly_t*poly = gfxcompactpoly_from_gfxline(line, 0.05);
+ //gfxpoly_t*poly1 = gfxpoly_from_fill(line, 0.05);
+ gfxpoly_t*poly1 = gfxpoly_from_fill(line, 0.05);
//gfxline_dump(line, stderr, "");
- //gfxcompactpoly_dump(poly);
+ //gfxpoly_dump(poly);
- if(gfxcompactpoly_size(poly)>100000) {
- fprintf(stderr, "%d segments (skipping)\n", gfxcompactpoly_size(poly));
+ int size = gfxpoly_size(poly1);
+ if(size == 4) {
+ //rectangles are boring.
+ gfxpoly_destroy(poly1);
+ return;
+ }
+
+ max_any_segments = size > max_any_segments? size : max_any_segments;
+ if(size>100000) {
+ fprintf(stderr, "%d segments (skipping)\n", size);
return;
} else {
- //fprintf(stderr, "%d segments\n", gfxpoly_size(poly));
+ max_segments = size > max_segments? size : max_segments;
+ fprintf(stderr, "%d segments (max so far: %d/%d)\n", size, max_segments, max_any_segments);
}
- if(!gfxcompactpoly_check(poly)) {
- gfxcompactpoly_destroy(poly);
+ if(!gfxpoly_check(poly1, 0)) {
+ gfxpoly_destroy(poly1);
fprintf(stderr, "bad polygon\n");
return;
}
windrule_t*rule = &windrule_evenodd;
- gfxpoly_t*poly1 = gfxpoly_from_gfxcompactpoly(poly);
-
double zoom = 1.0;
intbbox_t bbox = intbbox_from_polygon(poly1, zoom);
unsigned char*bitmap1 = render_polygon(poly1, &bbox, zoom, rule, &onepolygon);
fprintf(stderr, "bad polygon or error in renderer\n");
return;
}
- gfxpoly_t*poly2 = gfxpoly_process(poly, rule, &onepolygon);
+ gfxpoly_t*poly2 = gfxpoly_process(poly1, 0, rule, &onepolygon);
unsigned char*bitmap2 = render_polygon(poly2, &bbox, zoom, &windrule_evenodd, &onepolygon);
if(!bitmap_ok(&bbox, bitmap2)) {
save_two_bitmaps(&bbox, bitmap1, bitmap2, "error.png");
gfxpoly_destroy(poly1);
gfxpoly_destroy(poly2);
- gfxcompactpoly_destroy(poly);
}
int extract_polygons_setparameter(gfxdevice_t*dev, const char*key, const char*value) {
return 0;
internal: 0
};
+#if 0
void test5(int argn, char*argv[])
{
gfxsource_t*driver = gfxsource_pdf_create();
closedir(_dir);
driver->destroy(driver);
}
+#endif
int main(int argn, char*argv[])
{
- test_speed(argn, argv);
+ teststroke(argn, argv);
}
git.asbjorn.biz / swftools.git / blobdiff