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 790d61419cab392ce0c0b2468bf43f2c554c666b (commit) via 853705c02b23d77e8d9c973224e66d59ab4637d9 (commit) via 0efc7277bb74f43e38de741c7af24174f45b8820 (commit) from 263af6f5f591eda466248479aade49b8c3b27f29 (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/790d61419cab392ce0c0b2468bf43f2c554c6... commit 790d61419cab392ce0c0b2468bf43f2c554c666b Author: Cyril Hrubis <metan@ucw.cz> Date: Sat May 12 14:18:25 2012 +0200 doc: Add gfx example. diff --git a/doc/examples.txt b/doc/examples.txt index 053b3c6..5c426f0 100644 --- a/doc/examples.txt +++ b/doc/examples.txt @@ -31,6 +31,20 @@ Example in Python include::../demos/py_simple/loaders_example.py[] ------------------------------------------------------------------ +GFX Examples +------------ + +Drawing Lines +~~~~~~~~~~~~~ + +Example in C +^^^^^^^^^^^^ + +[source,c] +------------------------------------------------------------------ +include::../demos/c_simple/gfx_koch.c[] +------------------------------------------------------------------ + Filters ------- http://repo.or.cz/w/gfxprim.git/commit/853705c02b23d77e8d9c973224e66d59ab463... commit 853705c02b23d77e8d9c973224e66d59ab4637d9 Author: Cyril Hrubis <metan@ucw.cz> Date: Sat May 12 14:17:14 2012 +0200 examples: Fix loaders return value. diff --git a/demos/c_simple/loaders.c b/demos/c_simple/loaders.c index 1446d52..8239b90 100644 --- a/demos/c_simple/loaders.c +++ b/demos/c_simple/loaders.c @@ -60,7 +60,7 @@ int main(int argc, char *argv[]) if (argc != 2) { fprintf(stderr, "Takes an image as an parametern"); - return 0; + return 1; } priv.op = "Loading"; diff --git a/demos/c_simple/loaders_example.c b/demos/c_simple/loaders_example.c index ab0b5b4..76ffe07 100644 --- a/demos/c_simple/loaders_example.c +++ b/demos/c_simple/loaders_example.c @@ -41,7 +41,7 @@ int main(int argc, char *argv[]) if (argc != 2) { fprintf(stderr, "Takes an image as an parametern"); - return 0; + return 1; } img = GP_LoadImage(argv[1], NULL); http://repo.or.cz/w/gfxprim.git/commit/0efc7277bb74f43e38de741c7af24174f45b8... commit 0efc7277bb74f43e38de741c7af24174f45b8820 Author: Cyril Hrubis <metan@ucw.cz> Date: Sat May 12 14:04:44 2012 +0200 examples: Add simple gfx C example. diff --git a/demos/c_simple/Makefile b/demos/c_simple/Makefile index de507b3..323ae99 100644 --- a/demos/c_simple/Makefile +++ b/demos/c_simple/Makefile @@ -5,7 +5,7 @@ CSOURCES=$(shell echo *.c) INCLUDE= LDLIBS+=-lGP -lGP_backends -lSDL -L$(TOPDIR)/build/ -APPS=backend_example loaders_example loaders filters_symmetry +APPS=backend_example loaders_example loaders filters_symmetry gfx_koch include $(TOPDIR)/pre.mk include $(TOPDIR)/app.mk diff --git a/demos/c_simple/gfx_koch.c b/demos/c_simple/gfx_koch.c new file mode 100644 index 0000000..dda5e80 --- /dev/null +++ b/demos/c_simple/gfx_koch.c @@ -0,0 +1,135 @@ +/***************************************************************************** + * 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@ucw.cz> * + * * + *****************************************************************************/ + + /* + + Simple GFX Example. + + */ + +#include <stdio.h> +#include <string.h> +#include <errno.h> + +#include <GP.h> + +/* Set to 1 to use Anti Aliased drawing */ +static int aa_flag = 0; + +/* + * Generate color depending on distance from center + * + * We could do this only and only because the context + * pixel type is fixed to GP_PIXEL_RGB888. + */ +static GP_Pixel do_color(int xc, int yc, float x, float y) +{ + float dx = GP_ABS(1.00 * xc - x)/(2*xc); + float dy = GP_ABS(1.00 * yc - y)/(2*yc); + + float dc = sqrt(dx*dx + dy*dy); + + int rmask = 0; + int gmask = 0xff * sqrt(dc); + int bmask = 0xff * (1 - dc); + + if (dc < 0.1) { + rmask = 0xff * (1 - dc); + bmask = 0x00; + } + + if (dc > 0.55) { + rmask = 0xff * dc; + gmask /= 6; + bmask = 0x00; + } + + return bmask | (gmask<<8) | (rmask << 16); +} + +static void draw(GP_Context *img, int level, float x0, float y0, float x1, float y1) +{ + if (level == 0) { + GP_Pixel pixel; + + pixel = do_color(img->w/2, img->h/2, 1.00 * (x0+x1)/2, 1.00 * (y0 + y1)/2); + + if (aa_flag) + GP_LineAA(img, x0 * 256, y0 * 256, x1 * 256, y1 * 256, pixel); + else + GP_Line(img, x0, y0, x1, y1, pixel); + + return; + } + + /* Compute varation of Koch curve */ + float x34 = (x0 + 3 * x1) / 4; + float y34 = (y0 + 3 * y1) / 4; + + float x14 = (3 * x0 + x1) / 4; + float y14 = (3 * y0 + y1) / 4; + + float x12 = (x0 + x1)/2; + float y12 = (y0 + y1)/2; + + float dx = (x1 - x0)/4; + float dy = (y1 - y0)/4; + + draw(img, level - 1, x0, y0, x14, y14); + draw(img, level - 1, x14, y14, x14 - dy, y14 + dx); + draw(img, level - 1, x14 - dy, y14 + dx, x12 - dy, y12 + dx); + draw(img, level - 1, x12 - dy, y12 + dx, x12, y12); + draw(img, level - 1, x12, y12, x12 + dy, y12 - dx); + draw(img, level - 1, x12 + dy, y12 - dx, x34 + dy, y34 - dx); + draw(img, level - 1, x34 + dy, y34 - dx, x34, y34); + draw(img, level - 1, x1, y1, x34, y34); +} + +int main(void) +{ + GP_Context *img; + + /* Create RGB 24 bit image */ + img = GP_ContextAlloc(600, 600, GP_PIXEL_RGB888); + + if (img == NULL) { + fprintf(stderr, "Failed to allocate context"); + return 1; + } + + /* Clean up the bitmap */ + GP_Fill(img, 0); + + /* Draw a fractal */ + draw(img, 4, 0, 0, img->w - 1, img->h - 1); + draw(img, 4, 0, img->h - 1, img->w - 1, 0); + + if (GP_SavePNG(img, "out.png", NULL)) { + fprintf(stderr, "Failed to save image %s", strerror(errno)); + return 1; + } + + /* Cleanup */ + GP_ContextFree(img); + + return 0; +} ----------------------------------------------------------------------- Summary of changes: demos/c_simple/Makefile | 2 +- demos/c_simple/gfx_koch.c | 135 ++++++++++++++++++++++++++++++++++++++ demos/c_simple/loaders.c | 2 +- demos/c_simple/loaders_example.c | 2 +- doc/examples.txt | 14 ++++ 5 files changed, 152 insertions(+), 3 deletions(-) create mode 100644 demos/c_simple/gfx_koch.c repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos@gmail.com if you want to unsubscribe, or site admin admin@repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")