- Gfxprim - ucw.cz

[repo.or.cz] gfxprim.git branch master updated: 86d973b47abbc97b301abcee265a2537cbc3784e
by metan 10 Dec '12

10 Dec '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project gfxprim.git. The branch, master has been updated via 86d973b47abbc97b301abcee265a2537cbc3784e (commit) via 17b4abe983a4218ffa1a17f467c7b3845d1b9be8 (commit) from d9723b14b7ba7dd2eaef8f09fbd3823a25078b94 (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. - Log ----------------------------------------------------------------- http://repo.or.cz/w/gfxprim.git/commit/86d973b47abbc97b301abcee265a2537cbc3… commit 86d973b47abbc97b301abcee265a2537cbc3784e Author: Cyril Hrubis <metan(a)ucw.cz> Date: Mon Dec 10 23:01:40 2012 +0100 backends: GP_X11.c: Finish SHM & Fix Race. This commit finishes the MIT SHM Extension and enables it by default. Also this commit fixes race between X{Shm}Image resize and UpdateRect Event that was there since begining but the SHM inteface started to trigger it. diff --git a/libs/backends/GP_X11.c b/libs/backends/GP_X11.c index d4030b8..d02b244 100644 --- a/libs/backends/GP_X11.c +++ b/libs/backends/GP_X11.c @@ -67,6 +67,7 @@ static void destroy_ximage(GP_Backend *self); static void destroy_shm_ximage(GP_Backend *self); static int resize_ximage(GP_Backend *self, int w, int h); +static int resize_shm_ximage(GP_Backend *self, int w, int h); static void x11_exit(GP_Backend *self) { @@ -107,8 +108,6 @@ static void x11_update_rect(GP_Backend *self, GP_Coord x0, GP_Coord y0, XFlush(x11->dpy); - x11->resized_flag = 0; - XUnlockDisplay(x11->dpy); } @@ -126,8 +125,6 @@ static void x11_flip(GP_Backend *self) x11->img, 0, 0, 0, 0, w, h); XFlush(x11->dpy); - x11->resized_flag = 0; - XUnlockDisplay(x11->dpy); } @@ -141,7 +138,11 @@ static void x11_ev(GP_Backend *self, XEvent *ev) ev->xexpose.x, ev->xexpose.y, ev->xexpose.width, ev->xexpose.height, ev->xexpose.count); - + + /* + * Ignore Expose events in case user wasn't notified + * about change and acked image resize. + */ if (x11->resized_flag) break; @@ -153,6 +154,11 @@ static void x11_ev(GP_Backend *self, XEvent *ev) if (ev->xconfigure.width == (int)self->context->w && ev->xconfigure.height == (int)self->context->h) break; + + /* + * Window has been resized, set flag. + */ + x11->resized_flag = 1; default: GP_InputDriverX11EventPut(ev); break; @@ -204,14 +210,19 @@ static int x11_set_attributes(struct GP_Backend *self, if (w != 0 && h != 0) { GP_DEBUG(3, "Setting window size to %ux%u", w, h); - if (resize_ximage(self, w, h)) - return 1; + if (x11->shm_flag) { + if (resize_shm_ximage(self, w, h)) + return 1; + } else { + if (resize_ximage(self, w, h)) + return 1; + } /* Resize X11 window */ // XResizeWindow(x11->dpy, x11->win, w, h); XFlush(x11->dpy); - x11->resized_flag = 1; + x11->resized_flag = 0; } XUnlockDisplay(x11->dpy); @@ -244,11 +255,13 @@ static int create_shm_ximage(GP_Backend *self, GP_Size w, GP_Size h) struct x11_priv *x11 = GP_BACKEND_PRIV(self); if (XShmQueryExtension(x11->dpy) == False) { - GP_DEBUG(1, "X Shm Extension not supported, " - "falling back to XImagen"); + GP_DEBUG(1, "MIT SHM Extension not supported, " + "falling back to XImage"); return 1; } - + + GP_DEBUG(1, "Using MIT SHM Extension"); + enum GP_PixelType pixel_type; int depth; @@ -312,11 +325,22 @@ static void destroy_shm_ximage(GP_Backend *self) struct x11_priv *x11 = GP_BACKEND_PRIV(self); XShmDetach(x11->dpy, &x11->shminfo); + XFlush(x11->dpy); shmdt(x11->shminfo.shmaddr); shmctl(x11->shminfo.shmid, IPC_RMID, 0); XDestroyImage(x11->img); } +static int resize_shm_ximage(GP_Backend *self, int w, int h) +{ + GP_DEBUG(4, "Resizing XShmImage %ux%u -> %ux%u", + self->context->w, self->context->h, w, h); + + destroy_shm_ximage(self); + + return create_shm_ximage(self, w, h); +} + #else static int create_shm_ximage(GP_Backend GP_UNUSED(*self), @@ -330,6 +354,12 @@ static void destroy_shm_ximage(GP_Backend GP_UNUSED(*self)) GP_WARN("Stub called"); } +static int resize_shm_ximage(GP_Backend GP_UNUSED(*self), + int GP_UNUSED(w), int GP_UNUSED(h)) +{ + GP_WARN("Stub called"); +} + #endif /* HAVE_X_SHM */ static int create_ximage(GP_Backend *self, GP_Size w, GP_Size h) @@ -381,11 +411,6 @@ static int resize_ximage(GP_Backend *self, int w, int h) struct x11_priv *x11 = GP_BACKEND_PRIV(self); XImage *img; - if (x11->shm_flag) { - GP_WARN("UNIMPLEMENTED"); - return 1; - } - /* Create new X image */ img = XCreateImage(x11->dpy, x11->vis, x11->scr_depth, ZPixmap, 0, NULL, w, h, x11->img->bitmap_pad, 0); @@ -593,7 +618,7 @@ void create_window(struct x11_priv *x11, int x, int y, Atom xa = XInternAtom(x11->dpy, "WM_DELETE_WINDOW", True); if (xa != None) { - GP_DEBUG(2, "Setting WM_DELETE_WINWOW Atom to True"); + GP_DEBUG(2, "Setting WM_DELETE_WINDOW Atom to True"); XSetWMProtocols(x11->dpy, x11->win, &xa, 1); } else { @@ -647,7 +672,7 @@ GP_Backend *GP_BackendX11Init(const char *display, int x, int y, goto err1; } - //if (create_shm_ximage(backend, w, h)) + if (create_shm_ximage(backend, w, h)) if (create_ximage(backend, w, h)) goto err1; http://repo.or.cz/w/gfxprim.git/commit/17b4abe983a4218ffa1a17f467c7b3845d1b… commit 17b4abe983a4218ffa1a17f467c7b3845d1b9be8 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Mon Dec 10 23:01:05 2012 +0100 backends: GP_Backend.c: Add WARNINGS into UpdateRect() diff --git a/libs/backends/GP_Backend.c b/libs/backends/GP_Backend.c index 036fd56..b81808e 100644 --- a/libs/backends/GP_Backend.c +++ b/libs/backends/GP_Backend.c @@ -22,6 +22,7 @@ #include "core/GP_Common.h" #include "core/GP_Transform.h" +#include "core/GP_Debug.h" #include "backends/GP_Backend.h" @@ -38,6 +39,30 @@ void GP_BackendUpdateRectXYXY(GP_Backend *backend, if (y1 < y0) GP_SWAP(y0, y1); + if (x0 < 0) { + GP_WARN("Negative x coordinate %i, clipping to 0", x0); + x0 = 0; + } + + if (y0 < 0) { + GP_WARN("Negative y coordinate %i, clipping to 0", y0); + y0 = 0; + } + + GP_Coord w = backend->context->w; + + if (x1 >= w) { + GP_WARN("Invalid x coordinate %i, clipping to %u", x1, w - 1); + x1 = w - 1; + } + + GP_Coord h = backend->context->h; + + if (y1 >= h) { + GP_WARN("Invalid x coordinate %i, clipping to %u", y1, h - 1); + y1 = h - 1; + } + backend->UpdateRect(backend, x0, y0, x1, y1); } ----------------------------------------------------------------------- Summary of changes: libs/backends/GP_Backend.c | 25 ++++++++++++++++++ libs/backends/GP_X11.c | 61 +++++++++++++++++++++++++++++++------------- 2 files changed, 68 insertions(+), 18 deletions(-) repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0

[repo.or.cz] gfxprim.git branch master updated: d9723b14b7ba7dd2eaef8f09fbd3823a25078b94
by metan 10 Dec '12

10 Dec '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project gfxprim.git. The branch, master has been updated via d9723b14b7ba7dd2eaef8f09fbd3823a25078b94 (commit) from 790141b6485cbea2f016f1d26f88f372b7dc7bfc (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. - Log ----------------------------------------------------------------- http://repo.or.cz/w/gfxprim.git/commit/d9723b14b7ba7dd2eaef8f09fbd3823a2507… commit d9723b14b7ba7dd2eaef8f09fbd3823a25078b94 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Mon Dec 10 21:27:21 2012 +0100 core: GP_Debug.c: Fix code ordering. The check for GP_DEBUG enviroment variable must be done before we check for current level. diff --git a/libs/core/GP_Debug.c b/libs/core/GP_Debug.c index 9332828..75a54f3 100644 --- a/libs/core/GP_Debug.c +++ b/libs/core/GP_Debug.c @@ -42,9 +42,6 @@ void GP_DebugPrint(int level, const char *file, const char *function, int line, { int i; - if (level > (int)debug_level) - return; - if (!env_used) { char *level = getenv("GP_DEBUG"); @@ -62,6 +59,9 @@ void GP_DebugPrint(int level, const char *file, const char *function, int line, } } } + + if (level > (int)debug_level) + return; for (i = 1; i < level; i++) fputc(' ', stderr); ----------------------------------------------------------------------- Summary of changes: libs/core/GP_Debug.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0

[repo.or.cz] gfxprim.git branch master updated: 790141b6485cbea2f016f1d26f88f372b7dc7bfc
by bluebear 10 Dec '12

10 Dec '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project gfxprim.git. The branch, master has been updated via 790141b6485cbea2f016f1d26f88f372b7dc7bfc (commit) from 96f86e4c8dfdbdea1a468aa29130010be8f89e27 (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. - Log ----------------------------------------------------------------- http://repo.or.cz/w/gfxprim.git/commit/790141b6485cbea2f016f1d26f88f372b7dc… commit 790141b6485cbea2f016f1d26f88f372b7dc7bfc Author: Jiri BlueBear Dluhos <jiri.bluebear.dluhos(a)gmail.com> Date: Mon Dec 10 17:53:57 2012 +0100 Get rid of one qsort() in FillPolygon(). diff --git a/libs/gfx/GP_Polygon.c b/libs/gfx/GP_Polygon.c index b807d1c..4bd0297 100644 --- a/libs/gfx/GP_Polygon.c +++ b/libs/gfx/GP_Polygon.c @@ -35,6 +35,11 @@ #include "GP_HLine.h" #include "GP_Polygon.h" +/* A 2D point specified by GP_Coord coordinates. */ +typedef struct { + GP_Coord x, y; +} GP_Point; + /* "almost equality" for float coordinates */ #define GP_COORDS_ALMOST_EQUAL(a,b) (fabsf(a-b) < 0.00001f) @@ -48,6 +53,8 @@ /* Working record about an edge. */ struct GP_Edge { + GP_Point start; /* starting point as specified by user */ + GP_Point end; /* ending point as specified by user */ int state; /* edge state */ float x; /* X coordinate of the working point */ int y; /* Y coordinate of the working point */ @@ -56,23 +63,31 @@ struct GP_Edge { }; /* Initializes the edge structure. */ -static void GP_InitEdge(struct GP_Edge *e, GP_Coord x1, GP_Coord y1, - GP_Coord x2, GP_Coord y2) +static void GP_InitEdge(struct GP_Edge *e, GP_Point start, GP_Point end) { - GP_ASSERT(y1 != y2, "horizontal edges not allowed here"); + e->start = start; + e->end = end; /* initialize the working point to the top point of the edge */ - if (y1 < y2) { - e->x = x1; - e->y = y1; + if (start.y < end.y) { + e->x = (float) start.x; + e->y = start.y; } else { - e->x = x2; - e->y = y2; + e->x = (float) end.x; + e->y = end.y; } - e->dy = GP_ABS(y2 - y1); - e->dxy = (float)(x2 - x1)/(y2 - y1); - e->state = EDGE_READY; + e->dy = GP_ABS(end.y - start.y) - 1; + + if (e->dy < 0) { + + /* horizontal edge */ + e->dxy = (start.x < end.x) ? INFINITY : -INFINITY; + e->state = EDGE_FINISHED; /* these are skipped */ + } else { + e->dxy = (float)(end.x - start.x)/(end.y - start.y); + e->state = EDGE_READY; + } } /* Type of a callback function to be passed to qsort(). */ @@ -117,10 +132,6 @@ static int GP_CompareEdgesRuntime(struct GP_Edge *e1, struct GP_Edge *e2) return 0; } -typedef struct { - GP_Coord x, y; -} GP_Point; - void GP_FillPolygon_Raw(GP_Context *context, unsigned int nvert, const GP_Coord *xy, GP_Pixel pixel) { @@ -150,40 +161,17 @@ void GP_FillPolygon_Raw(GP_Context *context, unsigned int nvert, */ unsigned int nexti = (i+1) % nvert; - /* skip horizontal edges */ - if (vert[i].y == vert[nexti].y) { - continue; - } + GP_InitEdge(edges + nedges, vert[i], vert[nexti]); - GP_InitEdge(edges + nedges, - vert[i].x, vert[i].y, - vert[nexti].x, vert[nexti].y); - e = edges + nedges; - nedges++; } if (nedges < 2) return; /* not really a polygon */ - - for (i = 1; i < nedges; i++) { - e = edges + i; - struct GP_Edge *prev_e = edges + i - 1; - if (GP_COORDS_ALMOST_EQUAL(prev_e->x + prev_e->dy*prev_e->dxy, e->x)) { - prev_e->dy--; - } - else if (GP_COORDS_ALMOST_EQUAL(e->x + e->dy*e->dxy, prev_e->x)) { - e->dy--; - } - } /* initially sort edges by Y, then X */ qsort(edges, nedges, sizeof(struct GP_Edge), (GP_SortCallback) GP_CompareEdgesInitial); - - for (i = 0; i < nedges; i++) { - e = edges + i; - } /* * for each scanline, compute intersections with all edges @@ -224,23 +212,17 @@ void GP_FillPolygon_Raw(GP_Context *context, unsigned int nvert, float end = inter[i+1]; GP_HLine_Raw(context, start, end, y, pixel); } - - /* check and mark edges we are done with */ - for (i = 0; i < nedges; i++) { - e = edges + i; - if (e->state == EDGE_ACTIVE && e->dy == 0) { - e->state = EDGE_FINISHED; - } - } - qsort(edges, nedges, sizeof(struct GP_Edge), - (GP_SortCallback) GP_CompareEdgesRuntime); /* update active edges for next step */ for (i = 0; i < nedges; i++) { e = edges + i; if (e->state == EDGE_ACTIVE) { - e->x += e->dxy; - e->dy--; + if (e->dy == 0) { + e->state = EDGE_FINISHED; + } else { + e->x += e->dxy; + e->dy--; + } } } } ----------------------------------------------------------------------- Summary of changes: libs/gfx/GP_Polygon.c | 84 +++++++++++++++++++----------------------------- 1 files changed, 33 insertions(+), 51 deletions(-) repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0

[repo.or.cz] gfxprim.git branch master updated: 96f86e4c8dfdbdea1a468aa29130010be8f89e27
by bluebear 10 Dec '12

10 Dec '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project gfxprim.git. The branch, master has been updated via 96f86e4c8dfdbdea1a468aa29130010be8f89e27 (commit) via 5534588fb5e3d02ee7504e01ce8b3f1045fba7fd (commit) from 2ebe2eeef4357ca15c5c0656973fffb1487d4b2d (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. - Log ----------------------------------------------------------------- http://repo.or.cz/w/gfxprim.git/commit/96f86e4c8dfdbdea1a468aa29130010be8f8… commit 96f86e4c8dfdbdea1a468aa29130010be8f89e27 Merge: 5534588 2ebe2ee Author: Jiri BlueBear Dluhos <jiri.bluebear.dluhos(a)gmail.com> Date: Mon Dec 10 14:10:24 2012 +0100 Merge branch 'master' of ssh://repo.or.cz/srv/git/gfxprim http://repo.or.cz/w/gfxprim.git/commit/5534588fb5e3d02ee7504e01ce8b3f1045fb… commit 5534588fb5e3d02ee7504e01ce8b3f1045fba7fd Author: Jiri BlueBear Dluhos <jiri.bluebear.dluhos(a)gmail.com> Date: Mon Dec 10 14:09:58 2012 +0100 Rewrote FillPolygon() according to books. Still not correct though. diff --git a/libs/gfx/GP_Polygon.c b/libs/gfx/GP_Polygon.c index 2114006..b807d1c 100644 --- a/libs/gfx/GP_Polygon.c +++ b/libs/gfx/GP_Polygon.c @@ -26,6 +26,7 @@ #include <stdlib.h> #include <stdio.h> #include <math.h> +#include <limits.h> #include "core/GP_Transform.h" #include "core/GP_GetPutPixel.h" @@ -34,166 +35,214 @@ #include "GP_HLine.h" #include "GP_Polygon.h" -/* A single edge of the polygon. */ -struct GP_PolygonEdge { - float x1, y1, x2, y2; - float ymin, ymax; - float dx_by_dy; /* dx/dy (0 for horizontal edges) */ -}; +/* "almost equality" for float coordinates */ +#define GP_COORDS_ALMOST_EQUAL(a,b) (fabsf(a-b) < 0.00001f) -/* Threshod value for delta y; edges with dy smaller than this are considered horizontal. */ -const float GP_HORIZ_DY_THRESHOLD = 0.00001f; +/* + * Edge state. Every edge proceeds from READY to ACTIVE and then FINISHED. + * Numeric values reflect sorting priority (ACTIVE < READY < FINISHED). + */ +#define EDGE_FINISHED 2 +#define EDGE_READY 1 +#define EDGE_ACTIVE 0 + +/* Working record about an edge. */ +struct GP_Edge { + int state; /* edge state */ + float x; /* X coordinate of the working point */ + int y; /* Y coordinate of the working point */ + int dy; /* vertical size */ + float dxy; /* dx/dy */ +}; -/* Initializes the polygon_edge structure. */ -static void GP_InitEdge(struct GP_PolygonEdge *edge, float x1, float y1, - float x2, float y2) +/* Initializes the edge structure. */ +static void GP_InitEdge(struct GP_Edge *e, GP_Coord x1, GP_Coord y1, + GP_Coord x2, GP_Coord y2) { - edge->x1 = x1; - edge->y1 = y1; - edge->x2 = x2; - edge->y2 = y2; - edge->ymin = fminf(edge->y1, edge->y2); - edge->ymax = fmaxf(edge->y1, edge->y2); - - /* horizontal (or almost horizontal) edges are a special case */ - if ((edge->ymax - edge->ymin) < GP_HORIZ_DY_THRESHOLD) { - edge->dx_by_dy = 0.0; /* not meaningful */ - return; + GP_ASSERT(y1 != y2, "horizontal edges not allowed here"); + + /* initialize the working point to the top point of the edge */ + if (y1 < y2) { + e->x = x1; + e->y = y1; + } else { + e->x = x2; + e->y = y2; } - float dx = (edge->x2 - edge->x1); - float dy = (edge->y2 - edge->y1); - edge->dx_by_dy = dx / dy; + e->dy = GP_ABS(y2 - y1); + e->dxy = (float)(x2 - x1)/(y2 - y1); + e->state = EDGE_READY; } -static int GP_IsEdgeHorizontal(struct GP_PolygonEdge *edge) -{ - return ((edge->ymax - edge->ymin) < GP_HORIZ_DY_THRESHOLD); -} +/* Type of a callback function to be passed to qsort(). */ +typedef int (*GP_SortCallback)(const void *, const void *); -/* Computes an intersection of the specified scanline with the given edge. - * If successful, returns 1 and stores the resulting X coordinate into result_x. - * If failed (the edge does not intersect), 0 is returned. - * Horizontal edges are ignored at this point (result is always 0). +/* + * Compares two edges. Used for initial sorting of the edges. + * Edges are sorted by Y first, then by X, then by DXY. + * Returns -1 if e1<e2, +1 if e1>e2, 0 if e1==e2. */ -static int GP_ComputeIntersection(float *result_x, struct GP_PolygonEdge *edge, float y) +static int GP_CompareEdgesInitial(struct GP_Edge *e1, struct GP_Edge *e2) { - if (y<edge->ymin || y>edge->ymax) - return 0; /* outside the edge Y range */ + if (e1->y < e2->y) return -1; + if (e1->y > e2->y) return 1; - if (GP_IsEdgeHorizontal(edge)) - return 0; /* ignore horizontal edges */ + if (e1->x < e2->x) return -1; + if (e1->x > e2->x) return 1; - *result_x = edge->x1 + (y-edge->y1)*edge->dx_by_dy; + if (e1->dxy < e2->dxy) return -1; + if (e1->dxy > e2->dxy) return 1; - return 1; + return 0; } -/* Sorting callback. Compares two floats and returns -1 if A<B, - * +1 if A>B, 0 if they are equal. +/* + * Compares two edges. Used for in-run sorting. + * Edges are sorted by state (ACTIVE < READY < FINISHED), then by X, + * then by DXY. + * Returns -1 if e1<e2, +1 if e1>e2, 0 if e1==e2. */ -static int GP_CompareFloats(const void *ptr_a, const void *ptr_b) +static int GP_CompareEdgesRuntime(struct GP_Edge *e1, struct GP_Edge *e2) { - float a = ((float *) ptr_a)[0]; - float b = ((float *) ptr_b)[0]; + if (e1->state < e2->state) return -1; + if (e1->state > e2->state) return 1; + + if (e1->x < e2->x) return -1; + if (e1->x > e2->x) return 1; + + if (e1->dxy < e2->dxy) return -1; + if (e1->dxy > e2->dxy) return 1; - if (a < b) return -1; - if (a > b) return 1; return 0; } -/* Computes intersections of the y coordinate with all edges, - * writing the X coordinates of the intersections, sorted by X coordinate, - * into 'results'. - */ -static int GP_ComputeScanline(float *results, struct GP_PolygonEdge *edges, - size_t count, float y) -{ - unsigned int edge_index = 0; - int result_index = 0; - - for (; edge_index<count; edge_index++) { +typedef struct { + GP_Coord x, y; +} GP_Point; - struct GP_PolygonEdge *edge = edges + edge_index; - float x; +void GP_FillPolygon_Raw(GP_Context *context, unsigned int nvert, + const GP_Coord *xy, GP_Pixel pixel) +{ + unsigned int i; + struct GP_Edge *e; + + if (nvert < 3) + return; /* not enough vertices */ + + GP_Point const *vert = (GP_Point const *) xy; + + /* find first and last scanline */ + GP_Coord ymin = INT_MAX, ymax = -INT_MAX; + for (i = 0; i < nvert; i++) { + ymax = GP_MAX(ymax, vert[i].y); + ymin = GP_MIN(ymin, vert[i].y); + } + + /* build a list of edges */ + struct GP_Edge edges[nvert]; + unsigned int nedges = 0; /* number of edges in list */ + for (i = 0; i < nvert; i++) { /* - * Horizontal edges match either as a whole (yielding two - * intersections), or not at all. + * next vertex index (wraps to 0 at end to connect + * the last vertex with the first one) */ - if (GP_IsEdgeHorizontal(edge)) { - if (fabsf(edge->ymin - y) < 0.00001f) { - results[result_index++] = GP_MIN(edge->x1, edge->x2); - results[result_index++] = GP_MAX(edge->x1, edge->x2); - } + unsigned int nexti = (i+1) % nvert; + + /* skip horizontal edges */ + if (vert[i].y == vert[nexti].y) { continue; } - if (GP_ComputeIntersection(&x, edge, y)) { - results[result_index++] = x; - } + GP_InitEdge(edges + nedges, + vert[i].x, vert[i].y, + vert[nexti].x, vert[nexti].y); + e = edges + nedges; + + nedges++; } - qsort(results, result_index, sizeof(float), GP_CompareFloats); - - return result_index; -} - -void GP_FillPolygon_Raw(GP_Context *context, unsigned int vertex_count, - const GP_Coord *xy, GP_Pixel pixel) -{ - float ymin = HUGE_VALF, ymax = -HUGE_VALF; - struct GP_PolygonEdge *edge; - struct GP_PolygonEdge edges[2*vertex_count]; - - - /* Build edge structures for each vertex-vertex connection. - * NOTE: Each vertex is in fact in the middle of the pixel, so - * add 0.5 to both coordinates. - */ - int i; - for (i = 0; i < (int)vertex_count - 1; i++) { - edge = edges + i; - GP_InitEdge(edge, - 0.5f + xy[2*i], 0.5f + xy[2*i + 1], - 0.5f + xy[2*i + 2], 0.5f + xy[2*i + 3]); - ymin = fminf(ymin, edge->ymin); - ymax = fmaxf(ymax, edge->ymax); + if (nedges < 2) + return; /* not really a polygon */ + + for (i = 1; i < nedges; i++) { + e = edges + i; + struct GP_Edge *prev_e = edges + i - 1; + if (GP_COORDS_ALMOST_EQUAL(prev_e->x + prev_e->dy*prev_e->dxy, e->x)) { + prev_e->dy--; + } + else if (GP_COORDS_ALMOST_EQUAL(e->x + e->dy*e->dxy, prev_e->x)) { + e->dy--; + } } - /* the last edge (from the last point to the first one) */ - edge = edges + vertex_count - 1; - GP_InitEdge(edge, - 0.5f + xy[2*i], 0.5f + xy[2*i + 1], - 0.5f + xy[0], 0.5f + xy[1]); + /* initially sort edges by Y, then X */ + qsort(edges, nedges, sizeof(struct GP_Edge), + (GP_SortCallback) GP_CompareEdgesInitial); - /* For each scanline, compute intersections with all edges + for (i = 0; i < nedges; i++) { + e = edges + i; + } + + /* + * for each scanline, compute intersections with all edges * and draw a horizontal line segment between the intersections. */ - float intersections[vertex_count]; - int y; - for (y = (int) ymin; y <= (int) ymax; y++) { - int inter_count = GP_ComputeScanline(intersections, edges, vertex_count, y + 0.5f); - - i = 0; - for (;;) { - if (i >= inter_count) break; - float start = intersections[i++]; - if (i >= inter_count) { - - /* a solo vertex or a single-point intersection */ - GP_PutPixel_Raw(context, start, y, pixel); - break; + float inter[nedges]; + unsigned int ninter; + int y = ymin; + for (y = ymin; y <= ymax; y++) { + + /* mark edges we have just reached as active */ + for (i = 0; i < nedges; i++) { + e = edges + i; + if (e->state == EDGE_READY && (y == e->y)) { + e->state = EDGE_ACTIVE; } - float end = intersections[i++]; - if (start == end) { - - /* two intersections - edge joint */ - if (i >= inter_count) break; - end = intersections[i++]; + } + qsort(edges, nedges, sizeof(struct GP_Edge), + (GP_SortCallback) GP_CompareEdgesRuntime); + + /* record intersections with active edges */ + ninter = 0; + for (i = 0; i < nedges; i++) { + e = edges + i; + if (e->state == EDGE_ACTIVE) { + inter[ninter++] = e->x; } + } + + /* draw each even range between intersections */ + for (i = 0; i < ninter; i += 2) { + float start = inter[i]; + + /* odd number of intersections - skip last */ + if (i+1 == ninter) + break; + + float end = inter[i+1]; GP_HLine_Raw(context, start, end, y, pixel); } + + /* check and mark edges we are done with */ + for (i = 0; i < nedges; i++) { + e = edges + i; + if (e->state == EDGE_ACTIVE && e->dy == 0) { + e->state = EDGE_FINISHED; + } + } + qsort(edges, nedges, sizeof(struct GP_Edge), + (GP_SortCallback) GP_CompareEdgesRuntime); + + /* update active edges for next step */ + for (i = 0; i < nedges; i++) { + e = edges + i; + if (e->state == EDGE_ACTIVE) { + e->x += e->dxy; + e->dy--; + } + } } } ----------------------------------------------------------------------- Summary of changes: libs/gfx/GP_Polygon.c | 291 ++++++++++++++++++++++++++++-------------------- 1 files changed, 170 insertions(+), 121 deletions(-) repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0

[repo.or.cz] gfxprim.git branch master updated: 2ebe2eeef4357ca15c5c0656973fffb1487d4b2d
by metan 10 Dec '12

10 Dec '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project gfxprim.git. The branch, master has been updated via 2ebe2eeef4357ca15c5c0656973fffb1487d4b2d (commit) from efb97f7e1542fcceb2772ee7481530cf84b08847 (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. - Log ----------------------------------------------------------------- http://repo.or.cz/w/gfxprim.git/commit/2ebe2eeef4357ca15c5c0656973fffb1487d… commit 2ebe2eeef4357ca15c5c0656973fffb1487d4b2d Author: Cyril Hrubis <metan(a)ucw.cz> Date: Mon Dec 10 00:45:24 2012 +0100 libs: backends: Fix typo in GP_BackendInit.c diff --git a/libs/backends/GP_BackendInit.c b/libs/backends/GP_BackendInit.c index 0b04407..bef0dba 100644 --- a/libs/backends/GP_BackendInit.c +++ b/libs/backends/GP_BackendInit.c @@ -166,7 +166,7 @@ static int x11_params_to_flags(const char *param, GP_Size *w, GP_Size *h, return 0; } - backend_sdl_help(help, "X11: Invalid parameters"); + backend_x11_help(help, "X11: Invalid parameters"); return 1; } ----------------------------------------------------------------------- Summary of changes: libs/backends/GP_BackendInit.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0

[repo.or.cz] gfxprim.git branch master updated: efb97f7e1542fcceb2772ee7481530cf84b08847
by metan 10 Dec '12

10 Dec '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project gfxprim.git. The branch, master has been updated via efb97f7e1542fcceb2772ee7481530cf84b08847 (commit) from 111cef13540298997a42d245a80c81aca5d4cc68 (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. - Log ----------------------------------------------------------------- http://repo.or.cz/w/gfxprim.git/commit/efb97f7e1542fcceb2772ee7481530cf84b0… commit efb97f7e1542fcceb2772ee7481530cf84b08847 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Mon Dec 10 00:33:40 2012 +0100 build: Remove unused tests.mk file. diff --git a/tests.mk b/tests.mk deleted file mode 100644 index 39f0835..0000000 --- a/tests.mk +++ /dev/null @@ -1,55 +0,0 @@ -.PHONY: tests runtests - -# -# List of test targets (testsuite incl. automatically) -# -ifndef TESTS -TESTS= -endif - -# -# Testsuite with automated collection of tests -# All .test.c files are scraped for GP_TEST definitions -# - -ifdef TESTSUITE -# a bit crude way to link with test minilibrary -GP_TESTLIB_SRCS=$(wildcard ${TOPDIR}/tests/common/*.c) -CSOURCES+=${GP_TESTLIB_SRCS} - -# generated suite creation code -TESTSUITE_GEN=collected_tests.gen.c # also fixed in the code generator -CLEAN+=${TESTSUITE_GEN} - -${TESTSUITE_GEN}: $(filter-out ${TESTSUITE_GEN},${GENSOURCES}) ${GENHEADERS} -ifdef VERBOSE - ${PYTHON} ${TOPDIR}/pylib/bin/generate_collected_tests.py -t $(TEMPLATE_DIR) "." "$@" -else - @echo "TSTS $@" - @${PYTHON} ${TOPDIR}/pylib/bin/generate_collected_tests.py -t $(TEMPLATE_DIR) "." "$@" -endif - - -TESTSUITE_SRCS=$(wildcard *.test.c) ${GENSOURCES} ${GENHEADERS} ${GP_TESTLIB_SRCS} ${TESTSUITE_GEN} -INCLUDE+=../tests/common -TESTSUITE_OBJS=$(patsubst %.c,%.o,$(TESTSUITE_SRCS)) -CLEAN+=${TESTSUITE} ${TESTSUITE_OBJS} -TESTS+=${TESTSUITE} - -${TESTSUITE}: ${TESTSUITE_OBJS} -ifdef VERBOSE - $(CC) $(CFLAGS) $(LDFLAGS) -Wl,--start-group $(LDLIBS) $^ -Wl,--end-group -o $@ -else - @echo "LD $@" - @$(CC) $(CFLAGS) $(LDFLAGS) -Wl,--start-group $(LDLIBS) $^ -Wl,--end-group -o $@ -endif # VERBOSE - -endif # TESTSUITE - -tests: $(TESTS) - -runtests: tests - for test in $(TESTS); do LD_LIBRARY_PATH=../../build ./"$$test"; done - -# WARN: avoid double includion? -include $(TOPDIR)/gen.mk ----------------------------------------------------------------------- Summary of changes: tests.mk | 55 ------------------------------------------------------- 1 files changed, 0 insertions(+), 55 deletions(-) delete mode 100644 tests.mk repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0

[repo.or.cz] gfxprim.git branch master updated: 111cef13540298997a42d245a80c81aca5d4cc68
by metan 09 Dec '12

09 Dec '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project gfxprim.git. The branch, master has been updated via 111cef13540298997a42d245a80c81aca5d4cc68 (commit) from 2cf30f8101ea618085a197ea6bb8bad9d5cb0708 (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. - Log ----------------------------------------------------------------- http://repo.or.cz/w/gfxprim.git/commit/111cef13540298997a42d245a80c81aca5d4… commit 111cef13540298997a42d245a80c81aca5d4cc68 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun Dec 9 23:30:04 2012 +0100 tests: gfx: Add Ellipse.c testsuite. diff --git a/tests/gfx/Ellipse.c b/tests/gfx/Ellipse.c new file mode 100644 index 0000000..5b0add6 --- /dev/null +++ b/tests/gfx/Ellipse.c @@ -0,0 +1,367 @@ +/***************************************************************************** + * This file is part of gfxprim library. * + * * + * Gfxprim is free software; you can redistribute it and/or * + * modify it under the terms of the GNU Lesser General Public * + * License as published by the Free Software Foundation; either * + * version 2.1 of the License, or (at your option) any later version. * + * * + * Gfxprim is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with gfxprim; if not, write to the Free Software * + * Foundation, Inc., 51 Franklin Street, Fifth Floor, * + * Boston, MA 02110-1301 USA * + * * + * Copyright (C) 2009-2012 Cyril Hrubis <metan(a)ucw.cz> * + * * + *****************************************************************************/ + +#include <string.h> +#include <errno.h> +#include <sys/stat.h> + +#include <core/GP_Context.h> +#include <gfx/GP_Ellipse.h> + +#include "tst_test.h" + +#include "common.h" + +struct testcase { + /* cicle description */ + GP_Coord x; + GP_Coord y; + GP_Size a; + GP_Size b; + + /* expected result */ + GP_Size w, h; + const char pixmap[]; +}; + +static int test_ellipse(const struct testcase *t) +{ + GP_Context *c; + int err; + + c = GP_ContextAlloc(t->w, t->h, GP_PIXEL_G8); + + if (c == NULL) { + tst_err("Failed to allocate context"); + return TST_UNTESTED; + } + + /* zero the pixels buffer */ + memset(c->pixels, 0, c->w * c->h); + + GP_Ellipse(c, t->x, t->y, t->a, t->b, 1); + + err = compare_buffers(t->pixmap, c); + + if (err) + return TST_FAILED; + + return TST_SUCCESS; +} + +static struct testcase testcase_ellipse_a0_b0 = { + .x = 2, + .y = 2, + .a = 0, + .b = 0, + + .w = 5, + .h = 5, + + .pixmap = { + 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, + 0, 0, 1, 0, 0, + 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, + } +}; + +static struct testcase testcase_ellipse_a1_b0 = { + .x = 2, + .y = 2, + .a = 1, + .b = 0, + + .w = 5, + .h = 5, + + .pixmap = { + 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, + 0, 1, 1, 1, 0, + 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, + } +}; + +static struct testcase testcase_ellipse_a0_b1 = { + .x = 2, + .y = 2, + .a = 0, + .b = 1, + + .w = 5, + .h = 5, + + .pixmap = { + 0, 0, 0, 0, 0, + 0, 0, 1, 0, 0, + 0, 0, 1, 0, 0, + 0, 0, 1, 0, 0, + 0, 0, 0, 0, 0, + } +}; + +static struct testcase testcase_ellipse_a1_b1 = { + .x = 2, + .y = 2, + .a = 1, + .b = 1, + + .w = 5, + .h = 5, + + .pixmap = { + 0, 0, 0, 0, 0, + 0, 0, 1, 0, 0, + 0, 1, 0, 1, 0, + 0, 0, 1, 0, 0, + 0, 0, 0, 0, 0, + } +}; + +static struct testcase testcase_ellipse_a2_b1 = { + .x = 3, + .y = 3, + .a = 2, + .b = 1, + + .w = 7, + .h = 7, + + .pixmap = { + 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, + 0, 0, 1, 1, 1, 0, 0, + 0, 1, 0, 0, 0, 1, 0, + 0, 0, 1, 1, 1, 0, 0, + 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, + } +}; + +static struct testcase testcase_ellipse_a1_b2 = { + .x = 3, + .y = 3, + .a = 1, + .b = 2, + + .w = 7, + .h = 7, + + .pixmap = { + 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 1, 0, 0, 0, + 0, 0, 1, 0, 1, 0, 0, + 0, 0, 1, 0, 1, 0, 0, + 0, 0, 1, 0, 1, 0, 0, + 0, 0, 0, 1, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, + } +}; + +static struct testcase testcase_ellipse_a2_b2 = { + .x = 3, + .y = 3, + .a = 2, + .b = 2, + + .w = 7, + .h = 7, + + .pixmap = { + 0, 0, 0, 0, 0, 0, 0, + 0, 0, 1, 1, 1, 0, 0, + 0, 1, 0, 0, 0, 1, 0, + 0, 1, 0, 0, 0, 1, 0, + 0, 1, 0, 0, 0, 1, 0, + 0, 0, 1, 1, 1, 0, 0, + 0, 0, 0, 0, 0, 0, 0, + } +}; + +static struct testcase testcase_ellipse_a1_b3 = { + .x = 4, + .y = 4, + .a = 1, + .b = 3, + + .w = 9, + .h = 9, + + .pixmap = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 1, 0, 0, 0, 0, + 0, 0, 0, 1, 0, 1, 0, 0, 0, + 0, 0, 0, 1, 0, 1, 0, 0, 0, + 0, 0, 0, 1, 0, 1, 0, 0, 0, + 0, 0, 0, 1, 0, 1, 0, 0, 0, + 0, 0, 0, 1, 0, 1, 0, 0, 0, + 0, 0, 0, 0, 1, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, + } +}; + +static struct testcase testcase_ellipse_a3_b2 = { + .x = 4, + .y = 4, + .a = 3, + .b = 2, + + .w = 9, + .h = 9, + + .pixmap = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 1, 1, 1, 0, 0, 0, + 0, 1, 1, 0, 0, 0, 1, 1, 0, + 0, 1, 0, 0, 0, 0, 0, 1, 0, + 0, 1, 1, 0, 0, 0, 1, 1, 0, + 0, 0, 0, 1, 1, 1, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, + } +}; + +static struct testcase testcase_ellipse_a3_b3 = { + .x = 4, + .y = 4, + .a = 3, + .b = 3, + + .w = 9, + .h = 9, + + .pixmap = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 1, 1, 1, 0, 0, 0, + 0, 0, 1, 0, 0, 0, 1, 0, 0, + 0, 1, 0, 0, 0, 0, 0, 1, 0, + 0, 1, 0, 0, 0, 0, 0, 1, 0, + 0, 1, 0, 0, 0, 0, 0, 1, 0, + 0, 0, 1, 0, 0, 0, 1, 0, 0, + 0, 0, 0, 1, 1, 1, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, + } +}; + +static struct testcase testcase_ellipse_a6_b6_clip = { + .x = 0, + .y = 0, + .a = 6, + .b = 6, + + .w = 8, + .h = 8, + + .pixmap = { + 0, 0, 0, 0, 0, 0, 1, 0, + 0, 0, 0, 0, 0, 0, 1, 0, + 0, 0, 0, 0, 0, 0, 1, 0, + 0, 0, 0, 0, 0, 1, 0, 0, + 0, 0, 0, 0, 0, 1, 0, 0, + 0, 0, 0, 1, 1, 0, 0, 0, + 1, 1, 1, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + } +}; + +static struct testcase testcase_ellipse_a5_b5_clip = { + .x = 0, + .y = 5, + .a = 5, + .b = 5, + + .w = 11, + .h = 11, + + .pixmap = { + 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, + 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, + } +}; + +const struct tst_suite tst_suite = { + .suite_name = "Ellipse Testsuite", + .tests = { + {.name = "Ellipse a=0 b=0", + .tst_fn = test_ellipse, + .data = &testcase_ellipse_a0_b0}, + + {.name = "Ellipse a=1 b=0", + .tst_fn = test_ellipse, + .data = &testcase_ellipse_a1_b0}, + + {.name = "Ellipse a=0 b=1", + .tst_fn = test_ellipse, + .data = &testcase_ellipse_a0_b1}, + + {.name = "Ellipse a=1 b=1", + .tst_fn = test_ellipse, + .data = &testcase_ellipse_a1_b1}, + + {.name = "Ellipse a=2 b=1", + .tst_fn = test_ellipse, + .data = &testcase_ellipse_a2_b1}, + + {.name = "Ellipse a=1 b=2", + .tst_fn = test_ellipse, + .data = &testcase_ellipse_a1_b2}, + + {.name = "Ellipse a=2 b=2", + .tst_fn = test_ellipse, + .data = &testcase_ellipse_a2_b2}, + + {.name = "Ellipse a=1 b=3", + .tst_fn = test_ellipse, + .data = &testcase_ellipse_a1_b3}, + + {.name = "Ellipse a=3 b=2", + .tst_fn = test_ellipse, + .data = &testcase_ellipse_a3_b2}, + + {.name = "Ellipse a=3 b=3", + .tst_fn = test_ellipse, + .data = &testcase_ellipse_a3_b3}, + + {.name = "Ellipse a=5 b=5 clipped", + .tst_fn = test_ellipse, + .data = &testcase_ellipse_a5_b5_clip}, + + {.name = "Ellipse a=6 b=6 clipped", + .tst_fn = test_ellipse, + .data = &testcase_ellipse_a6_b6_clip}, + + {.name = NULL} + } +}; diff --git a/tests/gfx/Makefile b/tests/gfx/Makefile index fafb1cb..d8090a9 100644 --- a/tests/gfx/Makefile +++ b/tests/gfx/Makefile @@ -3,10 +3,11 @@ include $(TOPDIR)/pre.mk CSOURCES=$(shell echo *.c) -APPS=gfx_benchmark Circle FillCircle Line CircleSeg Polygon +APPS=gfx_benchmark Circle FillCircle Line CircleSeg Polygon Ellipse Circle: common.o FillCircle: common.o +Ellipse: common.o Line: common.o CircleSeg: common.o Polygon: common.o diff --git a/tests/gfx/runtest.sh b/tests/gfx/runtest.sh index 0e50fb6..2edd6b4 100755 --- a/tests/gfx/runtest.sh +++ b/tests/gfx/runtest.sh @@ -13,5 +13,6 @@ export LIBC_FATAL_STDERR_=1 LD_PRELOAD=`pwd`/../framework/libtst_preload.so LD_LIBRARY_PATH=../../build/ ./Line "$@" LD_PRELOAD=`pwd`/../framework/libtst_preload.so LD_LIBRARY_PATH=../../build/ ./Circle "$@" LD_PRELOAD=`pwd`/../framework/libtst_preload.so LD_LIBRARY_PATH=../../build/ ./FillCircle "$@" +LD_PRELOAD=`pwd`/../framework/libtst_preload.so LD_LIBRARY_PATH=../../build/ ./Ellipse "$@" LD_PRELOAD=`pwd`/../framework/libtst_preload.so LD_LIBRARY_PATH=../../build/ ./CircleSeg "$@" LD_PRELOAD=`pwd`/../framework/libtst_preload.so LD_LIBRARY_PATH=../../build/ ./Polygon "$@" ----------------------------------------------------------------------- Summary of changes: tests/gfx/{Circle.c => Ellipse.c} | 280 ++++++++++++++++++++++++++---------- tests/gfx/Makefile | 3 +- tests/gfx/runtest.sh | 1 + 3 files changed, 205 insertions(+), 79 deletions(-) copy tests/gfx/{Circle.c => Ellipse.c} (52%) repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0

[repo.or.cz] gfxprim.git branch master updated: 2cf30f8101ea618085a197ea6bb8bad9d5cb0708
by bluebear 09 Dec '12

09 Dec '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project gfxprim.git. The branch, master has been updated via 2cf30f8101ea618085a197ea6bb8bad9d5cb0708 (commit) via 1f85f38df0b1e641ff42cd36279162436e74fcb0 (commit) via bee55d2f8ce82f2cae2ad16fa0f61af7aa9801da (commit) from fd8d609eb63fb8753bcbf69c882a9b9b4b58e966 (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. - Log ----------------------------------------------------------------- http://repo.or.cz/w/gfxprim.git/commit/2cf30f8101ea618085a197ea6bb8bad9d5cb… commit 2cf30f8101ea618085a197ea6bb8bad9d5cb0708 Merge: 1f85f38 fd8d609 Author: Jiri BlueBear Dluhos <jiri.bluebear.dluhos(a)gmail.com> Date: Sun Dec 9 17:30:23 2012 +0100 Merge branch 'master' of ssh://repo.or.cz/srv/git/gfxprim http://repo.or.cz/w/gfxprim.git/commit/1f85f38df0b1e641ff42cd36279162436e74… commit 1f85f38df0b1e641ff42cd36279162436e74fcb0 Author: Jiri BlueBear Dluhos <jiri.bluebear.dluhos(a)gmail.com> Date: Sun Dec 9 17:28:27 2012 +0100 Slightly better handling of joints in GP_FillPolygon(). diff --git a/libs/gfx/GP_Polygon.c b/libs/gfx/GP_Polygon.c index 3b7c2e7..2114006 100644 --- a/libs/gfx/GP_Polygon.c +++ b/libs/gfx/GP_Polygon.c @@ -66,17 +66,22 @@ static void GP_InitEdge(struct GP_PolygonEdge *edge, float x1, float y1, edge->dx_by_dy = dx / dy; } +static int GP_IsEdgeHorizontal(struct GP_PolygonEdge *edge) +{ + return ((edge->ymax - edge->ymin) < GP_HORIZ_DY_THRESHOLD); +} + /* Computes an intersection of the specified scanline with the given edge. * If successful, returns 1 and stores the resulting X coordinate into result_x. * If failed (the edge does not intersect), 0 is returned. - * Horizontal edges are considered to never intersect. + * Horizontal edges are ignored at this point (result is always 0). */ static int GP_ComputeIntersection(float *result_x, struct GP_PolygonEdge *edge, float y) { if (y<edge->ymin || y>edge->ymax) return 0; /* outside the edge Y range */ - if (edge->ymax - edge->ymin < GP_HORIZ_DY_THRESHOLD) + if (GP_IsEdgeHorizontal(edge)) return 0; /* ignore horizontal edges */ *result_x = edge->x1 + (y-edge->y1)*edge->dx_by_dy; @@ -112,6 +117,18 @@ static int GP_ComputeScanline(float *results, struct GP_PolygonEdge *edges, struct GP_PolygonEdge *edge = edges + edge_index; float x; + /* + * Horizontal edges match either as a whole (yielding two + * intersections), or not at all. + */ + if (GP_IsEdgeHorizontal(edge)) { + if (fabsf(edge->ymin - y) < 0.00001f) { + results[result_index++] = GP_MIN(edge->x1, edge->x2); + results[result_index++] = GP_MAX(edge->x1, edge->x2); + } + continue; + } + if (GP_ComputeIntersection(&x, edge, y)) { results[result_index++] = x; } @@ -127,7 +144,7 @@ void GP_FillPolygon_Raw(GP_Context *context, unsigned int vertex_count, { float ymin = HUGE_VALF, ymax = -HUGE_VALF; struct GP_PolygonEdge *edge; - struct GP_PolygonEdge edges[vertex_count]; + struct GP_PolygonEdge edges[2*vertex_count]; /* Build edge structures for each vertex-vertex connection. http://repo.or.cz/w/gfxprim.git/commit/bee55d2f8ce82f2cae2ad16fa0f61af7aa98… commit bee55d2f8ce82f2cae2ad16fa0f61af7aa9801da Author: Jiri BlueBear Dluhos <jiri.bluebear.dluhos(a)gmail.com> Date: Sun Dec 9 17:07:58 2012 +0100 Fixed an assertion crash in FillPolygon. diff --git a/libs/gfx/GP_Polygon.c b/libs/gfx/GP_Polygon.c index 0901922..3b7c2e7 100644 --- a/libs/gfx/GP_Polygon.c +++ b/libs/gfx/GP_Polygon.c @@ -28,6 +28,7 @@ #include <math.h> #include "core/GP_Transform.h" +#include "core/GP_GetPutPixel.h" #include "GP_Line.h" #include "GP_HLine.h" @@ -157,10 +158,24 @@ void GP_FillPolygon_Raw(GP_Context *context, unsigned int vertex_count, for (y = (int) ymin; y <= (int) ymax; y++) { int inter_count = GP_ComputeScanline(intersections, edges, vertex_count, y + 0.5f); - GP_ASSERT(inter_count % 2 == 0, "odd number of intersections!"); - - for (i = 0; i < inter_count; i+=2) { - GP_HLine_Raw(context, intersections[i], intersections[i + 1], y, pixel); + i = 0; + for (;;) { + if (i >= inter_count) break; + float start = intersections[i++]; + if (i >= inter_count) { + + /* a solo vertex or a single-point intersection */ + GP_PutPixel_Raw(context, start, y, pixel); + break; + } + float end = intersections[i++]; + if (start == end) { + + /* two intersections - edge joint */ + if (i >= inter_count) break; + end = intersections[i++]; + } + GP_HLine_Raw(context, start, end, y, pixel); } } } ----------------------------------------------------------------------- Summary of changes: libs/gfx/GP_Polygon.c | 46 +++++++++++++++++++++++++++++++++++++++------- 1 files changed, 39 insertions(+), 7 deletions(-) repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0

[repo.or.cz] gfxprim.git branch master updated: fd8d609eb63fb8753bcbf69c882a9b9b4b58e966
by metan 09 Dec '12

09 Dec '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project gfxprim.git. The branch, master has been updated via fd8d609eb63fb8753bcbf69c882a9b9b4b58e966 (commit) from d774f27f7337a04044850bc48f4253e2d5016d13 (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. - Log ----------------------------------------------------------------- http://repo.or.cz/w/gfxprim.git/commit/fd8d609eb63fb8753bcbf69c882a9b9b4b58… commit fd8d609eb63fb8753bcbf69c882a9b9b4b58e966 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun Dec 9 14:35:51 2012 +0100 tests: gfx: GP_Line: More testcases. diff --git a/tests/gfx/Line.c b/tests/gfx/Line.c index f3739e8..5314a90 100644 --- a/tests/gfx/Line.c +++ b/tests/gfx/Line.c @@ -171,8 +171,42 @@ static struct testcase testcase_line_15 = { } }; +static struct testcase testcase_line_clip = { + .x0 = -1000, + .y0 = -1000, + .x1 = 1000, + .y1 = 1000, + + .w = 4, + .h = 4, + + .pixmap = { + 1, 0, 0, 0, + 0, 1, 0, 0, + 0, 0, 1, 0, + 0, 0, 0, 1, + } +}; + +static struct testcase testcase_line_large_xy = { + .x0 = -1000000000, + .y0 = -1000000000, + .x1 = 1000000000, + .y1 = 1000000000, + + .w = 4, + .h = 4, + + .pixmap = { + 1, 0, 0, 0, + 0, 1, 0, 0, + 0, 0, 1, 0, + 0, 0, 0, 1, + } +}; + const struct tst_suite tst_suite = { - .suite_name = "GFX Line Testsuite", + .suite_name = "Line Testsuite", .tests = { {.name = "Line 1px", .tst_fn = test_line, @@ -193,7 +227,16 @@ const struct tst_suite tst_suite = { {.name = "Line 15 degrees", .tst_fn = test_line, .data = &testcase_line_15}, + + {.name = "Line clipping", + .tst_fn = test_line, + .data = &testcase_line_clip}, + {.name = "Line large coordinates", + .tst_fn = test_line, + .data = &testcase_line_large_xy, + .timeout = 1}, + {.name = NULL} } }; ----------------------------------------------------------------------- Summary of changes: tests/gfx/Line.c | 45 ++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 44 insertions(+), 1 deletions(-) repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0

[repo.or.cz] gfxprim.git branch master updated: d774f27f7337a04044850bc48f4253e2d5016d13
by metan 09 Dec '12

09 Dec '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project gfxprim.git. The branch, master has been updated via d774f27f7337a04044850bc48f4253e2d5016d13 (commit) from b9b02ed950aa9b8c45aa065ef1e5175b6e7ea2e8 (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. - Log ----------------------------------------------------------------- http://repo.or.cz/w/gfxprim.git/commit/d774f27f7337a04044850bc48f4253e2d501… commit d774f27f7337a04044850bc48f4253e2d5016d13 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun Dec 9 14:27:21 2012 +0100 gfx: GP_Line() the first special case is not needed now. diff --git a/libs/gfx/algo/Line.algo.h b/libs/gfx/algo/Line.algo.h index a69d053..952598c 100644 --- a/libs/gfx/algo/Line.algo.h +++ b/libs/gfx/algo/Line.algo.h @@ -42,10 +42,6 @@ void FN_NAME(CONTEXT_T context, int x0, int y0, int x1, int y1, PIXVAL_T pixval) { if (x0 == x1) { - if (y0 == y1) { - PUTPIXEL(context, x0, y0, pixval); - return; - } if (y0 > y1) GP_SWAP(y0, y1); int y; ----------------------------------------------------------------------- Summary of changes: libs/gfx/algo/Line.algo.h | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0