May 2011 - Gfxprim

[repo.or.cz] gfxprim.git branch master updated: c3b33c14d2263d443554d1b3ac5f43430e148698
by bluebear 09 May '11

09 May '11

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 c3b33c14d2263d443554d1b3ac5f43430e148698 (commit) from 6722436c25bf3899cc2c3c2b44ed0382e04a7fff (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/c3b33c14d2263d443554d1b3ac5f43430e14… commit c3b33c14d2263d443554d1b3ac5f43430e148698 Author: BlueBear <jiri.bluebear.dluhos(a)gmail.com> Date: Mon May 9 00:27:21 2011 +0200 First attempt on transparent backends. diff --git a/core/GP.h b/core/GP.h index 8254d49..77ba1b0 100644 --- a/core/GP.h +++ b/core/GP.h @@ -65,4 +65,7 @@ #include "GP_TextMetric.h" #include "GP_Text.h" +/* backends */ +#include "GP_Backend.h" + #endif /* GP_H */ diff --git a/core/GP.h b/core/GP_Backend.c similarity index 65% copy from core/GP.h copy to core/GP_Backend.c index 8254d49..f1cbce5 100644 --- a/core/GP.h +++ b/core/GP_Backend.c @@ -23,46 +23,56 @@ * * *****************************************************************************/ -#ifndef GP_H -#define GP_H +#include "GP.h" +#include "config.h" -#include <stdint.h> +#include <string.h> -/* basic definitions and structures */ -#include "GP_Common.h" -#include "GP_Transform.h" -#include "GP_Context.h" +/* The current backend. */ +static struct GP_Backend *current_backend = NULL; -/* semi-public, low-level drawing API */ -#include "GP_WritePixel.h" +#ifdef GP_HAVE_SDL -/* colors */ -#include "GP_Color.h" -#include "GP_Palette.h" +extern struct GP_Backend GP_SDL_backend; -/* public drawing API */ -#include "GP_Fill.h" -#include "GP_GetPixel.h" -#include "GP_PutPixel.h" -#include "GP_HLine.h" -#include "GP_VLine.h" -#include "GP_Line.h" -#include "GP_LineTrack.h" -#include "GP_Rect.h" -#include "GP_FillRect.h" -#include "GP_Triangle.h" -#include "GP_Tetragon.h" -#include "GP_Circle.h" -#include "GP_FillCircle.h" -#include "GP_Ellipse.h" -#include "GP_FillEllipse.h" -#include "GP_Polygon.h" -#include "GP_Symbol.h" +#endif -/* fonts */ -#include "GP_Font.h" -#include "GP_TextStyle.h" -#include "GP_TextMetric.h" -#include "GP_Text.h" +struct GP_Backend *GP_InitBackend(const char *name) +{ + if (current_backend) + return current_backend; -#endif /* GP_H */ +#ifdef GP_HAVE_SDL + + if (!name || strcasecmp(name, "sdl") == 0) { + current_backend = GP_SDL_backend.init_fn(); + return current_backend; + } + +#endif + + return NULL; +} + +struct GP_Backend *GP_GetCurrentBackend(void) +{ + return current_backend; +} + +GP_Context *GP_OpenBackendVideo(int w, int h, int flags) +{ + GP_CHECK(current_backend, "no current backend"); + return current_backend->open_video_fn(w, h, flags); +} + +struct GP_Context *GP_GetBackendVideoContext(void) +{ + GP_CHECK(current_backend, "no current backend"); + return current_backend->video_context_fn(); +} + +void GP_UpdateBackendVideo(void) +{ + GP_CHECK(current_backend, "no current backend"); + return current_backend->update_video_fn(); +} diff --git a/core/GP.h b/core/GP_Backend.h similarity index 64% copy from core/GP.h copy to core/GP_Backend.h index 8254d49..afe7f67 100644 --- a/core/GP.h +++ b/core/GP_Backend.h @@ -23,46 +23,46 @@ * * *****************************************************************************/ -#ifndef GP_H -#define GP_H +#ifndef GP_BACKEND_H +#define GP_BACKEND_H -#include <stdint.h> - -/* basic definitions and structures */ -#include "GP_Common.h" -#include "GP_Transform.h" #include "GP_Context.h" -/* semi-public, low-level drawing API */ -#include "GP_WritePixel.h" +struct GP_Backend { + const char *name; + struct GP_Backend *(*init_fn)(void); + void (*shutdown_fn)(void); + GP_Context *(*open_video_fn)(int w, int h, int flags); + GP_Context *(*video_context_fn)(void); + void (*update_video_fn)(void); +}; + +/* + * Attempts to initialize a backend. + * + * If name is specified, only that backend is tried; if name is NULL, + * all known backends are tried and the first usable is picked. + * + * Returns the backend structure, or NULL on failure. + */ +struct GP_Backend *GP_InitBackend(const char *name); -/* colors */ -#include "GP_Color.h" -#include "GP_Palette.h" +/* + * Opens the backend video and returns its context. + */ +GP_Context *GP_OpenBackendVideo(int w, int h, int flags); -/* public drawing API */ -#include "GP_Fill.h" -#include "GP_GetPixel.h" -#include "GP_PutPixel.h" -#include "GP_HLine.h" -#include "GP_VLine.h" -#include "GP_Line.h" -#include "GP_LineTrack.h" -#include "GP_Rect.h" -#include "GP_FillRect.h" -#include "GP_Triangle.h" -#include "GP_Tetragon.h" -#include "GP_Circle.h" -#include "GP_FillCircle.h" -#include "GP_Ellipse.h" -#include "GP_FillEllipse.h" -#include "GP_Polygon.h" -#include "GP_Symbol.h" +/* + * Returns a pointer to context that represents the backend's video. + */ +GP_Context *GP_GetBackendVideoContext(void); -/* fonts */ -#include "GP_Font.h" -#include "GP_TextStyle.h" -#include "GP_TextMetric.h" -#include "GP_Text.h" +/* + * Calls the backend to update its video to reflect new changes. + * If the backend uses double buffering, this causes a buffer flip. + * If the backend uses direct-to-screen drawing, this call + * has no effect. + */ +void GP_UpdateBackendVideo(void); -#endif /* GP_H */ +#endif diff --git a/core/GP_Backend_SDL.c b/core/GP_Backend_SDL.c new file mode 100644 index 0000000..17a3d20 --- /dev/null +++ b/core/GP_Backend_SDL.c @@ -0,0 +1,211 @@ +/***************************************************************************** + * 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> * + * * + *****************************************************************************/ + +#include "GP.h" +#include "config.h" + +#ifdef GP_HAVE_SDL + +#include <dlfcn.h> +#include <SDL/SDL.h> + +struct GP_Backend GP_SDL_backend; + +/* + * Checks whether pixel color component masks in the given surface are equal + * to specified. Returns nonzero if they match, zero otherwise. + */ +static int GP_SDL_CheckPixelMasks(SDL_Surface *surf, unsigned int rmask, + unsigned int gmask, unsigned int bmask, unsigned int amask) +{ + return (surf->format->Rmask == rmask + && surf->format->Gmask == gmask + && surf->format->Bmask == bmask + && surf->format->Ashift == amask); +} + +/* + * Detects the pixel type of the SDL surface. + * Returns the pixel type, or GP_PIXEL_UNKNOWN if the type was not recognized. + */ +static enum GP_PixelType GP_SDL_FindSurfacePixelType(SDL_Surface *surf) +{ + switch (surf->format->BytesPerPixel) { + case 1: + if (GP_SDL_CheckPixelMasks(surf, 0, 0, 0, 0)) { + return GP_PIXEL_PAL8; + } + break; + case 2: + if (GP_SDL_CheckPixelMasks(surf, 0x7c00, 0x03e0, 0x001f, 0)) { + return GP_PIXEL_RGB555; + } + if (GP_SDL_CheckPixelMasks(surf, 0xf800, 0x07e0, 0x001f, 0)) { + return GP_PIXEL_RGB565; + } + break; + case 3: + if (GP_SDL_CheckPixelMasks(surf, 0xff0000, 0xff00, 0xff, 0)) { + return GP_PIXEL_RGB888; + } + if (GP_SDL_CheckPixelMasks(surf, 0xff, 0xff00, 0xff0000, 0)) { + return GP_PIXEL_BGR888; + } + break; + case 4: + if (GP_SDL_CheckPixelMasks(surf, 0xff0000, 0xff00, 0xff, 0)) { + return GP_PIXEL_XRGB8888; + } + if (GP_SDL_CheckPixelMasks(surf, 0xff, 0xff00, 0xff0000, 0)) { + return GP_PIXEL_XBGR8888; + } + if (GP_SDL_CheckPixelMasks(surf, 0xff000000, 0xff0000, 0xff00, 0)) { + return GP_PIXEL_RGBX8888; + } + if (GP_SDL_CheckPixelMasks(surf, 0xff00, 0xff0000, 0xff000000, 0)) { + return GP_PIXEL_BGRX8888; + } + if (GP_SDL_CheckPixelMasks(surf, 0xff0000, 0xff00, 0xff, 0xff000000)) { + return GP_PIXEL_ARGB8888; + } + if (GP_SDL_CheckPixelMasks(surf, 0xff, 0xff00, 0xff0000, 0xff000000)) { + return GP_PIXEL_ABGR8888; + } + if (GP_SDL_CheckPixelMasks(surf, 0xff000000, 0xff0000, 0xff00, 0xff)) { + return GP_PIXEL_RGBA8888; + } + if (GP_SDL_CheckPixelMasks(surf, 0xff00, 0xff0000, 0xff000000, 0xff)) { + return GP_PIXEL_BGRA8888; + } + break; + + } + return GP_PIXEL_UNKNOWN; +} + +inline GP_RetCode GP_SDL_ContextFromSurface( + GP_Context *context, SDL_Surface *surf) +{ + GP_CHECK(context, "context is NULL"); + GP_CHECK(surf, "surface is NULL"); + + /* sanity checks on the SDL surface */ + if (surf->format->BytesPerPixel == 0 || surf->format->BytesPerPixel > 4) { + return GP_ENOIMPL; + } + enum GP_PixelType pixeltype = GP_SDL_FindSurfacePixelType(surf); + if (pixeltype == GP_PIXEL_UNKNOWN) { + return GP_ENOIMPL; + } + + /* 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; + + /* orientation */ + context->axes_swap = 0; + context->x_swap = 0; + context->y_swap = 0; + + /* clipping */ + context->clip_h_min = surf->clip_rect.y; + context->clip_h_max = surf->clip_rect.y + surf->clip_rect.h - 1; + context->clip_w_min = surf->clip_rect.x; + context->clip_w_max = surf->clip_rect.x + surf->clip_rect.w - 1; + + return GP_ESUCCESS; +} + +static SDL_Surface *GP_SDL_display = NULL; +static GP_Context GP_SDL_context; + +static void (*dyn_SDL_Quit)(void); +static int (*dyn_SDL_Init)(int); +static SDL_Surface *(*dyn_SDL_SetVideoMode)(int, int, int, uint32_t); +static void (*dyn_SDL_UpdateRect)(SDL_Surface *, int, int, int, int); + +static void GP_SDL_ShutdownFn(void) +{ + dyn_SDL_Quit(); +} + +static struct GP_Backend *GP_SDL_InitFn(void) +{ + void *library = dlopen("libSDL.so", RTLD_LAZY); + if (!library) + return NULL; + + dyn_SDL_Init = dlsym(library, "SDL_Init"); + dyn_SDL_Quit = dlsym(library, "SDL_Quit"); + dyn_SDL_UpdateRect = dlsym(library, "SDL_UpdateRect"); + dyn_SDL_SetVideoMode = dlsym(library, "SDL_SetVideoMode"); + + if (dyn_SDL_Init(SDL_INIT_VIDEO|SDL_INIT_TIMER) != 0) + return NULL; + + return &GP_SDL_backend; +} + +static GP_Context *GP_SDL_OpenVideoFn(int w, int h, int flags) +{ + GP_SDL_display = dyn_SDL_SetVideoMode(w, h, 0, + SDL_SWSURFACE|SDL_DOUBLEBUF); + + if (GP_SDL_display == NULL) + return NULL; + + GP_RetCode retcode = GP_SDL_ContextFromSurface( + &GP_SDL_context, GP_SDL_display); + if (retcode != GP_ESUCCESS) + return NULL; + + return &GP_SDL_context; +} + +static GP_Context *GP_SDL_VideoContextFn(void) +{ + return &GP_SDL_context; +} + +static void GP_SDL_UpdateVideoFn(void) +{ + dyn_SDL_UpdateRect(GP_SDL_display, 0, 0, + GP_SDL_display->w, GP_SDL_display->h); +} + +struct GP_Backend GP_SDL_backend = { + "SDL", + GP_SDL_InitFn, + GP_SDL_ShutdownFn, + GP_SDL_OpenVideoFn, + GP_SDL_VideoContextFn, + GP_SDL_UpdateVideoFn +}; + +#endif /* GP_HAVE_SDL */ diff --git a/core/config.h b/core/config.h new file mode 100644 index 0000000..baac35b --- /dev/null +++ b/core/config.h @@ -0,0 +1,3 @@ + +#define GP_HAVE_SDL 1 + ----------------------------------------------------------------------- Summary of changes: core/GP.h | 3 + core/{GP_LineTrack.c => GP_Backend.c} | 80 +++++++------- filters/GP_Rotate.h => core/GP_Backend.h | 46 +++++--- .../sdl/GP_SDL_Context.c => core/GP_Backend_SDL.c | 121 ++++++++++++++++---- core/config.h | 3 + 5 files changed, 173 insertions(+), 80 deletions(-) copy core/{GP_LineTrack.c => GP_Backend.c} (66%) copy filters/GP_Rotate.h => core/GP_Backend.h (65%) copy targets/sdl/GP_SDL_Context.c => core/GP_Backend_SDL.c (56%) create mode 100644 core/config.h 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: 6722436c25bf3899cc2c3c2b44ed0382e04a7fff
by bluebear 08 May '11

08 May '11

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 6722436c25bf3899cc2c3c2b44ed0382e04a7fff (commit) from d5cdf89dd42290ce846e29309879a9263aa9e023 (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/6722436c25bf3899cc2c3c2b44ed0382e04a… commit 6722436c25bf3899cc2c3c2b44ed0382e04a7fff Author: BlueBear <jiri.bluebear.dluhos(a)gmail.com> Date: Sun May 8 20:54:39 2011 +0200 Better sanity checks for text routines. diff --git a/core/GP_Font.h b/core/GP_Font.h index 91ecd3b..0354948 100644 --- a/core/GP_Font.h +++ b/core/GP_Font.h @@ -102,6 +102,13 @@ typedef struct GP_Font { uint8_t *data; } GP_Font; +#define GP_CHECK_FONT(font) do { + GP_CHECK(font->data, "invalid font: NULL font data"); + GP_CHECK(font->height > 0, "invalid font: height == 0"); + GP_CHECK(font->baseline <= font->height, "invalid font: baseline exceeds height"); + GP_CHECK(font->bytes_per_line > 0, "invalid font: bytes_per_line == 0"); +} while(0) + /* Data describing a single character. */ typedef struct GP_CharData { diff --git a/core/GP_Text.c b/core/GP_Text.c index e3bcbb2..f9bc779 100644 --- a/core/GP_Text.c +++ b/core/GP_Text.c @@ -43,9 +43,8 @@ GP_RetCode GP_Text(GP_Context *context, const GP_TextStyle *style, int x, int y, int align, const char *str, GP_Pixel pixel) { GP_CHECK_CONTEXT(context); + GP_CHECK_TEXT_STYLE(style); - if (style != NULL && style->font == NULL) - return GP_ENULLPTR; if (str == NULL) return GP_ENULLPTR; @@ -96,9 +95,8 @@ GP_RetCode GP_TText(GP_Context *context, const GP_TextStyle *style, int x, int y, int align, const char *str, GP_Pixel pixel) { GP_CHECK_CONTEXT(context); + GP_CHECK_TEXT_STYLE(style); - if (style != NULL && style->font == NULL) - return GP_ENULLPTR; if (str == NULL) return GP_ENULLPTR; @@ -147,9 +145,8 @@ GP_RetCode GP_BoxCenteredText(GP_Context *context, const GP_TextStyle *style, int x, int y, int w, int h, const char *str, GP_Pixel pixel) { GP_CHECK_CONTEXT(context); + GP_CHECK_TEXT_STYLE(style); - if (style != NULL && style->font == NULL) - return GP_ENULLPTR; if (str == NULL) return GP_ENULLPTR; @@ -170,9 +167,8 @@ GP_RetCode GP_TBoxCenteredText(GP_Context *context, const GP_TextStyle *style, int x, int y, int w, int h, const char *str, GP_Pixel pixel) { GP_CHECK_CONTEXT(context); + GP_CHECK_TEXT_STYLE(style); - if (style != NULL && style->font == NULL) - return GP_ENULLPTR; if (str == NULL) return GP_ENULLPTR; diff --git a/core/GP_TextStyle.h b/core/GP_TextStyle.h index 8e33eb9..d79a326 100644 --- a/core/GP_TextStyle.h +++ b/core/GP_TextStyle.h @@ -64,7 +64,8 @@ void GP_DefaultTextStyle(GP_TextStyle *style); #define GP_CHECK_TEXT_STYLE(style) do { GP_CHECK(style, "NULL style specified"); - GP_CHECK(style->font, "NULL font specified in style"); + GP_CHECK(style->font, "invalid text style: font is NULL"); + GP_CHECK_FONT(style->font); } while(0) #endif /* GP_TEXTSTYLE_H */ ----------------------------------------------------------------------- Summary of changes: core/GP_Font.h | 7 +++++++ core/GP_Text.c | 12 ++++-------- core/GP_TextStyle.h | 3 ++- 3 files changed, 13 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: d5cdf89dd42290ce846e29309879a9263aa9e023
by bluebear 08 May '11

08 May '11

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 d5cdf89dd42290ce846e29309879a9263aa9e023 (commit) from 037f2ffabeabd1a2522169b7b766333a64680762 (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/d5cdf89dd42290ce846e29309879a9263aa9… commit d5cdf89dd42290ce846e29309879a9263aa9e023 Author: BlueBear <jiri.bluebear.dluhos(a)gmail.com> Date: Sun May 8 17:33:29 2011 +0200 Fixed stupid typo in GP_ASSERT; minor cleanups diff --git a/core/GP_Common.h b/core/GP_Common.h index 24039b6..c6005f8 100644 --- a/core/GP_Common.h +++ b/core/GP_Common.h @@ -50,50 +50,55 @@ }) /* - * Checks the condition and aborts immediately if it is not satisfied, - * printing the condition and location in the source. - * (Intended for checking for bugs within the library itself. - * GP_CHECK is used for reporting user errors, like invalid arguments.) + * The standard likely() and unlikely() used in Kernel */ -#define GP_ASSERT(cond) do { - if ((cond)) { - fprintf(stderr, "*** gfxprim: %s:%d: in %s: BUG - assertion failed: %sn", - __FILE__, __LINE__, __FUNCTION__, #cond); - abort(); - } - } while (0) +#ifndef likely + #ifdef __GNUC__ + #define likely(x) __builtin_expect(!!(x),1) + #define unlikely(x) __builtin_expect(!!(x),0) + #else + #define likely(x) x + #define unlikely(x) x + #endif +#endif /* - * Abort and print abort location to stderr + * Aborts and prints the message along with the location in code + * to stderr. Used for fatal errors. */ #define GP_ABORT(msg) do { fprintf(stderr, "*** gfxprim: aborted: %s:%d: in %s: %sn", - __FILE__, __LINE__, __FUNCTION__, #msg); + __FILE__, __LINE__, __FUNCTION__, msg); abort(); } while (0) /* + * Checks the condition and aborts immediately if it is not satisfied, + * printing the condition and location in the source. + * (Intended for checking for bugs within the library itself. + * GP_CHECK is used for reporting user errors, like invalid arguments.) + */ +#define GP_ASSERT(cond) do { + if (unlikely(!(cond))) { + fprintf(stderr, "*** gfxprim: %s:%d: in %s: BUG: assertion failed: %sn", + __FILE__, __LINE__, __FUNCTION__, #cond); + abort(); + } +} while (0) + +/* * Perform a runtime check, on failure abort and print a message. * (This macro is intended for checks for user-caused errors, * like invalid arguments, leaving the library in improper state etc. * For internal sanity checks, use GP_ASSERT.) */ #define GP_CHECK(cond, msg) do { - if (!(cond)) { - fprintf(stderr, "*** gfxprim: %s:%d: in %s: %sn", - __FILE__, __LINE__, __FUNCTION__, #msg); - abort(); - } - } while (0) - -/* - * The standard likely() and unlikely() used in Kernel - * TODO: Define as no-op for non-GCC compilers - */ -#ifndef likely -#define likely(x) __builtin_expect((x),1) -#define unlikely(x) __builtin_expect((x),0) -#endif + if (unlikely(!(cond))) { + fprintf(stderr, "*** gfxprim: %s:%d: in %s: %sn", + __FILE__, __LINE__, __FUNCTION__, msg); + abort(); + } +} while (0) /* * Swap a and b using an intermediate variable ----------------------------------------------------------------------- Summary of changes: core/GP_Common.h | 61 +++++++++++++++++++++++++++++------------------------ 1 files changed, 33 insertions(+), 28 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: 50ac1f21f85e66b3d2a8a0a6047971c474c250a4
by bluebear 08 May '11

08 May '11

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 50ac1f21f85e66b3d2a8a0a6047971c474c250a4 (commit) from 2274cefa956331bb30fc65f72522f7a4d4ec0e28 (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/50ac1f21f85e66b3d2a8a0a6047971c474c2… commit 50ac1f21f85e66b3d2a8a0a6047971c474c250a4 Author: BlueBear <jiri.bluebear.dluhos(a)gmail.com> Date: Thu May 5 22:15:20 2011 +0200 Added the GP_BUG_ON macro. diff --git a/core/GP_Common.h b/core/GP_Common.h index 6f06121..b93e921 100644 --- a/core/GP_Common.h +++ b/core/GP_Common.h @@ -50,6 +50,18 @@ }) /* + * Checks the condition and aborts immediately if it is true, + * printing the condition and location in the source. + */ +#define GP_BUG_ON(test) do { + if ((test)) { + fprintf(stderr, "*** gfxprim: BUG: %s:%d: in %s: %sn", + __FILE__, __LINE__, __FUNCTION__, #test); + abort(); + } + } while (0) + +/* * Abort and print abort location to stderr */ #define GP_ABORT(msg) do { ----------------------------------------------------------------------- Summary of changes: core/GP_Common.h | 12 ++++++++++++ 1 files changed, 12 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.")

3 2

[repo.or.cz] gfxprim.git branch master updated: 037f2ffabeabd1a2522169b7b766333a64680762
by bluebear 08 May '11

08 May '11

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 037f2ffabeabd1a2522169b7b766333a64680762 (commit) from 21f013df6c1f9ff561304ef0543589baefd79a9b (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/037f2ffabeabd1a2522169b7b766333a6468… commit 037f2ffabeabd1a2522169b7b766333a64680762 Author: BlueBear <jiri.bluebear.dluhos(a)gmail.com> Date: Sun May 8 14:59:20 2011 +0200 Tetragons now drawn with the polygon routine. diff --git a/core/GP.h b/core/GP.h index 9600772..8254d49 100644 --- a/core/GP.h +++ b/core/GP.h @@ -52,7 +52,6 @@ #include "GP_FillRect.h" #include "GP_Triangle.h" #include "GP_Tetragon.h" -#include "GP_FillTetragon.h" #include "GP_Circle.h" #include "GP_FillCircle.h" #include "GP_Ellipse.h" diff --git a/core/GP_FillTetragon.c b/core/GP_FillTetragon.c deleted file mode 100644 index 9f7e36a..0000000 --- a/core/GP_FillTetragon.c +++ /dev/null @@ -1,49 +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> * - * * - *****************************************************************************/ - -#include "GP.h" - -void GP_FillTetragon(GP_Context * context, int x0, int y0, int x1, int y1, - int x2, int y2, int x3, int y3, GP_Pixel pixel) -{ - GP_CHECK_CONTEXT(context); - - //TODO: fix this! - GP_FillTriangle(context, x0, y0, x1, y1, x2, y2, pixel); - GP_FillTriangle(context, x3, y3, x1, y1, x2, y2, pixel); -} - -void GP_TFillTetragon(GP_Context* context, int x0, int y0, int x1, int y1, - int x2, int y2, int x3, int y3, GP_Pixel pixel) -{ - GP_CHECK_CONTEXT(context); - - GP_TRANSFORM_POINT(context, x0, y0); - GP_TRANSFORM_POINT(context, x1, y1); - GP_TRANSFORM_POINT(context, x2, y2); - GP_TRANSFORM_POINT(context, x3, y3); - - GP_FillTetragon(context, x0, y0, x1, y1, x2, y2, x3, y3, pixel); -} diff --git a/core/GP_FillTetragon.h b/core/GP_FillTetragon.h deleted file mode 100644 index 0335648..0000000 --- a/core/GP_FillTetragon.h +++ /dev/null @@ -1,37 +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_FILLTETRAGON_H -#define GP_FILLTETRAGON_H - -#include "GP_Context.h" - -void GP_FillTetragon(GP_Context *context, int x0, int y0, int x1, int y1, - int x2, int y2, int x3, int y3, GP_Pixel pixel); - -void GP_TFillTetragon(GP_Context *context, int x0, int y0, int x1, int y1, - int x2, int y2, int x3, int y3, GP_Pixel pixel); - -#endif /* GP_FILLTETRAGON_H */ diff --git a/core/GP_Tetragon.c b/core/GP_Tetragon.c index 4618002..2f0b777 100644 --- a/core/GP_Tetragon.c +++ b/core/GP_Tetragon.c @@ -48,3 +48,26 @@ void GP_TTetragon(GP_Context *context, int x0, int y0, int x1, int y1, GP_Tetragon(context, x0, y0, x1, y1, x2, y2, x3, y3, pixel); } + +void GP_FillTetragon(GP_Context *context, int x0, int y0, int x1, int y1, + int x2, int y2, int x3, int y3, GP_Pixel pixel) +{ + GP_CHECK_CONTEXT(context); + + int xy[8] = { x0, y0, x1, y1, x2, y2, x3, y3 }; + GP_FillPolygon(context, 4, (const int *) xy, pixel); +} + +void GP_TFillTetragon(GP_Context* context, int x0, int y0, int x1, int y1, + int x2, int y2, int x3, int y3, GP_Pixel pixel) +{ + GP_CHECK_CONTEXT(context); + + GP_TRANSFORM_POINT(context, x0, y0); + GP_TRANSFORM_POINT(context, x1, y1); + GP_TRANSFORM_POINT(context, x2, y2); + GP_TRANSFORM_POINT(context, x3, y3); + + int xy[8] = { x0, y0, x1, y1, x2, y2, x3, y3 }; + GP_FillPolygon(context, 4, (const int *) xy, pixel); +} diff --git a/core/GP_Tetragon.h b/core/GP_Tetragon.h index 5ed30d0..f69aee8 100644 --- a/core/GP_Tetragon.h +++ b/core/GP_Tetragon.h @@ -34,4 +34,10 @@ void GP_Tetragon(GP_Context *context, int x0, int y0, int x1, int y1, void GP_TTetragon(GP_Context *context, int x0, int y0, int x1, int y1, int x2, int y2, int x3, int y3, GP_Pixel pixel); +void GP_FillTetragon(GP_Context *context, int x0, int y0, int x1, int y1, + int x2, int y2, int x3, int y3, GP_Pixel pixel); + +void GP_TFillTetragon(GP_Context *context, int x0, int y0, int x1, int y1, + int x2, int y2, int x3, int y3, GP_Pixel pixel); + #endif /* GP_TETRAGON_H */ diff --git a/targets/sdl/tests/randomshapetest.c b/targets/sdl/tests/randomshapetest.c index 3cb267f..b46125d 100644 --- a/targets/sdl/tests/randomshapetest.c +++ b/targets/sdl/tests/randomshapetest.c @@ -59,7 +59,8 @@ Uint32 timer_callback(__attribute__((unused)) Uint32 interval, #define SHAPE_ELLIPSE 2 #define SHAPE_TRIANGLE 3 #define SHAPE_RECTANGLE 4 -#define SHAPE_LAST 4 +#define SHAPE_TETRAGON 5 +#define SHAPE_LAST 5 static int shape = SHAPE_FIRST; /* Draw outlines? */ @@ -144,6 +145,23 @@ void draw_random_rectangle(GP_Pixel pixel) } } +void draw_random_tetragon(GP_Pixel pixel) +{ + int x0, y0, x1, y1, x2, y2, x3, y3; + random_point(display, &x0, &y0); + random_point(display, &x1, &y1); + random_point(display, &x2, &y2); + random_point(display, &x3, &y3); + + if (fill_flag) { + GP_FillTetragon(&context, x0, y0, x1, y1, x2, y2, x3, y3, pixel); + } + + if (outline_flag) { + GP_Tetragon(&context, x0, y0, x1, y1, x2, y2, x3, y3, pixel); + } +} + void clear_screen(void) { SDL_LockSurface(display); @@ -178,6 +196,10 @@ void redraw_screen(void) case SHAPE_RECTANGLE: draw_random_rectangle(pixel); break; + + case SHAPE_TETRAGON: + draw_random_tetragon(pixel); + break; } SDL_UnlockSurface(display); diff --git a/targets/sdl/tests/shapetest.c b/targets/sdl/tests/shapetest.c index 6e17cc1..fb85b2e 100644 --- a/targets/sdl/tests/shapetest.c +++ b/targets/sdl/tests/shapetest.c @@ -136,8 +136,9 @@ void draw_testing_triangle(int x, int y, int xradius, int yradius) if (outline == 1) GP_TTriangle(&context, x0, y0, x1, y1, x2, y2, yellow); - if (fill) + if (fill) { GP_TFillTriangle(&context, x0, y0, x1, y1, x2, y2, red); + } if (outline == 2) GP_TTriangle(&context, x0, y0, x1, y1, x2, y2, white); ----------------------------------------------------------------------- Summary of changes: core/GP.h | 1 - core/GP_FillTetragon.c | 49 ----------------------------------- core/GP_FillTetragon.h | 37 -------------------------- core/GP_Tetragon.c | 23 ++++++++++++++++ core/GP_Tetragon.h | 6 ++++ targets/sdl/tests/randomshapetest.c | 24 ++++++++++++++++- targets/sdl/tests/shapetest.c | 3 +- 7 files changed, 54 insertions(+), 89 deletions(-) delete mode 100644 core/GP_FillTetragon.c delete mode 100644 core/GP_FillTetragon.h 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: 21f013df6c1f9ff561304ef0543589baefd79a9b
by bluebear 08 May '11

08 May '11

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 21f013df6c1f9ff561304ef0543589baefd79a9b (commit) from 8cfcfcb548e810bf75dd41fa38391a96b18b8907 (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/21f013df6c1f9ff561304ef0543589baefd7… commit 21f013df6c1f9ff561304ef0543589baefd79a9b Author: BlueBear <jiri.bluebear.dluhos(a)gmail.com> Date: Sun May 8 01:24:12 2011 +0200 Differentiated GP_CHECK and GP_ASSERT (thx gavento for pointing this out). diff --git a/core/GP_Common.h b/core/GP_Common.h index b93e921..24039b6 100644 --- a/core/GP_Common.h +++ b/core/GP_Common.h @@ -50,13 +50,15 @@ }) /* - * Checks the condition and aborts immediately if it is true, + * Checks the condition and aborts immediately if it is not satisfied, * printing the condition and location in the source. + * (Intended for checking for bugs within the library itself. + * GP_CHECK is used for reporting user errors, like invalid arguments.) */ -#define GP_BUG_ON(test) do { - if ((test)) { - fprintf(stderr, "*** gfxprim: BUG: %s:%d: in %s: %sn", - __FILE__, __LINE__, __FUNCTION__, #test); +#define GP_ASSERT(cond) do { + if ((cond)) { + fprintf(stderr, "*** gfxprim: %s:%d: in %s: BUG - assertion failed: %sn", + __FILE__, __LINE__, __FUNCTION__, #cond); abort(); } } while (0) @@ -71,12 +73,15 @@ } while (0) /* - * Perform a runtime check, on failure abort and print a message + * Perform a runtime check, on failure abort and print a message. + * (This macro is intended for checks for user-caused errors, + * like invalid arguments, leaving the library in improper state etc. + * For internal sanity checks, use GP_ASSERT.) */ -#define GP_CHECK(cond) do { +#define GP_CHECK(cond, msg) do { if (!(cond)) { - fprintf(stderr, "*** gfxprim: check failed: %s:%d: in %s: %sn", - __FILE__, __LINE__, __FUNCTION__, #cond); + fprintf(stderr, "*** gfxprim: %s:%d: in %s: %sn", + __FILE__, __LINE__, __FUNCTION__, #msg); abort(); } } while (0) diff --git a/core/GP_Context.h b/core/GP_Context.h index 65c14d0..67851b5 100644 --- a/core/GP_Context.h +++ b/core/GP_Context.h @@ -38,7 +38,7 @@ typedef struct GP_Context { uint8_t bpp; /* values: 1, 2, 4, 8, 16, 24, 32 */ uint32_t bytes_per_row; uint32_t w; /* width */ - uint32_t h; /* heigth */ + uint32_t h; /* height */ GP_PixelType pixel_type; /* hardware pixel format */ @@ -73,12 +73,20 @@ inline GP_PixelType GP_GetContextPixelType(const GP_Context *context); /* Performs a series of sanity checks on context, aborting if any fails. */ #define GP_CHECK_CONTEXT(context) do { - GP_CHECK(context != NULL); - GP_CHECK(context->w > 0 && context->h > 0); - GP_CHECK(context->clip_w_min <= context->clip_w_max); - GP_CHECK(context->clip_h_min <= context->clip_h_max); - GP_CHECK(context->clip_w_max < context->w); - GP_CHECK(context->clip_h_max < context->h); + GP_CHECK(context, + "NULL passed as context"); + GP_CHECK(context->pixels, + "invalid context: NULL image pointer"); + GP_CHECK(context->bpp <= 32, + "invalid context: unsupported bits-per-pixel count"); + GP_CHECK(context->w > 0 && context->h > 0, + "invalid context: invalid image size"); + GP_CHECK(context->clip_w_min <= context->clip_w_max + && context->clip_h_min <= context->clip_h_max, + "invalid context: invalid clipping rectangle"); + GP_CHECK(context->clip_w_max < context->w + && context->clip_h_max < context->h, + "invalid context: clipping rectangle larger than image"); } while (0) /* diff --git a/core/GP_Font.c b/core/GP_Font.c index 79a58c7..1c7d0a0 100644 --- a/core/GP_Font.c +++ b/core/GP_Font.c @@ -29,14 +29,14 @@ unsigned int GP_GetCharDataSize(const GP_Font *font) { - GP_CHECK(font != NULL); + GP_CHECK(font, "NULL font specified"); return sizeof(GP_CharData) + font->bytes_per_line * font->height; } const GP_CharData *GP_GetCharData(const GP_Font *font, int c) { - GP_CHECK(font != NULL); + GP_CHECK(font, "NULL font specified"); /* characters before space are not encoded */ switch (font->charset) { @@ -70,7 +70,7 @@ int GP_GetCharCount(unsigned int charset) unsigned int GP_GetFontDataSize(const GP_Font *font) { - GP_CHECK(font); + GP_CHECK(font, "NULL font specified"); return GP_GetCharCount(font->charset) * GP_GetCharDataSize(font); } diff --git a/core/GP_TextMetric.c b/core/GP_TextMetric.c index 7485d60..247f191 100644 --- a/core/GP_TextMetric.c +++ b/core/GP_TextMetric.c @@ -58,7 +58,8 @@ static unsigned int MaxCharsWidth(const GP_TextStyle *style, const char *str) unsigned int GP_TextWidth(const GP_TextStyle *style, const char *str) { - GP_CHECK(style != NULL && style->font != NULL && str != NULL); + GP_CHECK_TEXT_STYLE(style); + GP_CHECK(str, "NULL string specified"); unsigned int i, len = 0; unsigned int space = SpaceWidth(style); @@ -74,6 +75,8 @@ unsigned int GP_TextWidth(const GP_TextStyle *style, const char *str) unsigned int GP_TextMaxWidth(const GP_TextStyle *style, unsigned int len) { + GP_CHECK_TEXT_STYLE(style); + unsigned int space_width = SpaceWidth(style); unsigned int char_width = style->font->max_bounding_width * (style->pixel_xmul + style->pixel_xspace); @@ -87,6 +90,9 @@ unsigned int GP_TextMaxWidth(const GP_TextStyle *style, unsigned int len) unsigned int GP_TextMaxStrWidth(const GP_TextStyle *style, const char *str, unsigned int len) { + GP_CHECK_TEXT_STYLE(style); + GP_CHECK(str, "NULL string specified"); + unsigned int space_width = SpaceWidth(style); unsigned int char_width; @@ -100,7 +106,7 @@ unsigned int GP_TextMaxStrWidth(const GP_TextStyle *style, const char *str, unsigned int GP_TextHeight(const GP_TextStyle *style) { - GP_CHECK(style != NULL && style->font != NULL); + GP_CHECK_TEXT_STYLE(style); return style->font->height * style->pixel_ymul + (style->font->height - 1) * style->pixel_yspace; @@ -108,7 +114,7 @@ unsigned int GP_TextHeight(const GP_TextStyle *style) unsigned int GP_TextAscent(const GP_TextStyle *style) { - GP_CHECK(style != NULL && style->font != NULL); + GP_CHECK_TEXT_STYLE(style); unsigned int h = style->font->height - style->font->baseline; return h * style->pixel_ymul + (h - 1) * style->pixel_yspace; @@ -116,7 +122,7 @@ unsigned int GP_TextAscent(const GP_TextStyle *style) unsigned int GP_TextDescent(const GP_TextStyle *style) { - GP_CHECK(style != NULL && style->font != NULL); + GP_CHECK_TEXT_STYLE(style); unsigned int h = style->font->baseline; return h * style->pixel_ymul + (h - 1) * style->pixel_yspace; diff --git a/core/GP_TextStyle.h b/core/GP_TextStyle.h index 7327ae4..8e33eb9 100644 --- a/core/GP_TextStyle.h +++ b/core/GP_TextStyle.h @@ -62,4 +62,9 @@ typedef struct { */ void GP_DefaultTextStyle(GP_TextStyle *style); +#define GP_CHECK_TEXT_STYLE(style) do { + GP_CHECK(style, "NULL style specified"); + GP_CHECK(style->font, "NULL font specified in style"); +} while(0) + #endif /* GP_TEXTSTYLE_H */ ----------------------------------------------------------------------- Summary of changes: core/GP_Common.h | 23 ++++++++++++++--------- core/GP_Context.h | 22 +++++++++++++++------- core/GP_Font.c | 6 +++--- core/GP_TextMetric.c | 14 ++++++++++---- core/GP_TextStyle.h | 5 +++++ 5 files changed, 47 insertions(+), 23 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: 8cfcfcb548e810bf75dd41fa38391a96b18b8907
by bluebear 07 May '11

07 May '11

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 8cfcfcb548e810bf75dd41fa38391a96b18b8907 (commit) from b0f09bfef85c7a22ed6feba890e085634a6517e2 (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/8cfcfcb548e810bf75dd41fa38391a96b18b… commit 8cfcfcb548e810bf75dd41fa38391a96b18b8907 Author: BlueBear <jiri.bluebear.dluhos(a)gmail.com> Date: Sat May 7 19:59:28 2011 +0200 Hopefully better approximation of polygon area. diff --git a/core/GP_Polygon.c b/core/GP_Polygon.c index 96296e6..a72b114 100644 --- a/core/GP_Polygon.c +++ b/core/GP_Polygon.c @@ -31,7 +31,7 @@ struct GP_PolygonEdge { int startx, starty; int endx, endy; - int dx, dy, sx; + int dx, dy; }; struct GP_Polygon { @@ -62,9 +62,8 @@ static void GP_InitEdge(struct GP_PolygonEdge *edge, edge->endy = y1; } - edge->dx = abs(edge->endx - edge->startx); + edge->dx = edge->endx - edge->startx; edge->dy = edge->endy - edge->starty; - edge->sx = (edge->endx >= edge->startx) ? 1 : -1; } static void GP_AddEdge(struct GP_Polygon *poly, int x1, int y1, int x2, int y2) @@ -79,16 +78,22 @@ static void GP_AddEdge(struct GP_Polygon *poly, int x1, int y1, int x2, int y2) poly->ymax = GP_MAX(poly->ymax, edge->endy); } -static int GP_CompareEdgeStartY(const void *edge1, const void *edge2) +static int GP_CompareEdges(const void *edge1, const void *edge2) { - int y1 = ((struct GP_PolygonEdge *) edge1)->starty; - int y2 = ((struct GP_PolygonEdge *) edge2)->starty; - if (y1 > y2) + 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; - else if (y1 == y2) - return 0; - else + if (e1->startx < e2->startx) return -1; + + return 0; } static void GP_LoadPolygon(struct GP_Polygon *poly, int vertex_count, @@ -113,9 +118,9 @@ static void GP_LoadPolygon(struct GP_Polygon *poly, int vertex_count, GP_AddEdge(poly, xy[i], xy[i+1], xy[0], xy[1]); } - /* sort edges by their starting Y coordinate */ + /* sort edges */ qsort(poly->edges, poly->edge_count, sizeof(struct GP_PolygonEdge), - GP_CompareEdgeStartY); + GP_CompareEdges); } static void GP_ResetPolygon(struct GP_Polygon *poly) @@ -127,17 +132,24 @@ static void GP_ResetPolygon(struct GP_Polygon *poly) poly->ymax = 0; } -/* Finds an X coordinate of an intersection of the edge +/* + * Finds an X coordinate of an intersection of the edge * with the given Y line. */ static inline int GP_FindIntersection(int y, const struct GP_PolygonEdge *edge) { - int edge_y = y - edge->starty; - int edge_x; - for (edge_x = edge->sx > 0 ? edge->startx : edge->endx; - edge->startx*edge->dy + edge->sx*edge_y*edge->dx - edge_x*edge->dy > 0; - edge_x++); - return edge_x; + int edge_y = y - edge->starty; /* Y relative to the edge */ + int 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--; + } + + return x; } void GP_FillPolygon(GP_Context *context, int vertex_count, const int *xy, @@ -147,10 +159,13 @@ void GP_FillPolygon(GP_Context *context, int vertex_count, const int *xy, GP_LoadPolygon(&poly, vertex_count, xy); - int y; + int y, startx, endx; + int startx_prev = -INT_MAX; + int endx_prev = INT_MAX; + for (y = poly.ymin; y <= poly.ymax; y++) { - int startx = INT_MAX; - int endx = 0; + startx = INT_MAX; + endx = 0; int i; for (i = 0; i < poly.edge_count; i++) { @@ -159,12 +174,22 @@ void GP_FillPolygon(GP_Context *context, int vertex_count, const int *xy, if (y < edge->starty || y > edge->endy) continue; - int edge_x = GP_FindIntersection(y, edge); - startx = GP_MIN(startx, edge_x); - endx = GP_MAX(endx, edge_x); + int inter = GP_FindIntersection(y, edge); + + startx = GP_MIN(startx, inter); + endx = GP_MAX(endx, inter); + + if (y != edge->endy) { + inter = GP_FindIntersection(y + 1, edge); + startx = GP_MIN(startx, inter); + endx = GP_MAX(endx, inter); + } } GP_HLine(context, startx, endx, y, pixel); + + startx_prev = startx; + endx_prev = endx; } GP_ResetPolygon(&poly); ----------------------------------------------------------------------- Summary of changes: core/GP_Polygon.c | 75 +++++++++++++++++++++++++++++++++++----------------- 1 files changed, 50 insertions(+), 25 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: b0f09bfef85c7a22ed6feba890e085634a6517e2
by bluebear 07 May '11

07 May '11

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 b0f09bfef85c7a22ed6feba890e085634a6517e2 (commit) via e72092bb7d6f87d5d739cc1697da79cd69c6a2a7 (commit) from 50ac1f21f85e66b3d2a8a0a6047971c474c250a4 (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/b0f09bfef85c7a22ed6feba890e085634a65… commit b0f09bfef85c7a22ed6feba890e085634a6517e2 Author: BlueBear <jiri.bluebear.dluhos(a)gmail.com> Date: Sat May 7 19:35:10 2011 +0200 Filled triangles are now drawn with polygons. diff --git a/core/GP.h b/core/GP.h index 1be9710..9600772 100644 --- a/core/GP.h +++ b/core/GP.h @@ -51,7 +51,6 @@ #include "GP_Rect.h" #include "GP_FillRect.h" #include "GP_Triangle.h" -#include "GP_FillTriangle.h" #include "GP_Tetragon.h" #include "GP_FillTetragon.h" #include "GP_Circle.h" diff --git a/core/GP_FillTriangle.c b/core/GP_FillTriangle.c deleted file mode 100644 index 3b483d6..0000000 --- a/core/GP_FillTriangle.c +++ /dev/null @@ -1,60 +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> * - * * - *****************************************************************************/ - -#include "GP.h" -#include "GP_FnPerBpp.h" -#include "algo/FillTriangle.algo.h" - -#include <math.h> -#include <stdlib.h> - -/* Generate drawing functions for various bit depths. */ -DEF_FILLTRIANGLE_FN(GP_FillTriangle1bpp, GP_Context *, GP_Pixel, GP_HLine1bpp, GP_PutPixel1bpp) -DEF_FILLTRIANGLE_FN(GP_FillTriangle2bpp, GP_Context *, GP_Pixel, GP_HLine2bpp, GP_PutPixel2bpp) -DEF_FILLTRIANGLE_FN(GP_FillTriangle4bpp, GP_Context *, GP_Pixel, GP_HLine4bpp, GP_PutPixel4bpp) -DEF_FILLTRIANGLE_FN(GP_FillTriangle8bpp, GP_Context *, GP_Pixel, GP_HLine8bpp, GP_PutPixel8bpp) -DEF_FILLTRIANGLE_FN(GP_FillTriangle16bpp, GP_Context *, GP_Pixel, GP_HLine16bpp, GP_PutPixel16bpp) -DEF_FILLTRIANGLE_FN(GP_FillTriangle24bpp, GP_Context *, GP_Pixel, GP_HLine24bpp, GP_PutPixel24bpp) -DEF_FILLTRIANGLE_FN(GP_FillTriangle32bpp, GP_Context *, GP_Pixel, GP_HLine32bpp, GP_PutPixel32bpp) - -void GP_FillTriangle(GP_Context * context, int x0, int y0, int x1, int y1, - int x2, int y2, GP_Pixel pixel) -{ - GP_CHECK_CONTEXT(context); - - GP_FN_PER_BPP(GP_FillTriangle, context, x0, y0, x1, y1, x2, y2, pixel); -} - -void GP_TFillTriangle(GP_Context* context, int x0, int y0, int x1, int y1, - int x2, int y2, GP_Pixel pixel) -{ - GP_CHECK_CONTEXT(context); - - GP_TRANSFORM_POINT(context, x0, y0); - GP_TRANSFORM_POINT(context, x1, y1); - GP_TRANSFORM_POINT(context, x2, y2); - - GP_FillTriangle(context, x0, y0, x1, y1, x2, y2, pixel); -} diff --git a/core/GP_FillTriangle.h b/core/GP_FillTriangle.h deleted file mode 100644 index 11e0b4f..0000000 --- a/core/GP_FillTriangle.h +++ /dev/null @@ -1,38 +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_FILLTRIANGLE_H -#define GP_FILLTRIANGLE_H - -#include "GP_Context.h" -#include "GP_Common.h" - -void GP_FillTriangle(GP_Context *context, int x0, int y0, int x1, int y1, - int x2, int y2, GP_Pixel pixel); - -void GP_TFillTriangle(GP_Context *context, int x0, int y0, int x1, int y1, - int x2, int y2, GP_Pixel pixel); - -#endif /* GP_FILLTRIANGLE_H */ diff --git a/core/GP_Triangle.c b/core/GP_Triangle.c index 82caa55..4734617 100644 --- a/core/GP_Triangle.c +++ b/core/GP_Triangle.c @@ -46,3 +46,25 @@ void GP_TTriangle(GP_Context *context, int x0, int y0, int x1, int y1, GP_Triangle(context, x0, y0, x1, y1, x2, y2, pixel); } + +void GP_FillTriangle(GP_Context * context, int x0, int y0, int x1, int y1, + int x2, int y2, GP_Pixel pixel) +{ + GP_CHECK_CONTEXT(context); + + int coords[6] = { x0, y0, x1, y1, x2, y2 }; + GP_FillPolygon(context, 3, &coords, pixel); +} + +void GP_TFillTriangle(GP_Context* context, int x0, int y0, int x1, int y1, + int x2, int y2, GP_Pixel pixel) +{ + GP_CHECK_CONTEXT(context); + + GP_TRANSFORM_POINT(context, x0, y0); + GP_TRANSFORM_POINT(context, x1, y1); + GP_TRANSFORM_POINT(context, x2, y2); + + int coords[6] = { x0, y0, x1, y1, x2, y2 }; + GP_FillPolygon(context, 3, &coords, pixel); +} diff --git a/core/GP_Triangle.h b/core/GP_Triangle.h index 3684b11..4bc5523 100644 --- a/core/GP_Triangle.h +++ b/core/GP_Triangle.h @@ -34,4 +34,10 @@ void GP_Triangle(GP_Context *context, int x0, int y0, int x1, int y1, void GP_TTriangle(GP_Context *context, int x0, int y0, int x1, int y1, int x2, int y2, GP_Pixel pixel); +void GP_FillTriangle(GP_Context *context, int x0, int y0, int x1, int y1, + int x2, int y2, GP_Pixel pixel); + +void GP_TFillTriangle(GP_Context *context, int x0, int y0, int x1, int y1, + int x2, int y2, GP_Pixel pixel); + #endif /* GP_TRIANGLE_H */ http://repo.or.cz/w/gfxprim.git/commit/e72092bb7d6f87d5d739cc1697da79cd69c6… commit e72092bb7d6f87d5d739cc1697da79cd69c6a2a7 Author: BlueBear <jiri.bluebear.dluhos(a)gmail.com> Date: Sat May 7 19:33:59 2011 +0200 Multicolored sierpinsky to aid visual analysis. diff --git a/targets/sdl/tests/sierpinsky.c b/targets/sdl/tests/sierpinsky.c index d9411ee..99fc99a 100644 --- a/targets/sdl/tests/sierpinsky.c +++ b/targets/sdl/tests/sierpinsky.c @@ -47,14 +47,19 @@ SDL_TimerID timer; int iter, l, way = 1; -GP_Pixel black, blue, gray; +GP_Pixel black, blue, gray, red; -static void sierpinsky(SDL_Surface *surf, GP_Pixel pixel, float x1, float y1, float x4, float y4, int iter) +int draw_edge = 1; + +static void sierpinsky(SDL_Surface *surf, double x1, double y1, double x4, double y4, int iter) { - float x2, y2, x3, y3, x5, y5; + double x2, y2, x3, y3, x5, y5; + GP_Pixel pixel; + GP_RGBToPixel(&context, 0, 0, 255-16*iter, &pixel); if (iter <= 0) { - GP_Line(&context, x1, y1, x4, y4, black); + if (draw_edge) + GP_Line(&context, x1, y1, x4, y4, black); return; } @@ -69,15 +74,19 @@ static void sierpinsky(SDL_Surface *surf, GP_Pixel pixel, float x1, float y1, fl GP_FillTriangle(&context, x2, y2, x3, y3, x5, y5, pixel); - sierpinsky(surf, pixel, x1, y1, x2, y2, iter - 1); - sierpinsky(surf, pixel, x2, y2, x5, y5, iter - 1); - sierpinsky(surf, pixel, x5, y5, x3, y3, iter - 1); - sierpinsky(surf, pixel, x3, y3, x4, y4, iter - 1); + GP_PutPixel(&context, x2, y2, red); + GP_PutPixel(&context, x3, y3, red); + GP_PutPixel(&context, x5, y5, red); + + sierpinsky(surf, x1, y1, x2, y2, iter - 1); + sierpinsky(surf, x2, y2, x5, y5, iter - 1); + sierpinsky(surf, x5, y5, x3, y3, iter - 1); + sierpinsky(surf, x3, y3, x4, y4, iter - 1); } static void draw(SDL_Surface *surf, int x, int y, int l, int iter) { - float x1, y1, x2, y2, x3, y3; + double x1, y1, x2, y2, x3, y3; int w = surf->w; int h = surf->h; @@ -96,9 +105,9 @@ static void draw(SDL_Surface *surf, int x, int y, int l, int iter) GP_FillTriangle(&context, x1, y1, x2, y2, x3, y3, blue); - sierpinsky(surf, blue, x1, y1, x2, y2, iter/60%6); - sierpinsky(surf, blue, x2, y2, x3, y3, iter/60%6); - sierpinsky(surf, blue, x3, y3, x1, y1, iter/60%6); + sierpinsky(surf, x1, y1, x2, y2, iter/60%6); + sierpinsky(surf, x2, y2, x3, y3, iter/60%6); + sierpinsky(surf, x3, y3, x1, y1, iter/60%6); SDL_UpdateRect(surf, 0, 0, surf->w, surf->h); } @@ -142,6 +151,7 @@ int main(void) GP_ColorNameToPixel(&context, GP_COL_BLACK, &black); GP_ColorNameToPixel(&context, GP_COL_BLUE, &blue); GP_ColorNameToPixel(&context, GP_COL_GRAY_LIGHT, &gray); + GP_ColorNameToPixel(&context, GP_COL_RED, &red); iter = 0; draw(display, display->w/2, display->h/2, l, iter); @@ -160,6 +170,9 @@ int main(void) case SDLK_p: paused = !paused; break; + case SDLK_e: + draw_edge = !draw_edge; + break; case SDLK_ESCAPE: SDL_Quit(); return 0; ----------------------------------------------------------------------- Summary of changes: core/GP.h | 1 - core/GP_FillTriangle.c | 60 ---------------------------------------- core/GP_FillTriangle.h | 38 ------------------------- core/GP_Triangle.c | 22 ++++++++++++++ core/GP_Triangle.h | 6 ++++ targets/sdl/tests/sierpinsky.c | 37 ++++++++++++++++-------- 6 files changed, 53 insertions(+), 111 deletions(-) delete mode 100644 core/GP_FillTriangle.c delete mode 100644 core/GP_FillTriangle.h 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: 2274cefa956331bb30fc65f72522f7a4d4ec0e28
by bluebear 04 May '11

04 May '11

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 2274cefa956331bb30fc65f72522f7a4d4ec0e28 (commit) from 582174a303ed68281404b7f09beeba72d8d80a17 (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/2274cefa956331bb30fc65f72522f7a4d4ec… commit 2274cefa956331bb30fc65f72522f7a4d4ec0e28 Author: BlueBear <jiri.bluebear.dluhos(a)gmail.com> Date: Wed May 4 00:18:33 2011 +0200 Used an array and qsort() in polygon code. diff --git a/core/GP_Polygon.c b/core/GP_Polygon.c index 845825b..96296e6 100644 --- a/core/GP_Polygon.c +++ b/core/GP_Polygon.c @@ -26,22 +26,30 @@ #include "GP.h" #include <limits.h> +#include <stdlib.h> struct GP_PolygonEdge { int startx, starty; int endx, endy; int dx, dy, sx; - struct GP_PolygonEdge *next; }; struct GP_Polygon { struct GP_PolygonEdge *edges; + int edge_count; int ymin, ymax; }; -static struct GP_PolygonEdge *GP_NewEdge(int x1, int y1, int x2, int y2) +#define GP_POLYGON_INITIALIZER { + .edges = NULL, + .edge_count = 0, + .ymin = INT_MAX, + .ymax = 0 +} + +static void GP_InitEdge(struct GP_PolygonEdge *edge, + int x1, int y1, int x2, int y2) { - struct GP_PolygonEdge *edge = malloc(sizeof(*edge)); if (y1 < y2) { /* coords are top-down, correct */ edge->startx = x1; edge->starty = y1; @@ -57,105 +65,107 @@ static struct GP_PolygonEdge *GP_NewEdge(int x1, int y1, int x2, int y2) edge->dx = abs(edge->endx - edge->startx); edge->dy = edge->endy - edge->starty; edge->sx = (edge->endx >= edge->startx) ? 1 : -1; - - return edge; } -static void GP_InsertEdge(struct GP_Polygon *poly, struct GP_PolygonEdge *new_edge) +static void GP_AddEdge(struct GP_Polygon *poly, int x1, int y1, int x2, int y2) { - struct GP_PolygonEdge *cur_edge = poly->edges; + struct GP_PolygonEdge *edge = poly->edges + poly->edge_count; + + poly->edge_count++; - poly->ymin = GP_MIN(poly->ymin, new_edge->starty); - poly->ymax = GP_MAX(poly->ymax, new_edge->endy); + GP_InitEdge(edge, x1, y1, x2, y2); - if (cur_edge == NULL || cur_edge->starty > new_edge->starty) { - new_edge->next = cur_edge; - poly->edges = new_edge; - return; - } - - for (;;) { - if (cur_edge->next == NULL || cur_edge->next->starty > new_edge->starty) { - new_edge->next = cur_edge->next; - cur_edge->next = new_edge; - return; - } - cur_edge = cur_edge->next; - } + poly->ymin = GP_MIN(poly->ymin, edge->starty); + poly->ymax = GP_MAX(poly->ymax, edge->endy); } -static struct GP_Polygon *GP_NewPolygon(void) +static int GP_CompareEdgeStartY(const void *edge1, const void *edge2) { - struct GP_Polygon *poly = malloc(sizeof(struct GP_Polygon)); - poly->edges = NULL; - poly->ymin = INT_MAX; - poly->ymax = 0; - return poly; + int y1 = ((struct GP_PolygonEdge *) edge1)->starty; + int y2 = ((struct GP_PolygonEdge *) edge2)->starty; + if (y1 > y2) + return 1; + else if (y1 == y2) + return 0; + else + return -1; } -static void GP_LoadPolygon(struct GP_Polygon *poly, int vertex_count, int *xy) +static void GP_LoadPolygon(struct GP_Polygon *poly, int vertex_count, + const int *xy) { + poly->edge_count = 0; + poly->edges = calloc(sizeof(struct GP_PolygonEdge), + vertex_count); + int i; int coord_count = 2*vertex_count - 2; - for (i = 0; i < coord_count; i+=2) { - + for (i = 0; i < coord_count; i+=2) { - if (xy[i+1] == xy[i+3]) { - continue; /* skip horizontal edges */ + /* 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 = GP_NewEdge(xy[i], - xy[i+1], xy[i+2], xy[i+3]); - - GP_InsertEdge(poly, edge); } - /* add the closing edge */ + /* add the closing edge, unless it is horizontal */ if (xy[1] != xy[i+1]) { - struct GP_PolygonEdge *edge = GP_NewEdge(xy[i], xy[i+1], - xy[0], xy[1]); - GP_InsertEdge(poly, edge); + GP_AddEdge(poly, xy[i], xy[i+1], xy[0], xy[1]); } + + /* sort edges by their starting Y coordinate */ + qsort(poly->edges, poly->edge_count, sizeof(struct GP_PolygonEdge), + GP_CompareEdgeStartY); } -static void GP_FreePolygon(struct GP_Polygon *poly) +static void GP_ResetPolygon(struct GP_Polygon *poly) { - struct GP_PolygonEdge *edge = poly->edges; - for (;;) { - struct GP_PolygonEdge *next_edge = edge->next; - free(edge); - if (next_edge == NULL) - break; - edge = next_edge; - } - free(poly); + free(poly->edges); + poly->edges = NULL; + poly->edge_count = 0; + poly->ymin = INT_MAX; + poly->ymax = 0; } -void GP_FillPolygon(GP_Context *context, int vertex_count, int *xy, GP_Pixel pixel) +/* Finds an X coordinate of an intersection of the edge + * with the given Y line. + */ +static inline int GP_FindIntersection(int y, const struct GP_PolygonEdge *edge) { - struct GP_Polygon *poly = GP_NewPolygon(); - GP_LoadPolygon(poly, vertex_count, xy); + int edge_y = y - edge->starty; + int edge_x; + for (edge_x = edge->sx > 0 ? edge->startx : edge->endx; + edge->startx*edge->dy + edge->sx*edge_y*edge->dx - edge_x*edge->dy > 0; + edge_x++); + return edge_x; +} + +void GP_FillPolygon(GP_Context *context, int vertex_count, const int *xy, + GP_Pixel pixel) +{ + struct GP_Polygon poly = GP_POLYGON_INITIALIZER; + + GP_LoadPolygon(&poly, vertex_count, xy); int y; - for (y = poly->ymin; y <= poly->ymax; y++) { + for (y = poly.ymin; y <= poly.ymax; y++) { int startx = INT_MAX; int endx = 0; - struct GP_PolygonEdge *edge; - for (edge = poly->edges; edge; edge = edge->next) { - if (y >= edge->starty && y <= edge->endy) { - int edge_y = y - edge->starty; - int edge_x; - for (edge_x = edge->sx > 0 ? edge->startx: edge->endx; - edge->startx*edge->dy + edge->sx*edge_y*edge->dx - edge_x*edge->dy > 0; - edge_x++); - startx = GP_MIN(startx, edge_x); - endx = GP_MAX(endx, edge_x); - } + int i; + for (i = 0; i < poly.edge_count; i++) { + struct GP_PolygonEdge *edge = poly.edges + i; + + if (y < edge->starty || y > edge->endy) + continue; + + int edge_x = GP_FindIntersection(y, edge); + startx = GP_MIN(startx, edge_x); + endx = GP_MAX(endx, edge_x); } GP_HLine(context, startx, endx, y, pixel); } - GP_FreePolygon(poly); + GP_ResetPolygon(&poly); } diff --git a/core/GP_Polygon.h b/core/GP_Polygon.h index 49c11ab..bbbdf9b 100644 --- a/core/GP_Polygon.h +++ b/core/GP_Polygon.h @@ -28,6 +28,7 @@ #include "GP_Context.h" -void GP_FillPolygon(GP_Context *context, int vertex_count, int *xy, GP_Pixel pixel); +void GP_FillPolygon(GP_Context *context, int vertex_count, const int *xy, + GP_Pixel pixel); #endif /* GP_RECT_H */ ----------------------------------------------------------------------- Summary of changes: core/GP_Polygon.c | 148 ++++++++++++++++++++++++++++------------------------- core/GP_Polygon.h | 3 +- 2 files changed, 81 insertions(+), 70 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

gfxprim pages
by Cyril Hrubis 02 May '11

02 May '11

Good news everyone, I've played with the gfxprim pages again and I'm kind of pleased with the outcome. See for yourself: http://gfxprim.ucw.cz/ Any comments are welcome (some minor changes may happen but the overall desing should be done now). -- metan

1 0