- Gfxprim - ucw.cz

[repo.or.cz] gfxprim.git branch master updated: 725b6c106fdb6f78b7eb3dfef2192182b30233ff
by metan 06 Dec '12

06 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 725b6c106fdb6f78b7eb3dfef2192182b30233ff (commit) via 5b78e184047a166ab7382f08c2c63c2fd6edc42a (commit) from be558be3368503affa22139727420e1bdd01e27d (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/725b6c106fdb6f78b7eb3dfef2192182b302… commit 725b6c106fdb6f78b7eb3dfef2192182b30233ff Author: Cyril Hrubis <metan(a)ucw.cz> Date: Thu Dec 6 19:35:13 2012 +0100 test: gfx: Add more polygon test cases. diff --git a/tests/gfx/Polygon.c b/tests/gfx/Polygon.c index 96a7d72..16affdd 100644 --- a/tests/gfx/Polygon.c +++ b/tests/gfx/Polygon.c @@ -117,7 +117,24 @@ struct testcase testcase_line_vert_3px = { } }; -struct testcase testcase_line_3px = { +struct testcase testcase_line_horiz_3px = { + .edge_count = 2, + .edges = { + 3, 1, + 1, 0, + }, + .w = 5, + .h = 5, + .pixmap = { + 0, 0, 0, 0, 0, + 0, 1, 1, 1, 0, + 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, + } +}; + +struct testcase testcase_line_4px = { .edge_count = 2, .edges = { 1, 1, @@ -134,6 +151,23 @@ struct testcase testcase_line_3px = { } }; +struct testcase testcase_line_3px = { + .edge_count = 2, + .edges = { + 1, 1, + 3, 3, + }, + .w = 5, + .h = 5, + .pixmap = { + 0, 0, 0, 0, 0, + 0, 1, 0, 0, 0, + 0, 0, 1, 0, 0, + 0, 0, 0, 1, 0, + 0, 0, 0, 0, 0, + } +}; + struct testcase testcase_2x2_square = { .edge_count = 4, .edges = { @@ -152,6 +186,45 @@ struct testcase testcase_2x2_square = { } }; +struct testcase testcase_3x3_square = { + .edge_count = 4, + .edges = { + 1, 1, + 3, 1, + 3, 3, + 1, 3, + }, + .w = 5, + .h = 5, + .pixmap = { + 0, 0, 0, 0, 0, + 0, 1, 1, 1, 0, + 0, 1, 1, 1, 0, + 0, 1, 1, 1, 0, + 0, 0, 0, 0, 0, + } +}; + +struct testcase testcase_4x4_square = { + .edge_count = 4, + .edges = { + 1, 1, + 4, 1, + 4, 4, + 1, 4, + }, + .w = 6, + .h = 6, + .pixmap = { + 0, 0, 0, 0, 0, 0, + 0, 1, 1, 1, 1, 0, + 0, 1, 1, 1, 1, 0, + 0, 1, 1, 1, 1, 0, + 0, 1, 1, 1, 1, 0, + 0, 0, 0, 0, 0, 0, + } +}; + struct testcase testcase_4px_triangle = { .edge_count = 3, .edges = { @@ -169,6 +242,23 @@ struct testcase testcase_4px_triangle = { } }; +struct testcase testcase_6px_triangle = { + .edge_count = 3, + .edges = { + 1, 1, + 1, 3, + 3, 3, + }, + .w = 5, + .h = 5, + .pixmap = { + 0, 0, 0, 0, 0, + 0, 1, 0, 0, 0, + 0, 1, 1, 0, 0, + 0, 1, 1, 1, 0, + 0, 0, 0, 0, 0, + } +}; static int test_1_edge(void) { @@ -185,30 +275,60 @@ static int test_line_vert_3px(void) return test_polygon(&testcase_line_vert_3px); } +static int test_line_horiz_3px(void) +{ + return test_polygon(&testcase_line_horiz_3px); +} + static int test_line_3px(void) { return test_polygon(&testcase_line_3px); } +static int test_line_4px(void) +{ + return test_polygon(&testcase_line_4px); +} + static int test_2x2_square(void) { return test_polygon(&testcase_2x2_square); } +static int test_3x3_square(void) +{ + return test_polygon(&testcase_3x3_square); +} + +static int test_4x4_square(void) +{ + return test_polygon(&testcase_4x4_square); +} + static int test_4px_triangle(void) { return test_polygon(&testcase_4px_triangle); } +static int test_6px_triangle(void) +{ + return test_polygon(&testcase_6px_triangle); +} + const struct tst_suite tst_suite = { .suite_name = "Polygon Testsuite", .tests = { {.name = "1 Edge Polygon", .tst_fn = test_1_edge}, {.name = "5 Edges 1px Polygon", .tst_fn = test_5_edges_1px}, - {.name = "2x2 Square Polygon", .tst_fn = test_2x2_square}, - {.name = "Vert Line 3px Polygon", .tst_fn = test_line_vert_3px}, + {.name = "Vertical Line 3px Polygon", .tst_fn = test_line_vert_3px}, + {.name = "Horizonval Line 3px Polygon", .tst_fn = test_line_horiz_3px}, {.name = "Line 3px Polygon", .tst_fn = test_line_3px}, + {.name = "Line 4px Polygon", .tst_fn = test_line_4px}, + {.name = "2x2 Square Polygon", .tst_fn = test_2x2_square}, + {.name = "3x3 Square Polygon", .tst_fn = test_3x3_square}, + {.name = "4x4 Square Polygon", .tst_fn = test_4x4_square}, {.name = "Triangle 4px Polygon", .tst_fn = test_4px_triangle}, + {.name = "Triangle 6px Polygon", .tst_fn = test_6px_triangle}, {.name = NULL} } }; http://repo.or.cz/w/gfxprim.git/commit/5b78e184047a166ab7382f08c2c63c2fd6ed… commit 5b78e184047a166ab7382f08c2c63c2fd6edc42a Author: Cyril Hrubis <metan(a)ucw.cz> Date: Thu Dec 6 19:34:19 2012 +0100 tests: gfx: Fix typos in common code. diff --git a/tests/gfx/common.c b/tests/gfx/common.c index d261dfd..57d5db4 100644 --- a/tests/gfx/common.c +++ b/tests/gfx/common.c @@ -24,13 +24,13 @@ #include "common.h" -static void dump_buffer(const char *pattern, int x, int y) +static void dump_buffer(const char *pattern, int w, int h) { - int i, j; + int x, y; - for (i = 0; i < y; i++) { - for (j = 0; j < x; j++) - printf("%2x ", pattern[j + i * y]); + for (y = 0; y < h; y++) { + for (x = 0; x < w; x++) + printf("%2x ", pattern[x + y * w]); printf("n"); } } @@ -51,7 +51,7 @@ int compare_buffers(const char *pattern, const GP_Context *c) for (x = 0; x < c->w; x++) { for (y = 0; y < c->h; y++) { if (pattern[x + y * c->h] != - ((char*)c->pixels)[x + y * c->h]) { + ((char*)c->pixels)[x + y * c->w]) { err++; } } ----------------------------------------------------------------------- Summary of changes: tests/gfx/Polygon.c | 126 +++++++++++++++++++++++++++++++++++++++++++++++++- tests/gfx/common.c | 12 +++--- 2 files changed, 129 insertions(+), 9 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: be558be3368503affa22139727420e1bdd01e27d
by metan 05 Dec '12

05 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 be558be3368503affa22139727420e1bdd01e27d (commit) from 785938474481fa23cda347fd25a3df7f0adde980 (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/be558be3368503affa22139727420e1bdd01… commit be558be3368503affa22139727420e1bdd01e27d Author: Cyril Hrubis <metan(a)ucw.cz> Date: Wed Dec 5 22:39:35 2012 +0100 tests: Add basic polygon tests, more to come. diff --git a/tests/gfx/Makefile b/tests/gfx/Makefile index d3c9b0e..1345a1f 100644 --- a/tests/gfx/Makefile +++ b/tests/gfx/Makefile @@ -3,11 +3,12 @@ include $(TOPDIR)/pre.mk CSOURCES=$(shell echo *.c) -APPS=gfx_benchmark Circle Line CircleSeg +APPS=gfx_benchmark Circle Line CircleSeg Polygon Circle: common.o Line: common.o CircleSeg: common.o +Polygon: common.o include ../tests.mk diff --git a/tests/gfx/Polygon.c b/tests/gfx/Polygon.c new file mode 100644 index 0000000..96a7d72 --- /dev/null +++ b/tests/gfx/Polygon.c @@ -0,0 +1,214 @@ +/***************************************************************************** + * 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_Polygon.h> + +#include "tst_test.h" + +#include "common.h" + +struct testcase { + /* polygon description */ + unsigned int edge_count; + GP_Coord edges[20]; + + /* expected result */ + GP_Size w, h; + const char pixmap[]; +}; + +static int test_polygon(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_FillPolygon(c, t->edge_count, t->edges, 1); + + err = compare_buffers(t->pixmap, c); + + if (err) { + tst_msg("Patterns are different"); + return TST_FAILED; + } + + return TST_SUCCESS; +} + +struct testcase testcase_1_edge = { + .edge_count = 1, + .edges = { + 1, 1, + }, + .w = 3, + .h = 3, + .pixmap = { + 0, 0, 0, + 0, 1, 0, + 0, 0, 0, + } +}; + +struct testcase testcase_5_edges_1px = { + .edge_count = 5, + .edges = { + 1, 1, + 1, 1, + 1, 1, + 1, 1, + 1, 1, + }, + .w = 3, + .h = 3, + .pixmap = { + 0, 0, 0, + 0, 1, 0, + 0, 0, 0, + } +}; + +struct testcase testcase_line_vert_3px = { + .edge_count = 2, + .edges = { + 1, 1, + 1, 3, + }, + .w = 5, + .h = 5, + .pixmap = { + 0, 0, 0, 0, 0, + 0, 1, 0, 0, 0, + 0, 1, 0, 0, 0, + 0, 1, 0, 0, 0, + 0, 0, 0, 0, 0, + } +}; + +struct testcase testcase_line_3px = { + .edge_count = 2, + .edges = { + 1, 1, + 2, 3, + }, + .w = 5, + .h = 5, + .pixmap = { + 0, 0, 0, 0, 0, + 0, 1, 0, 0, 0, + 0, 1, 1, 0, 0, + 0, 0, 1, 0, 0, + 0, 0, 0, 0, 0, + } +}; + +struct testcase testcase_2x2_square = { + .edge_count = 4, + .edges = { + 1, 1, + 2, 1, + 2, 2, + 1, 2, + }, + .w = 4, + .h = 4, + .pixmap = { + 0, 0, 0, 0, + 0, 1, 1, 0, + 0, 1, 1, 0, + 0, 0, 0, 0, + } +}; + +struct testcase testcase_4px_triangle = { + .edge_count = 3, + .edges = { + 2, 1, + 1, 2, + 3, 2, + }, + .w = 5, + .h = 4, + .pixmap = { + 0, 0, 0, 0, 0, + 0, 0, 1, 0, 0, + 0, 1, 1, 1, 0, + 0, 0, 0, 0, 0, + } +}; + + +static int test_1_edge(void) +{ + return test_polygon(&testcase_1_edge); +} + +static int test_5_edges_1px(void) +{ + return test_polygon(&testcase_5_edges_1px); +} + +static int test_line_vert_3px(void) +{ + return test_polygon(&testcase_line_vert_3px); +} + +static int test_line_3px(void) +{ + return test_polygon(&testcase_line_3px); +} + +static int test_2x2_square(void) +{ + return test_polygon(&testcase_2x2_square); +} + +static int test_4px_triangle(void) +{ + return test_polygon(&testcase_4px_triangle); +} + +const struct tst_suite tst_suite = { + .suite_name = "Polygon Testsuite", + .tests = { + {.name = "1 Edge Polygon", .tst_fn = test_1_edge}, + {.name = "5 Edges 1px Polygon", .tst_fn = test_5_edges_1px}, + {.name = "2x2 Square Polygon", .tst_fn = test_2x2_square}, + {.name = "Vert Line 3px Polygon", .tst_fn = test_line_vert_3px}, + {.name = "Line 3px Polygon", .tst_fn = test_line_3px}, + {.name = "Triangle 4px Polygon", .tst_fn = test_4px_triangle}, + {.name = NULL} + } +}; diff --git a/tests/gfx/runtest.sh b/tests/gfx/runtest.sh index bcef95e..bf430be 100755 --- a/tests/gfx/runtest.sh +++ b/tests/gfx/runtest.sh @@ -13,3 +13,4 @@ export LIBC_FATAL_STDERR_=1 LD_PRELOAD=`pwd`/../framework/libtst_preload.so LD_LIBRARY_PATH=../../build/ ./Circle "$@" LD_PRELOAD=`pwd`/../framework/libtst_preload.so LD_LIBRARY_PATH=../../build/ ./Line "$@" 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/Makefile | 3 +- tests/gfx/Polygon.c | 214 ++++++++++++++++++++++++++++++++++++++++++++++++++ tests/gfx/runtest.sh | 1 + 3 files changed, 217 insertions(+), 1 deletions(-) create mode 100644 tests/gfx/Polygon.c 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: 785938474481fa23cda347fd25a3df7f0adde980
by metan 03 Dec '12

03 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 785938474481fa23cda347fd25a3df7f0adde980 (commit) from 35000c49abc94cc97388eab4b040df6dc2bdbee7 (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/785938474481fa23cda347fd25a3df7f0add… commit 785938474481fa23cda347fd25a3df7f0adde980 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Mon Dec 3 23:34:20 2012 +0100 gfx: Add GP_FillPolygon() and GP_Polygon(). This commit adds missing polygon functions as well as polygon into the shapetest. diff --git a/demos/c_simple/shapetest.c b/demos/c_simple/shapetest.c index 702b210..a807f5b 100644 --- a/demos/c_simple/shapetest.c +++ b/demos/c_simple/shapetest.c @@ -55,8 +55,9 @@ static int show_axes = 1; #define SHAPE_ELLIPSE 4 #define SHAPE_RECTANGLE 5 #define SHAPE_TETRAGON 6 -#define SHAPE_ARC 7 -#define SHAPE_LAST 7 +#define SHAPE_POLYGON 7 +#define SHAPE_ARC 8 +#define SHAPE_LAST 8 static int shape = SHAPE_FIRST; /* Variants in coordinates, if applicable */ @@ -198,6 +199,42 @@ void draw_testing_tetragon(int x, int y, int xradius, int yradius) GP_Tetragon(win, x0, y0, x1, y1, x2, y2, x3, y3, white); } +void draw_testing_polygon(int x, int y, int xradius, int yradius) +{ + GP_Coord xy[14]; + unsigned int edges = 7; + + xy[0] = x + xradius; + xy[1] = y; + + xy[2] = x + 3 * xradius / 4; + xy[3] = y + yradius / 4; + + xy[4] = x + 3 * xradius / 4; + xy[5] = y + 3 * yradius / 4; + + xy[6] = x + xradius / 4; + xy[7] = y + 3 * yradius / 4; + + xy[8] = x; + xy[9] = y; + + xy[10] = x - xradius; + xy[11] = y; + + xy[12] = x - 3 * xradius / 4; + xy[13] = y - yradius / 4; + + if (outline == 1) + GP_Polygon(win, edges, xy, yellow); + + if (fill) + GP_FillPolygon(win, edges, xy, red); + + if (outline == 2) + GP_Polygon(win, edges, xy, white); +} + void redraw_screen(void) { @@ -228,31 +265,35 @@ void redraw_screen(void) case SHAPE_TRIANGLE: draw_testing_triangle(center_x, center_y, xradius, yradius); title = "TRIANGLE"; - break; + break; case SHAPE_CIRCLE: draw_testing_circle(center_x, center_y, xradius, yradius); title = "CIRCLE"; - break; + break; case SHAPE_RING: draw_testing_ring(center_x, center_y, xradius, yradius); title = "RING"; - break; + break; case SHAPE_ELLIPSE: draw_testing_ellipse(center_x, center_y, xradius, yradius); title = "ELLIPSE"; - break; + break; case SHAPE_RECTANGLE: draw_testing_rectangle(center_x, center_y, xradius, yradius); title = "RECTANGLE"; - break; + break; case SHAPE_TETRAGON: draw_testing_tetragon(center_x, center_y, xradius, yradius); title = "TETRAGON"; - break; + break; + case SHAPE_POLYGON: + draw_testing_polygon(center_x, center_y, xradius, yradius); + title = "POLYGON"; + break; case SHAPE_ARC: draw_testing_arc(center_x, center_y, xradius, yradius); title = "ARC"; - break; + break; } GP_Text(win, &style, 16, 16, GP_ALIGN_RIGHT|GP_VALIGN_BELOW, @@ -428,7 +469,7 @@ void print_instructions(void) printf(" 1/2/3 ............... choose shape variant (if applicable)n"); } -int main(int argc, char ** argv) +int main(void) { const char *backend_opts = "X11"; diff --git a/include/gfx/GP_Polygon.h b/include/gfx/GP_Polygon.h index 8874a53..1ed256e 100644 --- a/include/gfx/GP_Polygon.h +++ b/include/gfx/GP_Polygon.h @@ -19,16 +19,25 @@ * Copyright (C) 2009-2011 Jiri "BlueBear" Dluhos * * <jiri.bluebear.dluhos(a)gmail.com> * * * - * Copyright (C) 2009-2011 Cyril Hrubis <metan(a)ucw.cz> * + * Copyright (C) 2009-2012 Cyril Hrubis <metan(a)ucw.cz> * * * *****************************************************************************/ -#ifndef GP_POLYGON_H -#define GP_POLYGON_H +#ifndef GFX_GP_POLYGON_H +#define GFX_GP_POLYGON_H #include "core/GP_Context.h" -void GP_FillPolygon_Raw(GP_Context *context, int vertex_count, +void GP_Polygon(GP_Context *context, unsigned int vertex_count, + const GP_Coord *xy, GP_Pixel pixel); + +void GP_Polygon_Raw(GP_Context *context, unsigned int vertex_count, + const GP_Coord *xy, GP_Pixel pixel); + +void GP_FillPolygon(GP_Context *context, unsigned int vertex_count, + const GP_Coord *xy, GP_Pixel pixel); + +void GP_FillPolygon_Raw(GP_Context *context, unsigned int vertex_count, const GP_Coord *xy, GP_Pixel pixel); -#endif /* GP_POLYGON_H */ +#endif /* GFX_GP_POLYGON_H */ diff --git a/libs/gfx/GP_Polygon.c b/libs/gfx/GP_Polygon.c index f2ea9cd..ed75a27 100644 --- a/libs/gfx/GP_Polygon.c +++ b/libs/gfx/GP_Polygon.c @@ -16,8 +16,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, * * Boston, MA 02110-1301 USA * * * - * Copyright (C) 2012 Jiri Dluhos <jiri.bluebear.dluhos(a)gmail.com> * - * Copyright (C) 2012 Cyril Hrubis <metan(a)ucw.cz> * + * Copyright (C) 2009 - 2012 Jiri Dluhos <jiri.bluebear.dluhos(a)gmail.com> * + * Copyright (C) 2009 - 2012 Cyril Hrubis <metan(a)ucw.cz> * * * *****************************************************************************/ @@ -27,6 +27,9 @@ #include <stdio.h> #include <math.h> +#include "core/GP_Transform.h" + +#include "GP_Line.h" #include "GP_HLine.h" #include "GP_Polygon.h" @@ -118,15 +121,15 @@ static int GP_ComputeScanline(float *results, struct GP_PolygonEdge *edges, return result_index; } -void GP_FillPolygon_Raw(GP_Context *context, int vertex_count, - const GP_Coord *xy, GP_Pixel pixel) +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[vertex_count]; int i; - for (i = 0; i < vertex_count - 1; i++) { + for (i = 0; i < (int)vertex_count - 1; i++) { edge = edges + i; GP_InitEdge(edge, xy[2*i], xy[2*i + 1], xy[2*i + 2], xy[2*i + 3]); @@ -147,3 +150,64 @@ void GP_FillPolygon_Raw(GP_Context *context, int vertex_count, } } } + +void GP_FillPolygon(GP_Context *context, unsigned int vertex_count, + const GP_Coord *xy, GP_Pixel pixel) +{ + unsigned int i; + GP_Coord xy_copy[2 * vertex_count]; + + for (i = 0; i < vertex_count; i++) { + unsigned int x = 2 * i; + unsigned int y = 2 * i + 1; + + xy_copy[x] = xy[x]; + xy_copy[y] = xy[y]; + GP_TRANSFORM_POINT(context, xy_copy[x], xy_copy[y]); + } + + GP_FillPolygon_Raw(context, vertex_count, xy_copy, pixel); +} + +void GP_Polygon_Raw(GP_Context *context, unsigned int vertex_count, + const GP_Coord *xy, GP_Pixel pixel) +{ + unsigned int i; + + GP_Coord prev_x = xy[2 * vertex_count - 2]; + GP_Coord prev_y = xy[2 * vertex_count - 1]; + + for (i = 0; i < vertex_count; i++) { + GP_Coord x = xy[2 * i]; + GP_Coord y = xy[2 * i + 1]; + + GP_Line_Raw(context, prev_x, prev_y, x, y, pixel); + + prev_x = x; + prev_y = y; + } +} + + +void GP_Polygon(GP_Context *context, unsigned int vertex_count, + const GP_Coord *xy, GP_Pixel pixel) +{ + unsigned int i; + + GP_Coord prev_x = xy[2 * vertex_count - 2]; + GP_Coord prev_y = xy[2 * vertex_count - 1]; + + GP_TRANSFORM_POINT(context, prev_x, prev_y); + + for (i = 0; i < vertex_count; i++) { + GP_Coord x = xy[2 * i]; + GP_Coord y = xy[2 * i + 1]; + + GP_TRANSFORM_POINT(context, x, y); + + GP_Line_Raw(context, prev_x, prev_y, x, y, pixel); + + prev_x = x; + prev_y = y; + } +} ----------------------------------------------------------------------- Summary of changes: demos/c_simple/shapetest.c | 61 ++++++++++++++++++++++++++++++------ include/gfx/GP_Polygon.h | 19 ++++++++--- libs/gfx/GP_Polygon.c | 74 +++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 134 insertions(+), 20 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: 35000c49abc94cc97388eab4b040df6dc2bdbee7
by metan 03 Dec '12

03 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 35000c49abc94cc97388eab4b040df6dc2bdbee7 (commit) from b42a87dcb2eda0fafe87007fa07ec19b6398a732 (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/35000c49abc94cc97388eab4b040df6dc2bd… commit 35000c49abc94cc97388eab4b040df6dc2bdbee7 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Mon Dec 3 21:29:52 2012 +0100 backends: x11: Add unfinished SHM support. Image resize is not finished and because of that SHM support is disabled by default. diff --git a/configure b/configure index 0919ff2..a13f914 100755 --- a/configure +++ b/configure @@ -253,6 +253,9 @@ if __name__ == '__main__': ["libX11", "X11 library", [header_exists, "X11/Xlib.h"], "", "-lX11", ["backends"]], + ["X_SHM", + "MIT-SHM X Extension", + [header_exists, "X11/extensions/XShm.h"], "-lXext", "", ["backends"]], ["freetype", "A high-quality and portable font engine", [header_exists, "ft2build.h"], "", "`freetype-config --libs`", ["core"]], diff --git a/libs/backends/GP_X11.c b/libs/backends/GP_X11.c index dbe3fc8..d4030b8 100644 --- a/libs/backends/GP_X11.c +++ b/libs/backends/GP_X11.c @@ -20,6 +20,9 @@ * * *****************************************************************************/ +#include <string.h> +#include <errno.h> + #include "../../config.h" #include "core/GP_Debug.h" @@ -32,6 +35,12 @@ #include <X11/Xatom.h> #include <X11/Xmd.h> +#ifdef HAVE_X_SHM +#include <sys/ipc.h> +#include <sys/shm.h> +#include <X11/extensions/XShm.h> +#endif /* HAVE_X_SHM */ + #include "input/GP_InputDriverX11.h" #include "GP_X11.h" @@ -45,10 +54,17 @@ struct x11_priv { XImage *img; - int resized_flag; +#ifdef HAVE_X_SHM + XShmSegmentInfo shminfo; + GP_Context context; +#endif /* HAVE_X_SHM */ + + int resized_flag:1; + int shm_flag:1; }; 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); @@ -58,7 +74,10 @@ static void x11_exit(GP_Backend *self) XLockDisplay(x11->dpy); - destroy_ximage(self); + if (x11->shm_flag) + destroy_shm_ximage(self); + else + destroy_ximage(self); XDestroyWindow(x11->dpy, x11->win); /* I wonder if this is right sequence... */ @@ -77,8 +96,15 @@ static void x11_update_rect(GP_Backend *self, GP_Coord x0, GP_Coord y0, XLockDisplay(x11->dpy); - XPutImage(x11->dpy, x11->win, DefaultGC(x11->dpy, x11->scr), - x11->img, x0, y0, x0, y0, x1-x0+1, y1-y0+1); +#ifdef HAVE_X_SHM + if (x11->shm_flag) + XShmPutImage(x11->dpy, x11->win, DefaultGC(x11->dpy, x11->scr), + x11->img, x0, y0, x0, y0, x1-x0+1, y1-y0+1, False); + else +#endif /* HAVE_X_SHM */ + XPutImage(x11->dpy, x11->win, DefaultGC(x11->dpy, x11->scr), + x11->img, x0, y0, x0, y0, x1-x0+1, y1-y0+1); + XFlush(x11->dpy); x11->resized_flag = 0; @@ -193,27 +219,127 @@ static int x11_set_attributes(struct GP_Backend *self, return 0; } -static int create_ximage(GP_Backend *self, GP_Size w, GP_Size h) +void match_pixel_type(struct x11_priv *x11, enum GP_PixelType *pixel_type, int *depth) { - struct x11_priv *x11 = GP_BACKEND_PRIV(self); - int depth; - enum GP_PixelType pixel_type; - /* * Eh, the XImage supports either 8, 16 or 32 bit pixels * * Do best effor on selecting appropriate pixel type */ - for (depth = 8; depth <= 32; depth<<=1) { - pixel_type = GP_PixelRGBMatch(x11->vis->red_mask, - x11->vis->green_mask, - x11->vis->blue_mask, - 0x0, depth); + for (*depth = 8; *depth <= 32; *depth<<=1) { + *pixel_type = GP_PixelRGBMatch(x11->vis->red_mask, + x11->vis->green_mask, + x11->vis->blue_mask, + 0x0, *depth); - if (pixel_type != GP_PIXEL_UNKNOWN) + if (*pixel_type != GP_PIXEL_UNKNOWN) break; } +} + +#ifdef HAVE_X_SHM + +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"); + return 1; + } + + enum GP_PixelType pixel_type; + int depth; + match_pixel_type(x11, &pixel_type, &depth); + + if (pixel_type == GP_PIXEL_UNKNOWN) { + GP_DEBUG(1, "Unknown pixel type"); + return 1; + } + + x11->img = XShmCreateImage(x11->dpy, x11->vis, x11->scr_depth, + ZPixmap, NULL, &x11->shminfo, w, h); + + if (x11->img == NULL) { + GP_WARN("Failed to create SHM XImage"); + return 1; + } + + size_t size = x11->img->bytes_per_line * x11->img->height; + + x11->shminfo.shmid = shmget(IPC_PRIVATE, size, IPC_CREAT|0777); + + if (x11->shminfo.shmid == -1) { + GP_WARN("Calling shmget() failed: %s", strerror(errno)); + goto err0; + } + + x11->shminfo.shmaddr = x11->img->data = shmat(x11->shminfo.shmid, 0, 0); + + if (x11->shminfo.shmaddr == (void *)-1) { + GP_WARN("Calling shmat() failed: %s", strerror(errno)); + goto err1; + } + + x11->shminfo.readOnly = False; + + if (XShmAttach(x11->dpy, &x11->shminfo) == False) { + GP_WARN("XShmAttach failed"); + goto err2; + } + + GP_ContextInit(&x11->context, w, h, pixel_type, x11->shminfo.shmaddr); + x11->context.bytes_per_row = x11->img->bytes_per_line; + + self->context = &x11->context; + + x11->shm_flag = 1; + + return 0; +err2: + shmdt(x11->shminfo.shmaddr); +err1: + shmctl(x11->shminfo.shmid, IPC_RMID, 0); +err0: + XDestroyImage(x11->img); + return 1; +} + +static void destroy_shm_ximage(GP_Backend *self) +{ + struct x11_priv *x11 = GP_BACKEND_PRIV(self); + + XShmDetach(x11->dpy, &x11->shminfo); + shmdt(x11->shminfo.shmaddr); + shmctl(x11->shminfo.shmid, IPC_RMID, 0); + XDestroyImage(x11->img); +} + +#else + +static int create_shm_ximage(GP_Backend GP_UNUSED(*self), + GP_Size GP_UNUSED(w), GP_Size GP_UNUSED(h)) +{ + return 1; +} + +static void destroy_shm_ximage(GP_Backend GP_UNUSED(*self)) +{ + GP_WARN("Stub called"); +} + +#endif /* HAVE_X_SHM */ + +static int create_ximage(GP_Backend *self, GP_Size w, GP_Size h) +{ + struct x11_priv *x11 = GP_BACKEND_PRIV(self); + enum GP_PixelType pixel_type; + int depth; + + match_pixel_type(x11, &pixel_type, &depth); + if (pixel_type == GP_PIXEL_UNKNOWN) { GP_DEBUG(1, "Unknown pixel type"); return 1; @@ -233,24 +359,33 @@ static int create_ximage(GP_Backend *self, GP_Size w, GP_Size h) return 1; } + x11->shm_flag = 0; + x11->img->data = (char*)self->context->pixels; + return 0; } static void destroy_ximage(GP_Backend *self) { struct x11_priv *x11 = GP_BACKEND_PRIV(self); - + GP_ContextFree(self->context); x11->img->data = NULL; XDestroyImage(x11->img); } + 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); @@ -511,14 +646,14 @@ GP_Backend *GP_BackendX11Init(const char *display, int x, int y, GP_DEBUG(1, "Failed to create window"); goto err1; } - - if (create_ximage(backend, w, h)) - goto err1; + //if (create_shm_ximage(backend, w, h)) + if (create_ximage(backend, w, h)) + goto err1; XFlush(x11->dpy); - x11->resized_flag = 0; + x11->resized_flag = 0; backend->name = "X11"; backend->Flip = x11_flip; ----------------------------------------------------------------------- Summary of changes: configure | 3 + libs/backends/GP_X11.c | 175 ++++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 158 insertions(+), 20 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: b42a87dcb2eda0fafe87007fa07ec19b6398a732
by metan 03 Dec '12

03 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 b42a87dcb2eda0fafe87007fa07ec19b6398a732 (commit) via 7122d44b503fdf8c67ea49a43b10f8b75e809b36 (commit) via 3de5653e6ed7557d6da57722d06da74a24652eee (commit) via 8415a829b152c199267addf477236da77ca297f5 (commit) from ec2f0bf1e1633bd1b8e4eae76f6c99b4ffe067a5 (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/b42a87dcb2eda0fafe87007fa07ec19b6398… commit b42a87dcb2eda0fafe87007fa07ec19b6398a732 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Mon Dec 3 19:24:30 2012 +0100 spiv: Add -h help option, yay! diff --git a/demos/spiv/spiv.c b/demos/spiv/spiv.c index a569429..abe7395 100644 --- a/demos/spiv/spiv.c +++ b/demos/spiv/spiv.c @@ -565,6 +565,53 @@ static void init_caches(struct loader_params *params) // params->img_orig_cache = NULL; } +static void print_help(void) +{ + printf("Usage: spiv [opts] imagesnn"); + printf("-Intshow image info (filename and size)nn"); + printf("-Pntshow loading progressnn"); + printf("-fntuse floyd-steinberg ditheringnn"); + printf("-s secntsleep interval in secondsnn"); + printf("-cntturns on bicubic resampling (experimental)nn"); + printf("-d levelntsets GFXprim debug levelnn"); + printf("-e pixel_typentturns on backend type emulationn"); + printf("tfor example -e G1 sets 1-bit grayscalenn"); + printf("-r anglentrotate display 90,180 or 270 degreesnn"); + printf("-bntpass backend init string to backend initn"); + printf("tpass -b help for more infonn"); + + printf("Keyboard control:nn"); + printf("I - toggle show infon"); + printf("P - toggle show progressn"); + printf("R - rotate by 90 degreesn"); + printf("] - change to next resampling methodn"); + printf("[ - change to prev resampling methodn"); + printf(" (current method is shown in infon"); + printf("L - toggle low pass filtern"); + printf("D - drop image cachen"); + printf("nEscn"); + printf("Entern"); + printf("Q - quit spivnn"); + printf("PgDown - move ten image forwardn"); + printf("PgUp - move ten image backwardn"); + printf("nRightn"); + printf("Upn"); + printf("Space - move to the next imagen"); + printf("nLeftn"); + printf("Downn"); + printf("BckSpc - move to the prev imagen"); + printf("n"); + + printf("Some cool options to try:nn"); + printf("spiv -e G1 -f imagesn"); + printf("truns spiv in 1-bit bitmap mode and turns on ditheringnn"); + printf("spiv -b 'X11:ROOT_WIN' imagesn"); + printf("truns spiv using X root window as backend windownn"); + printf("spiv -b 'X11:CREATE_ROOT' imagesn"); + printf("tSame as abowe but works in KDEn"); + +} + int main(int argc, char *argv[]) { GP_Context *context = NULL; @@ -588,7 +635,7 @@ int main(int argc, char *argv[]) .img_orig_cache = NULL, }; - while ((opt = getopt(argc, argv, "b:cd:e:fIPs:r:")) != -1) { + while ((opt = getopt(argc, argv, "b:cd:e:fhIPs:r:")) != -1) { switch (opt) { case 'I': params.show_info = 1; @@ -630,8 +677,14 @@ int main(int argc, char *argv[]) case 'b': backend_opts = optarg; break; + case 'h': + print_help(); + exit(0); + break; default: fprintf(stderr, "Invalid paramter '%c'n", opt); + print_help(); + return 1; } } http://repo.or.cz/w/gfxprim.git/commit/7122d44b503fdf8c67ea49a43b10f8b75e80… commit 7122d44b503fdf8c67ea49a43b10f8b75e809b36 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Mon Dec 3 19:23:37 2012 +0100 backends: Add CREATE_ROOT to backend init docs. diff --git a/libs/backends/GP_BackendInit.c b/libs/backends/GP_BackendInit.c index 31fd3bf..0b04407 100644 --- a/libs/backends/GP_BackendInit.c +++ b/libs/backends/GP_BackendInit.c @@ -134,9 +134,11 @@ static void backend_x11_help(FILE *help, const char *err) fprintf(help, "X11 backendn" "--------------n" - "X11:WxH:[ROOT_WIN]nn" - "ROOT_WIN - starts the backend in the root windown" - " (w and h, if set, are ignored)n"); + "X11:[WxH]:[ROOT_WIN]:[CREATE_ROOT]nn" + "ROOT_WIN - starts the backend in the root windown" + " (w and h, if set, are ignored)n" + "CREATE_ROOT - starts the backend in newly createdn" + " root window (w and h, if set, are ignored)n"); } static int x11_params_to_flags(const char *param, GP_Size *w, GP_Size *h, http://repo.or.cz/w/gfxprim.git/commit/3de5653e6ed7557d6da57722d06da74a2465… commit 3de5653e6ed7557d6da57722d06da74a24652eee Author: Cyril Hrubis <metan(a)ucw.cz> Date: Mon Dec 3 17:39:17 2012 +0100 doc: Add GP_ContextFromSurface() docs and example. diff --git a/doc/backends.txt b/doc/backends.txt index a471652..86d5d51 100644 --- a/doc/backends.txt +++ b/doc/backends.txt @@ -1,19 +1,21 @@ Drawing Backends ----------------- +================ -Drawing backends provide means to draw into computer screen or into an window +Drawing backends provide means to draw into computer screen or into a window inside of running operating system. Instead of having one unified initialization interface each backend has it's specific function and semantics but once backend is initialized the backend structure provides unified API for controlling the drawing. -So far there are three backends implemented, Linux mmaped frame-buffer, libSDL -and X11 backend. +So far there are backends for Linux mmaped frame-buffer, libSDL and X11. For example usage see backend link:example_backend.html[example]. Initialization functions -~~~~~~~~~~~~~~~~~~~~~~~ +------------------------ + +Linux Framebuffer +~~~~~~~~~~~~~~~~~ [source,c] ------------------------------------------------------------------------------- @@ -28,6 +30,10 @@ If flag is set console KBD driver is used to feed keystrokes into the event queue, otherwise no events are generated and you are expected to initialize input event driver in order to get keystrokes and/or pointer events. + +SDL +~~~ + [source,c] ------------------------------------------------------------------------------- enum GP_BackendSDLFlags { @@ -40,10 +46,10 @@ GP_Backend *GP_BackendSDLInit(GP_Size w, GP_Size h, const char *caption); ------------------------------------------------------------------------------- -Initialize SDL as an backend driver. The backend is thread safe as all the +Initialize 'SDL' as an backend driver. The backend is thread safe as all the operations are guarded by locks. -You can't initialize more than one backend at a time, which is inherited SDL +You can't initialize more than one backend at a time, which is inherited 'SDL' limitation. If you call the initialization for a second time, you will get a pointer to already running backend. @@ -58,6 +64,26 @@ The caption is window caption. And finally flags may change the SDL to go to full-screen mode or make the window resizable. + +[source,c] +------------------------------------------------------------------------------- +#include <backends/GP_SDL_Context.h> + +int GP_ContextFromSurface(GP_Context *c, const SDL_Surface *surf); +------------------------------------------------------------------------------- + +This function allows you to mix 'SDL' and 'GFXprim' code. The functions +initializes the context from 'SDL' surface using the pixel buffer from surface +as pixel buffer for the context. + +Function returns zero on succes and non-zero on failure (There is no GFXprim +pixel type to match given surface). + +For example usage see 'SDL' glue link:example_SDL_glue.html[example]. + +X server +~~~~~~~~ + [source,c] ------------------------------------------------------------------------------- enum GP_BackendX11Flags { @@ -73,9 +99,9 @@ GP_Backend *GP_BackendX11Init(const char *display, int x, int y, enum GP_BackendX11Flags flags); ------------------------------------------------------------------------------- -Returns pointer to initialized X11 backend or in case of failure NULL. +Returns pointer to initialized X11 backend or in case of failure 'NULL'. -When display is NULL default display is used (which is what you want most of the +When display is 'NULL' default display is used (which is what you want most of the time). This backend feeds key events into global input queue. diff --git a/doc/example_SDL_glue.txt b/doc/example_SDL_glue.txt new file mode 100644 index 0000000..04ca2f9 --- /dev/null +++ b/doc/example_SDL_glue.txt @@ -0,0 +1,10 @@ +SDL Glue Example +---------------- + +You can easily mix SDL and GFXprim code using 'GP_ContextFromSurface()' +function. + +[source,c] +------------------------------------------------------------------ +include::../demos/c_simple/SDL_glue.c[] +------------------------------------------------------------------ http://repo.or.cz/w/gfxprim.git/commit/8415a829b152c199267addf477236da77ca2… commit 8415a829b152c199267addf477236da77ca297f5 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Mon Dec 3 17:23:19 2012 +0100 libs,backends: Finally remove the obsolete SDL library. It's functionality is replaced by exporting GP_ContextFromSurface() function from SDL backend. diff --git a/demos/c_simple/Makefile b/demos/c_simple/Makefile index b30fc23..e64dda7 100644 --- a/demos/c_simple/Makefile +++ b/demos/c_simple/Makefile @@ -1,6 +1,14 @@ TOPDIR=../.. -CSOURCES=$(shell echo *.c) +include $(TOPDIR)/pre.mk + +SOURCES=$(shell echo *.c) + +ifneq ($(HAVE_LIBSDL),yes) +CSOURCES=$(filter-out SDL_glue.c,$(SOURCES)) +else +CSOURCES=$(SOURCES) +endif INCLUDE= LDFLAGS+=-L$(TOPDIR)/build/ @@ -12,9 +20,12 @@ APPS=backend_example loaders_example loaders filters_symmetry gfx_koch fileview linetest randomshapetest fonttest loaders_register blittest textaligntest +ifeq ($(HAVE_LIBSDL),yes) +APPS+=SDL_glue +endif + v4l2_show: LDLIBS+=-lGP_grabbers v4l2_grab: LDLIBS+=-lGP_grabbers -include $(TOPDIR)/pre.mk include $(TOPDIR)/app.mk include $(TOPDIR)/post.mk diff --git a/libs/SDL/GP_SDL_Context.c b/demos/c_simple/SDL_glue.c similarity index 56% rename from libs/SDL/GP_SDL_Context.c rename to demos/c_simple/SDL_glue.c index cbe5ca4..3185b67 100644 --- a/libs/SDL/GP_SDL_Context.c +++ b/demos/c_simple/SDL_glue.c @@ -23,46 +23,94 @@ * * *****************************************************************************/ -#include "GP_Core.h" + /* + + This example shows how to mix SDL with GFXprim. -#include "../../config.h" + */ -#ifdef HAVE_LIBSDL +#include <stdio.h> +#include <stdlib.h> +#include <SDL/SDL.h> +#include <GP.h> +#include <backends/GP_SDL_Context.h> -#include "GP_SDL.h" +#define W 320 +#define H 240 -int GP_SDL_ContextFromSurface(GP_Context *context, SDL_Surface *surf) +static SDL_Surface *display = NULL; +static GP_Context context; + +static GP_Pixel black_pixel, darkgray_pixel; + +void redraw_screen(void) { - if (surf == NULL || surf->pixels == NULL || context == NULL) - return 1; + SDL_LockSurface(display); + + GP_Fill(&context, black_pixel); + + GP_Line(&context, 0, 0, W-1, H-1, darkgray_pixel); + GP_Line(&context, 0, H-1, W-1, 0, darkgray_pixel); + + SDL_UnlockSurface(display); +} + +void event_loop(void) +{ + SDL_Event event; + + while (SDL_WaitEvent(&event) > 0) { + switch (event.type) { - /* sanity checks on the SDL surface */ - if (surf->format->BytesPerPixel == 0 || surf->format->BytesPerPixel > 4) + case SDL_VIDEOEXPOSE: + redraw_screen(); + SDL_Flip(display); + break; + + case SDL_KEYDOWN: + switch (event.key.keysym.sym) { + case SDLK_ESCAPE: + return; + default: + break; + } + break; + + case SDL_QUIT: + return; + } + } +} + +int main(void) +{ + if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_TIMER) != 0) { + fprintf(stderr, "Could not initialize SDL: %sn", SDL_GetError()); return 1; + } + + display = SDL_SetVideoMode(W, H, 0, SDL_SWSURFACE); - enum GP_PixelType pixeltype = GP_PixelRGBMatch(surf->format->Rmask, - surf->format->Gmask, - surf->format->Bmask, - surf->format->Ashift, - surf->format->BitsPerPixel); + if (display == NULL) { + fprintf(stderr, "Could not open display: %sn", SDL_GetError()); + goto fail; + } - if (pixeltype == GP_PIXEL_UNKNOWN) - return 1; + GP_ContextFromSurface(&context, display); - /* basic structure and size */ - context->pixels = surf->pixels; - context->bpp = 8 * surf->format->BytesPerPixel; - context->pixel_type = pixeltype; - context->bytes_per_row = surf->pitch; - context->w = surf->w; - context->h = surf->h; + black_pixel = GP_ColorToContextPixel(GP_COL_BLACK, &context); + darkgray_pixel = GP_ColorToContextPixel(GP_COL_GRAY_DARK, &context); - /* orientation */ - context->axes_swap = 0; - context->x_swap = 0; - context->y_swap = 0; + redraw_screen(); + SDL_Flip(display); + event_loop(); + + SDL_Quit(); return 0; + +fail: + SDL_Quit(); + return 1; } -#endif /* HAVE_LIBSDL */ diff --git a/include/SDL/GP_SDL.h b/include/SDL/GP_SDL.h deleted file mode 100644 index d01bd1e..0000000 --- a/include/SDL/GP_SDL.h +++ /dev/null @@ -1,46 +0,0 @@ -/***************************************************************************** - * 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-2010 Jiri "BlueBear" Dluhos * - * <jiri.bluebear.dluhos(a)gmail.com> * - * * - * Copyright (C) 2009-2011 Cyril Hrubis <metan(a)ucw.cz> * - * * - *****************************************************************************/ - -#ifndef GP_SDL_H -#define GP_SDL_H - -#include <SDL/SDL.h> - -#include "GP_SDL_Context.h" -#include "GP_SDL_VideoInit.h" - -#define GP_SDL_BYTES_PER_PIXEL(target) (target->format->BytesPerPixel) - -#define GP_SDL_BYTES_PER_LINE(target) (target->pitch) - -#define GP_SDL_PIXELS(target) ((uint8_t *)(target->pixels)) - -#define GP_SDL_PIXEL_ADDR(target, x, y) ( - GP_SDL_PIXELS(target) - + y * GP_SDL_BYTES_PER_LINE(target) - + x * GP_SDL_BYTES_PER_PIXEL(target) -) - -#endif /* GP_SDL_H */ diff --git a/include/SDL/GP_SDL_VideoInit.h b/include/SDL/GP_SDL_VideoInit.h deleted file mode 100644 index ad26c10..0000000 --- a/include/SDL/GP_SDL_VideoInit.h +++ /dev/null @@ -1,34 +0,0 @@ -/***************************************************************************** - * 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-2010 Jiri "BlueBear" Dluhos * - * <jiri.bluebear.dluhos(a)gmail.com> * - * * - * Copyright (C) 2009-2010 Cyril Hrubis <metan(a)ucw.cz> * - * * - *****************************************************************************/ - -#ifndef GP_SDL_VIDEOINIT_H -#define GP_SDL_VIDEOINIT_H - -#include "GP.h" - -int GP_SDL_VideoInit(GP_Context *context, int width, int height, - int argc, char **argv); - -#endif /* GP_SDL_VIDEOINIT_H */ diff --git a/include/SDL/README b/include/SDL/README deleted file mode 100644 index 37680b8..0000000 --- a/include/SDL/README +++ /dev/null @@ -1,2 +0,0 @@ -This code/interface is deprecated and will be removed after backends are -written. diff --git a/include/SDL/GP_SDL_Context.h b/include/backends/GP_SDL_Context.h similarity index 69% rename from include/SDL/GP_SDL_Context.h rename to include/backends/GP_SDL_Context.h index 5f27a4a..4ed5aad 100644 --- a/include/SDL/GP_SDL_Context.h +++ b/include/backends/GP_SDL_Context.h @@ -16,18 +16,34 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, * * Boston, MA 02110-1301 USA * * * - * Copyright (C) 2009-2010 Jiri "BlueBear" Dluhos * - * <jiri.bluebear.dluhos(a)gmail.com> * - * * - * Copyright (C) 2009-2010 Cyril Hrubis <metan(a)ucw.cz> * + * Copyright (C) 2009-2012 Cyril Hrubis <metan(a)ucw.cz> * * * *****************************************************************************/ -#ifndef GP_SDL_CONTEXT_H -#define GP_SDL_CONTEXT_H +#ifndef BACKENDS_GP_SDL_CONTEXT_H +#define BACKENDS_GP_SDL_CONTEXT_H -#include "GP.h" +#include <SDL/SDL.h> +#include <core/GP_Context.h> -int GP_SDL_ContextFromSurface(GP_Context *context, SDL_Surface *surf); +/* + * This function lets you use GFXprim together with SDL. All you need to do + * is to initialize context from surface. The usage is as follows: + * + * ... + * + * GP_Context c; + * + * if (GP_ContextFromSurface(&c, surface)) { + * error("Failed to match PIXEL_TYPE for given surface"); + * exit(1); + * } + * + * ... + * + * Now you have initialized context that shares the pixel buffer with + * the SDL surface. + */ +int GP_ContextFromSurface(GP_Context *c, const SDL_Surface *surf); -#endif /* GP_SDL_CONTEXT_H */ +#endif /* BACKENDS_GP_SDL_CONTEXT_H */ diff --git a/libs/Makefile b/libs/Makefile index 5fe3d19..6d4d023 100644 --- a/libs/Makefile +++ b/libs/Makefile @@ -1,3 +1,3 @@ TOPDIR=.. -SUBDIRS=core gfx text loaders filters input backends grabbers SDL +SUBDIRS=core gfx text loaders filters input backends grabbers include $(TOPDIR)/post.mk diff --git a/libs/SDL/GP_SDL_VideoInit.c b/libs/SDL/GP_SDL_VideoInit.c deleted file mode 100644 index b7462ff..0000000 --- a/libs/SDL/GP_SDL_VideoInit.c +++ /dev/null @@ -1,109 +0,0 @@ -/***************************************************************************** - * 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-2010 Jiri "BlueBear" Dluhos * - * <jiri.bluebear.dluhos(a)gmail.com> * - * * - * Copyright (C) 2009-2012 Cyril Hrubis <metan(a)ucw.cz> * - * * - *****************************************************************************/ - -#include "../../config.h" - -#ifdef HAVE_LIBSDL - -#include "GP.h" -#include "GP_SDL.h" - -#include <stdio.h> -#include <string.h> - -int GP_SDL_VideoInit(GP_Context *context, int width, int height, - int argc, char **argv) -{ - if (context == NULL) - return 1; - - /* switches that can be set on the command line */ - int display_bpp = 0; - int debug = 0; - - if (argc > 0) { - - if (argv == NULL) - return 1; - - /* extract settings from the command line */ - int i; - for (i = 1; i < argc; i++) { - if (strcmp(argv[i], "--8bpp") == 0) - display_bpp = 8; - else if (strcmp(argv[i], "--16bpp") == 0) - display_bpp = 16; - else if (strcmp(argv[i], "--24bpp") == 0) - display_bpp = 24; - else if (strcmp(argv[i], "--32bpp") == 0) - display_bpp = 32; - else if (strcmp(argv[i], "--debug") == 0) - debug = 1; - } - } - - if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_TIMER) != 0) { - if (debug) { - fprintf(stderr, "Error: Could not initialize SDL: %sn", - SDL_GetError()); - } - return 1; - } - - SDL_Surface *display = NULL; - display = SDL_SetVideoMode(width, height, display_bpp, SDL_SWSURFACE); - if (display == NULL) { - if (debug) { - fprintf(stderr, "Error: Unable to set video mode: %sn", - SDL_GetError()); - } - SDL_Quit(); - return 1; - } - - if (debug) { - printf("Display properties:n"); - printf(" width: %4d, height: %4d, pitch: %4dn", - display->w, display->h, display->pitch); - printf(" bits per pixel: %2d, bytes per pixel: %2dn", - display->format->BitsPerPixel, display->format->BytesPerPixel); - printf(" pixel bit masks: R=%x, G=%x, B=%x, A=%xn", - display->format->Rmask, display->format->Gmask, - display->format->Bmask, display->format->Amask); - } - - int retcode = GP_SDL_ContextFromSurface(context, display); - if (retcode != 0) { - if (debug) { - fprintf(stderr, "Error: Could not create context"); - } - SDL_Quit(); - return retcode; - } - - return 0; -} - -#endif /* HAVE_LIBSDL */ diff --git a/libs/SDL/Makefile b/libs/SDL/Makefile deleted file mode 100644 index 637277c..0000000 --- a/libs/SDL/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -TOPDIR=../.. -CSOURCES=$(shell ls *.c) -INCLUDE=core -LIBNAME=SDL -BUILDLIB=yes - -include $(TOPDIR)/pre.mk -include $(TOPDIR)/lib.mk -include $(TOPDIR)/post.mk diff --git a/libs/backends/GP_SDL.c b/libs/backends/GP_SDL.c index 2602a2d..0faff30 100644 --- a/libs/backends/GP_SDL.c +++ b/libs/backends/GP_SDL.c @@ -33,6 +33,8 @@ #include "GP_Backend.h" #include "GP_SDL.h" +#include "GP_SDL_Context.h" + #include <SDL/SDL.h> #include <SDL/SDL_mutex.h> @@ -97,7 +99,7 @@ static void sdl_wait(struct GP_Backend *self __attribute__((unused))) SDL_mutexV(mutex); } -int context_from_surface(GP_Context *context, SDL_Surface *surf) +static int context_from_surface(GP_Context *context, const SDL_Surface *surf) { /* sanity checks on the SDL surface */ if (surf->format->BytesPerPixel == 0) { @@ -130,6 +132,11 @@ int context_from_surface(GP_Context *context, SDL_Surface *surf) return 0; } +int GP_ContextFromSurface(GP_Context *c, const SDL_Surface *surf) +{ + return context_from_surface(c, surf); +} + static int sdl_set_attributes(struct GP_Backend *self __attribute__((unused)), uint32_t w, uint32_t h, const char *caption) ----------------------------------------------------------------------- Summary of changes: demos/c_simple/Makefile | 15 +++- .../GP_SDL_Context.c => demos/c_simple/SDL_glue.c | 104 ++++++++++++++----- demos/spiv/spiv.c | 55 ++++++++++- doc/backends.txt | 44 ++++++-- doc/example_SDL_glue.txt | 10 ++ include/SDL/GP_SDL.h | 46 -------- include/SDL/GP_SDL_Context.h | 33 ------ include/SDL/GP_SDL_VideoInit.h | 34 ------ include/SDL/README | 2 - .../common.h => include/backends/GP_SDL_Context.h | 29 ++++- libs/Makefile | 2 +- libs/SDL/GP_SDL_VideoInit.c | 109 -------------------- libs/SDL/Makefile | 9 -- libs/backends/GP_BackendInit.c | 8 +- libs/backends/GP_SDL.c | 9 ++- 15 files changed, 225 insertions(+), 284 deletions(-) rename libs/SDL/GP_SDL_Context.c => demos/c_simple/SDL_glue.c (56%) create mode 100644 doc/example_SDL_glue.txt delete mode 100644 include/SDL/GP_SDL.h delete mode 100644 include/SDL/GP_SDL_Context.h delete mode 100644 include/SDL/GP_SDL_VideoInit.h delete mode 100644 include/SDL/README copy tests/gfx/common.h => include/backends/GP_SDL_Context.h (73%) delete mode 100644 libs/SDL/GP_SDL_VideoInit.c delete mode 100644 libs/SDL/Makefile 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: ec2f0bf1e1633bd1b8e4eae76f6c99b4ffe067a5
by metan 02 Dec '12

02 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 ec2f0bf1e1633bd1b8e4eae76f6c99b4ffe067a5 (commit) via fcfd8c99cab2abf5d47b8879f3f12832f365cd1a (commit) from 4e80095b3f5f7da3d999465f8989979a9c2e7595 (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/ec2f0bf1e1633bd1b8e4eae76f6c99b4ffe0… commit ec2f0bf1e1633bd1b8e4eae76f6c99b4ffe067a5 Merge: 4e80095 fcfd8c9 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun Dec 2 16:05:08 2012 +0100 Merge 192.168.1.100:Devel/gfxprim http://repo.or.cz/w/gfxprim.git/commit/fcfd8c99cab2abf5d47b8879f3f12832f365… commit fcfd8c99cab2abf5d47b8879f3f12832f365cd1a Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun Dec 2 17:43:20 2012 +0100 Fix "X Window Close Button" This adds partially hacky support for WM_WINDOW_DELETE event. More cleaner solution will need a little change in the current API and will be added later. diff --git a/libs/backends/GP_X11.c b/libs/backends/GP_X11.c index 8e08476..dbe3fc8 100644 --- a/libs/backends/GP_X11.c +++ b/libs/backends/GP_X11.c @@ -442,7 +442,7 @@ void create_window(struct x11_priv *x11, int x, int y, XMapWindow(x11->dpy, x11->win); return; } - + GP_DEBUG(2, "Opening window '%s' %ix%i-%ux%u", caption, x, y, *w, *h); @@ -453,6 +453,17 @@ void create_window(struct x11_priv *x11, int x, int y, /* Set window caption */ XmbSetWMProperties(x11->dpy, x11->win, caption, caption, NULL, 0, NULL, NULL, NULL); + + /* Make the window close button send event */ + Atom xa = XInternAtom(x11->dpy, "WM_DELETE_WINDOW", True); + + if (xa != None) { + GP_DEBUG(2, "Setting WM_DELETE_WINWOW Atom to True"); + + XSetWMProtocols(x11->dpy, x11->win, &xa, 1); + } else { + GP_DEBUG(2, "Failed to set WM_DELETE_WINDOW Atom to True"); + } /* Show window */ XMapWindow(x11->dpy, x11->win); diff --git a/libs/input/GP_InputDriverX11.c b/libs/input/GP_InputDriverX11.c index 5caae39..cbfb0c9 100644 --- a/libs/input/GP_InputDriverX11.c +++ b/libs/input/GP_InputDriverX11.c @@ -123,6 +123,19 @@ void GP_InputDriverX11EventPut(XEvent *ev) GP_EventPushKey(key, press, NULL); break; + /* events from WM */ + case ClientMessage: + //TODO: We know we get WM_DELETE_WINDOW because it's the only + // event we requested to get but we must check anyway + GP_EventPush(GP_EV_SYS, GP_EV_SYS_QUIT, 0, NULL); +#if 0 + switch (ev->xclient.message_type) { + default: + GP_WARN("Unknown X11 ClientMessage Atom %i", + ev->xclient.message_type); + } +#endif + break; default: GP_WARN("Unhandled X11 event type %u", ev->type); } ----------------------------------------------------------------------- Summary of changes: libs/backends/GP_X11.c | 13 ++++++++++++- libs/input/GP_InputDriverX11.c | 13 +++++++++++++ 2 files changed, 25 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: 4e80095b3f5f7da3d999465f8989979a9c2e7595
by metan 30 Nov '12

30 Nov '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 4e80095b3f5f7da3d999465f8989979a9c2e7595 (commit) from ddf52c30001a3cdb93d0e6fda47e26648460e68e (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/4e80095b3f5f7da3d999465f8989979a9c2e… commit 4e80095b3f5f7da3d999465f8989979a9c2e7595 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Fri Nov 30 13:21:27 2012 +0100 gfx: Fix GP_Polygon.c compilation. Add _ISOC99_SOURCE so that fminf() fmaxf() and HUGE_VALF are exported even on older glibc. diff --git a/libs/gfx/GP_Polygon.c b/libs/gfx/GP_Polygon.c index 4bc9480..f2ea9cd 100644 --- a/libs/gfx/GP_Polygon.c +++ b/libs/gfx/GP_Polygon.c @@ -1,3 +1,28 @@ +/***************************************************************************** + * 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) 2012 Jiri Dluhos <jiri.bluebear.dluhos(a)gmail.com> * + * Copyright (C) 2012 Cyril Hrubis <metan(a)ucw.cz> * + * * + *****************************************************************************/ + +#define _ISOC99_SOURCE + #include <stdlib.h> #include <stdio.h> #include <math.h> ----------------------------------------------------------------------- Summary of changes: libs/gfx/GP_Polygon.c | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 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: ddf52c30001a3cdb93d0e6fda47e26648460e68e
by metan 26 Nov '12

26 Nov '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 ddf52c30001a3cdb93d0e6fda47e26648460e68e (commit) from 0965cb83090cad3e3f2785558f17dac09f8b2b55 (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/ddf52c30001a3cdb93d0e6fda47e26648460… commit ddf52c30001a3cdb93d0e6fda47e26648460e68e Author: Cyril Hrubis <metan(a)ucw.cz> Date: Mon Nov 26 00:56:11 2012 +0100 Add README. diff --git a/README b/README new file mode 100644 index 0000000..ecff295 --- /dev/null +++ b/README @@ -0,0 +1,4 @@ +GFXprim is Open-source modular 2D bitmap graphics library with emphasis on +speed and correctness. + +See http://gfxprim.ucw.cz for details. ----------------------------------------------------------------------- Summary of changes: README | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) create mode 100644 README 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: 0965cb83090cad3e3f2785558f17dac09f8b2b55
by metan 25 Nov '12

25 Nov '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 0965cb83090cad3e3f2785558f17dac09f8b2b55 (commit) from e34e0ac5d46c12c6e2a3e7f14bb27138fb005e1f (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/0965cb83090cad3e3f2785558f17dac09f8b… commit 0965cb83090cad3e3f2785558f17dac09f8b2b55 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Mon Nov 26 00:46:08 2012 +0100 gfx: Fix 'no newline at the end of the file'. diff --git a/libs/gfx/GP_Polygon.c b/libs/gfx/GP_Polygon.c index c1d2288..4bc9480 100644 --- a/libs/gfx/GP_Polygon.c +++ b/libs/gfx/GP_Polygon.c @@ -121,4 +121,4 @@ void GP_FillPolygon_Raw(GP_Context *context, int vertex_count, GP_HLine_Raw(context, intersections[i], intersections[i + 1], y, pixel); } } -} No newline at end of file +} ----------------------------------------------------------------------- Summary of changes: libs/gfx/GP_Polygon.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: e34e0ac5d46c12c6e2a3e7f14bb27138fb005e1f
by bluebear 25 Nov '12

25 Nov '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 e34e0ac5d46c12c6e2a3e7f14bb27138fb005e1f (commit) via c438a7976238a10cd9562cbf28580f0c05b1529f (commit) from 4128a845f099a7902414cfe3314a61bcff9b60c8 (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/e34e0ac5d46c12c6e2a3e7f14bb27138fb00… commit e34e0ac5d46c12c6e2a3e7f14bb27138fb005e1f Merge: c438a79 4128a84 Author: Jiri BlueBear Dluhos <jiri.bluebear.dluhos(a)gmail.com> Date: Sun Nov 25 23:03:22 2012 +0100 Merge branch 'master' of git://repo.or.cz/gfxprim http://repo.or.cz/w/gfxprim.git/commit/c438a7976238a10cd9562cbf28580f0c05b1… commit c438a7976238a10cd9562cbf28580f0c05b1529f Author: Jiri BlueBear Dluhos <jiri.bluebear.dluhos(a)gmail.com> Date: Sun Nov 25 22:59:33 2012 +0100 Finished initial implementation of generic polygon. diff --git a/demos/c_simple/randomshapetest.c b/demos/c_simple/randomshapetest.c index b699348..19fcae4 100644 --- a/demos/c_simple/randomshapetest.c +++ b/demos/c_simple/randomshapetest.c @@ -42,9 +42,10 @@ static int pause_flag = 0; #define SHAPE_ELLIPSE 2 #define SHAPE_TRIANGLE 3 #define SHAPE_RECTANGLE 4 -#define SHAPE_TETRAGON 5 -#define SHAPE_RECTANGLE_AA 6 -#define SHAPE_LAST 6 +#define SHAPE_TETRAGON 5 +#define SHAPE_POLYGON 6 +#define SHAPE_RECTANGLE_AA 7 +#define SHAPE_LAST 7 static int shape = SHAPE_FIRST; /* Draw outlines? */ @@ -142,6 +143,18 @@ void draw_random_tetragon(GP_Pixel pixel) GP_Tetragon(win->context, x0, y0, x1, y1, x2, y2, x3, y3, pixel); } +void draw_random_polygon(GP_Pixel pixel) +{ + GP_Coord xy[10]; + int i; + + for (i = 0; i < 5; i++) { + random_point(win->context, xy + 2*i, xy + 2*i + 1); + } + + GP_FillPolygon_Raw(win->context, 5, xy, pixel); +} + void draw_random_rectangle_AA(GP_Pixel pixel) { int x0, y0, x1, y1; @@ -188,6 +201,9 @@ void redraw_screen(void) case SHAPE_TETRAGON: draw_random_tetragon(pixel); break; + case SHAPE_POLYGON: + draw_random_polygon(pixel); + break; case SHAPE_RECTANGLE_AA: draw_random_rectangle_AA(pixel); break; @@ -203,7 +219,7 @@ void event_loop(void) case GP_EV_KEY: if (ev.code != GP_EV_KEY_DOWN) continue; - + switch (ev.val.key.key) { case GP_KEY_SPACE: shape++; @@ -243,7 +259,7 @@ void event_loop(void) int main(void) { const char *backend_opts = "X11"; - + win = GP_BackendInit(backend_opts, "Random Shape Test", stderr); if (win == NULL) { @@ -251,14 +267,14 @@ int main(void) backend_opts); return 1; } - + white = GP_ColorToContextPixel(GP_COL_WHITE, win->context); black = GP_ColorToContextPixel(GP_COL_BLACK, win->context); - + for (;;) { GP_BackendPoll(win); event_loop(); - + usleep(20000); if (pause_flag) diff --git a/libs/gfx/GP_Polygon.c b/libs/gfx/GP_Polygon.c index 328e7fa..c1d2288 100644 --- a/libs/gfx/GP_Polygon.c +++ b/libs/gfx/GP_Polygon.c @@ -1,193 +1,124 @@ -/***************************************************************************** - * 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-2011 Jiri "BlueBear" Dluhos * - * <jiri.bluebear.dluhos(a)gmail.com> * - * * - * Copyright (C) 2009-2012 Cyril Hrubis <metan(a)ucw.cz> * - * * - *****************************************************************************/ - -#include "gfx/GP_Polygon.h" -#include "gfx/GP_HLine.h" - -#include <limits.h> #include <stdlib.h> +#include <stdio.h> +#include <math.h> -struct GP_PolygonEdge { - GP_Coord startx, starty; - GP_Coord endx, endy; - GP_Coord dx, dy; -}; +#include "GP_HLine.h" +#include "GP_Polygon.h" -struct GP_Polygon { - struct GP_PolygonEdge *edges; - GP_Coord edge_count; - GP_Coord ymin, ymax; +/* 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) */ }; -#define GP_POLYGON_INITIALIZER { - .edges = NULL, - .edge_count = 0, - .ymin = INT_MAX, - .ymax = 0 -} +/* Threshod value for delta y; edges with dy smaller than this are considered horizontal. */ +const float GP_HORIZ_DY_THRESHOLD = 0.00001f; -static void GP_InitEdge(struct GP_PolygonEdge *edge, - GP_Coord x1, GP_Coord y1, GP_Coord x2, GP_Coord y2) +/* Initializes the polygon_edge structure. */ +static void GP_InitEdge(struct GP_PolygonEdge *edge, float x1, float y1, + float x2, float y2) { - if (y1 < y2) { /* coords are top-down, correct */ - edge->startx = x1; - edge->starty = y1; - edge->endx = x2; - edge->endy = y2; - } else { /* coords are bottom-up, flip them */ - edge->startx = x2; - edge->starty = y2; - edge->endx = x1; - edge->endy = y1; + 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; } - edge->dx = edge->endx - edge->startx; - edge->dy = edge->endy - edge->starty; + float dx = (edge->x2 - edge->x1); + float dy = (edge->y2 - edge->y1); + edge->dx_by_dy = dx / dy; } -static void GP_AddEdge(struct GP_Polygon *poly, GP_Coord x1, GP_Coord y1, - GP_Coord x2, GP_Coord y2) +/* 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. + */ +static int GP_ComputeIntersection(float *result_x, struct GP_PolygonEdge *edge, float y) { - struct GP_PolygonEdge *edge = poly->edges + poly->edge_count; - - poly->edge_count++; + if (y<edge->ymin || y>edge->ymax) + return 0; /* outside the edge Y range */ + + if (edge->ymax - edge->ymin < GP_HORIZ_DY_THRESHOLD) + return 0; /* ignore horizontal edges */ - GP_InitEdge(edge, x1, y1, x2, y2); + *result_x = edge->x1 + (y-edge->y1)*edge->dx_by_dy; - poly->ymin = GP_MIN(poly->ymin, edge->starty); - poly->ymax = GP_MAX(poly->ymax, edge->endy); + return 1; } -static int GP_CompareEdges(const void *edge1, const void *edge2) +/* Sorting callback. Compares two floats and returns -1 if A<B, + * +1 if A>B, 0 if they are equal. + */ +static int GP_CompareFloats(const void *ptr_a, const void *ptr_b) { - struct GP_PolygonEdge *e1 = (struct GP_PolygonEdge *) edge1; - struct GP_PolygonEdge *e2 = (struct GP_PolygonEdge *) edge2; - - if (e1->starty > e2->starty) - return 1; - if (e1->starty > e2->starty) - return -1; - - if (e1->startx > e2->startx) - return 1; - if (e1->startx < e2->startx) - return -1; + float a = ((float *) ptr_a)[0]; + float b = ((float *) ptr_b)[0]; + if (a < b) return -1; + if (a > b) return 1; return 0; } -static void GP_LoadPolygon(struct GP_Polygon *poly, GP_Coord vertex_count, - const GP_Coord *xy) +/* 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) { - poly->edge_count = 0; - poly->edges = calloc(sizeof(struct GP_PolygonEdge), - vertex_count); + unsigned int edge_index = 0; + int result_index = 0; - GP_Coord i; - GP_Coord coord_count = 2*vertex_count - 2; - for (i = 0; i < coord_count; i+=2) { + for (; edge_index<count; edge_index++) { - /* add the edge, unless it is horizontal */ - if (xy[i+1] != xy[i+3]) { - GP_AddEdge(poly, xy[i], xy[i+1], xy[i+2], xy[i+3]); + struct GP_PolygonEdge *edge = edges + edge_index; + float x; + + if (GP_ComputeIntersection(&x, edge, y)) { + results[result_index++] = x; } } - /* add the closing edge, unless it is horizontal */ - if (xy[1] != xy[i+1]) { - GP_AddEdge(poly, xy[i], xy[i+1], xy[0], xy[1]); - } + qsort(results, result_index, sizeof(float), GP_CompareFloats); - /* sort edges */ - qsort(poly->edges, poly->edge_count, sizeof(struct GP_PolygonEdge), - GP_CompareEdges); + return result_index; } -static void GP_ResetPolygon(struct GP_Polygon *poly) +void GP_FillPolygon_Raw(GP_Context *context, int vertex_count, + const GP_Coord *xy, GP_Pixel pixel) { - free(poly->edges); - poly->edges = NULL; - poly->edge_count = 0; - poly->ymin = INT_MAX; - poly->ymax = 0; -} - -/* - * Finds an X coordinate of an GP_Coordersection of the edge - * with the given Y line. - */ -static inline GP_Coord GP_FindIntersection(GP_Coord y, const struct GP_PolygonEdge *edge) -{ - GP_Coord edge_y = y - edge->starty; /* Y relative to the edge */ - GP_Coord x = edge->startx; - - if (edge->dx > 0) { - while (edge->startx*edge->dy + edge_y*edge->dx > x*edge->dy) - x++; - } else { - while (edge->startx*edge->dy + edge_y*edge->dx < x*edge->dy) - x--; + float ymin = HUGE_VALF, ymax = -HUGE_VALF; + struct GP_PolygonEdge *edge; + struct GP_PolygonEdge edges[vertex_count]; + + int i; + for (i = 0; i < vertex_count - 1; i++) { + edge = edges + i; + GP_InitEdge(edge, xy[2*i], xy[2*i + 1], + xy[2*i + 2], xy[2*i + 3]); + ymin = fminf(ymin, edge->ymin); + ymax = fmaxf(ymax, edge->ymax); } - return x; -} - -void GP_FillPolygon_Raw(GP_Context *context, GP_Coord vertex_count, - const GP_Coord *xy, GP_Pixel pixel) -{ - struct GP_Polygon poly = GP_POLYGON_INITIALIZER; - - GP_LoadPolygon(&poly, vertex_count, xy); - - GP_Coord y, startx, endx; - - for (y = poly.ymin; y <= poly.ymax; y++) { - startx = INT_MAX; - endx = 0; + /* the last edge (from the last point to the first one) */ + edge = edges + vertex_count - 1; + GP_InitEdge(edge, xy[2*i], xy[2*i + 1], xy[0], xy[1]); - GP_Coord i; - for (i = 0; i < poly.edge_count; i++) { - struct GP_PolygonEdge *edge = poly.edges + i; - - if (y < edge->starty || y > edge->endy) - continue; - - GP_Coord GP_Coorder = GP_FindIntersection(y, edge); - - startx = GP_MIN(startx, GP_Coorder); - endx = GP_MAX(endx, GP_Coorder); - - if (y != edge->endy) { - GP_Coorder = GP_FindIntersection(y + 1, edge); - startx = GP_MIN(startx, GP_Coorder); - endx = GP_MAX(endx, GP_Coorder); - } + 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); + for (i = 0; i < inter_count; i+=2) { + GP_HLine_Raw(context, intersections[i], intersections[i + 1], y, pixel); } - - GP_HLine_Raw(context, startx, endx, y, pixel); } - - GP_ResetPolygon(&poly); -} +} No newline at end of file ----------------------------------------------------------------------- Summary of changes: demos/c_simple/randomshapetest.c | 32 ++++-- libs/gfx/GP_Polygon.c | 245 ++++++++++++++------------------------ 2 files changed, 112 insertions(+), 165 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