March 2012 - Gfxprim

[repo.or.cz] gfxprim.git branch master updated: fde90a28ce68be92f54b9ca7be882ddc7eb20361
by metan 20 Mar '12

20 Mar '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 fde90a28ce68be92f54b9ca7be882ddc7eb20361 (commit) from add9b9cbb298ae43aa5b74921d66003326eafb67 (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/fde90a28ce68be92f54b9ca7be882ddc7eb2… commit fde90a28ce68be92f54b9ca7be882ddc7eb20361 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Tue Mar 20 15:41:35 2012 +0100 pylib: Final fix for python 3.2 yay! Change map to list comprehension. (Baked together with Tomas) diff --git a/pylib/gfxprim/utils.py b/pylib/gfxprim/utils.py index 4060811..4d4bd05 100644 --- a/pylib/gfxprim/utils.py +++ b/pylib/gfxprim/utils.py @@ -36,8 +36,8 @@ def import_members(from_, to, include=[], exclude=[], sub=None): `include` and `exclude` are lists of regexes to match (include ^ and $).""" assert not (include and exclude) import re - il = map(re.compile, include) - el = map(re.compile, exclude) + il = [re.compile(i) for i in include] + el = [re.compile(i) for i in exclude] for name in dir(from_): try: o = from_[name] ----------------------------------------------------------------------- Summary of changes: pylib/gfxprim/utils.py | 4 ++-- 1 files changed, 2 insertions(+), 2 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: add9b9cbb298ae43aa5b74921d66003326eafb67
by metan 19 Mar '12

19 Mar '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 add9b9cbb298ae43aa5b74921d66003326eafb67 (commit) from f6c1e6c7ad85f0f95299bd7c7027f2f8374a016b (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/add9b9cbb298ae43aa5b74921d66003326ea… commit add9b9cbb298ae43aa5b74921d66003326eafb67 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Mon Mar 19 20:02:40 2012 +0100 text: Fix rotation for 8bpp TEXT_NOBG rendering. diff --git a/libs/text/GP_Text.gen.c.t b/libs/text/GP_Text.gen.c.t index f0acc30..12a8e7e 100644 --- a/libs/text/GP_Text.gen.c.t +++ b/libs/text/GP_Text.gen.c.t @@ -123,8 +123,13 @@ static void text_draw_1BPP(GP_Context *context, GP_TextStyle *style, int x, int %% else unsigned int l; - for (l = x_start; l < x_start + style->pixel_xmul; l++) - GP_MixPixel_Raw_Clipped_{{ pt.name }}(context, l, cur_y, fg, gray); + for (l = x_start; l < x_start + style->pixel_xmul; l++) { + unsigned int px = l; + unsigned int py = cur_y; + //TODO: optimize this + GP_TRANSFORM_POINT(context, px, py); + GP_MixPixel_Raw_Clipped_{{ pt.name }}(context, px, py, fg, gray); + } %% endif } } ----------------------------------------------------------------------- Summary of changes: libs/text/GP_Text.gen.c.t | 9 +++++++-- 1 files changed, 7 insertions(+), 2 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: f6c1e6c7ad85f0f95299bd7c7027f2f8374a016b
by metan 12 Mar '12

12 Mar '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 f6c1e6c7ad85f0f95299bd7c7027f2f8374a016b (commit) from ca4df5647e88fd02a065de65b91e86e41ef07b58 (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/f6c1e6c7ad85f0f95299bd7c7027f2f8374a… commit f6c1e6c7ad85f0f95299bd7c7027f2f8374a016b Author: Cyril Hrubis <metan(a)ucw.cz> Date: Mon Mar 12 19:08:50 2012 +0100 configure: Fix bashism. diff --git a/configure b/configure index 394b1b7..60d6e14 100755 --- a/configure +++ b/configure @@ -51,7 +51,7 @@ def python_module_installed(cfg, module): def check_for_swig(cfg): sys.stderr.write("Checking for working swig ... ") - ret = os.system("%s -version &> /dev/null" % cfg['SWIG'][0]) + ret = os.system("%s -version > /dev/null 2>&1" % cfg['SWIG'][0]) if ret: sys.stderr.write('Non') ----------------------------------------------------------------------- Summary of changes: configure | 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: ca4df5647e88fd02a065de65b91e86e41ef07b58
by metan 11 Mar '12

11 Mar '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 ca4df5647e88fd02a065de65b91e86e41ef07b58 (commit) from 16ac5bdd29c9a7d4eb0309240a9be235a7436c0f (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/ca4df5647e88fd02a065de65b91e86e41ef0… commit ca4df5647e88fd02a065de65b91e86e41ef07b58 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun Mar 11 22:20:19 2012 +0100 demos: Rename fbshow to spiv (as it outgrew it's name) diff --git a/demos/Makefile b/demos/Makefile index c148243..3198465 100644 --- a/demos/Makefile +++ b/demos/Makefile @@ -1,3 +1,3 @@ TOPDIR=.. -SUBDIRS=grinder fbshow particle +SUBDIRS=grinder spiv particle include $(TOPDIR)/post.mk diff --git a/demos/fbshow/Makefile b/demos/spiv/Makefile similarity index 87% rename from demos/fbshow/Makefile rename to demos/spiv/Makefile index 8921aff..13b416c 100644 --- a/demos/fbshow/Makefile +++ b/demos/spiv/Makefile @@ -7,9 +7,9 @@ CFLAGS+=-pthread LDFLAGS+=-pthread -lrt LDLIBS+=-lGP -lGP_backends -lSDL -L$(TOPDIR)/build/ -APPS=fbshow +APPS=spiv -fbshow: cpu_timer.o +spiv: cpu_timer.o include $(TOPDIR)/pre.mk include $(TOPDIR)/app.mk diff --git a/demos/fbshow/cpu_timer.c b/demos/spiv/cpu_timer.c similarity index 100% rename from demos/fbshow/cpu_timer.c rename to demos/spiv/cpu_timer.c diff --git a/demos/fbshow/cpu_timer.h b/demos/spiv/cpu_timer.h similarity index 100% rename from demos/fbshow/cpu_timer.h rename to demos/spiv/cpu_timer.h diff --git a/demos/fbshow/runtest.sh b/demos/spiv/runtest.sh similarity index 100% rename from demos/fbshow/runtest.sh rename to demos/spiv/runtest.sh diff --git a/demos/fbshow/fbshow.c b/demos/spiv/spiv.c similarity index 99% rename from demos/fbshow/fbshow.c rename to demos/spiv/spiv.c index 96fdf47..7882839 100644 --- a/demos/fbshow/fbshow.c +++ b/demos/spiv/spiv.c @@ -22,7 +22,7 @@ /* - Simple image viewer. + SPIV -- Simple but Powerfull Image Viewer. */ ----------------------------------------------------------------------- Summary of changes: demos/Makefile | 2 +- demos/{fbshow => spiv}/Makefile | 4 ++-- demos/{fbshow => spiv}/cpu_timer.c | 0 demos/{fbshow => spiv}/cpu_timer.h | 0 demos/{fbshow => spiv}/runtest.sh | 0 demos/{fbshow/fbshow.c => spiv/spiv.c} | 2 +- 6 files changed, 4 insertions(+), 4 deletions(-) rename demos/{fbshow => spiv}/Makefile (87%) rename demos/{fbshow => spiv}/cpu_timer.c (100%) rename demos/{fbshow => spiv}/cpu_timer.h (100%) rename demos/{fbshow => spiv}/runtest.sh (100%) rename demos/{fbshow/fbshow.c => spiv/spiv.c} (99%) 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: 16ac5bdd29c9a7d4eb0309240a9be235a7436c0f
by metan 11 Mar '12

11 Mar '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 16ac5bdd29c9a7d4eb0309240a9be235a7436c0f (commit) from 5177ae606db5d0f61c99540aeffb1d7b9114ebef (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/16ac5bdd29c9a7d4eb0309240a9be235a743… commit 16ac5bdd29c9a7d4eb0309240a9be235a7436c0f Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun Mar 11 22:06:28 2012 +0100 text: Add text drawing that mixes with context pixels Now we have two modes for 8BPP text rendering. One takes background color as parameter (which is what we allready had). And the second one reads pixels from the context pixels and mixes them with the font foreground color. diff --git a/include/text/GP_Text.h b/include/text/GP_Text.h index 86627e6..3111e73 100644 --- a/include/text/GP_Text.h +++ b/include/text/GP_Text.h @@ -42,6 +42,9 @@ * - GP_VALIGN_CENTER centers the text vertically at the point * - GP_VALIGN_BASELINE places the text baseline at the point * - GP_VALIGN_BELOW (or BOTTOM) draws the text below the point + * - GP_TEXT_NOBG mix the alpha pixels with data read from the context + * rather than mixing them with bg_color + * (which is slightly slower) */ typedef enum GP_TextAttr { GP_ALIGN_LEFT = 0x01, @@ -53,13 +56,17 @@ typedef enum GP_TextAttr { GP_VALIGN_BASELINE = 0x30, GP_VALIGN_BELOW = 0x40, GP_VALIGN_BOTTOM = GP_VALIGN_BELOW, + GP_TEXT_NOBG = 0x80, } GP_TextAttr; /* * Raw version, doesn't use Text aligment. + * + * If flags are set to GP_TEXT_NOBG the the bg_color is ignored and + * the context pixels are used for alpha mixing. */ void GP_Text_Raw(GP_Context *context, const GP_TextStyle *style, - GP_Coord x, GP_Coord y, + GP_Coord x, GP_Coord y, uint8_t flags, GP_Pixel fg_color, GP_Pixel bg_color, const char *str); diff --git a/libs/text/GP_Text.c b/libs/text/GP_Text.c index a5d5776..2c83a3a 100644 --- a/libs/text/GP_Text.c +++ b/libs/text/GP_Text.c @@ -52,7 +52,7 @@ static int do_align(GP_Coord *topleft_x, GP_Coord *topleft_y, int align, return 1; } - switch (align & 0xf0) { + switch (align & 0x70) { case GP_VALIGN_ABOVE: *topleft_y = y - height + 1; break; @@ -93,7 +93,7 @@ void GP_Text(GP_Context *context, const GP_TextStyle *style, "Invalid aligment flags"); GP_Text_Raw(context, style, topleft_x, topleft_y, - fg_color, bg_color, str); + align & GP_TEXT_NOBG, fg_color, bg_color, str); } diff --git a/libs/text/GP_Text.gen.c.t b/libs/text/GP_Text.gen.c.t index 22498af..f0acc30 100644 --- a/libs/text/GP_Text.gen.c.t +++ b/libs/text/GP_Text.gen.c.t @@ -84,13 +84,7 @@ static void text_draw_1BPP(GP_Context *context, GP_TextStyle *style, int x, int } } -%% for pt in pixeltypes -%% if not pt.is_unknown() - -static void text_draw_8BPP_{{ pt.name }}(GP_Context *context, GP_TextStyle *style, - GP_Coord x, GP_Coord y, - GP_Pixel fg, GP_Pixel bg, const char *str) -{ +%% macro text_8BPP(pt, use_bg) const char *p; GP_Coord y0 = y; @@ -120,10 +114,19 @@ static void text_draw_8BPP_{{ pt.name }}(GP_Context *context, GP_TextStyle *styl if (!gray) continue; - for (k = 0; k < style->pixel_ymul; k++) - GP_HLine(context, x_start, x_start + style->pixel_xmul - 1, - y - (glyph->bearing_y - style->font->ascend) * y_mul, + int cur_y = y - (glyph->bearing_y - style->font->ascend) * y_mul; + + for (k = 0; k < style->pixel_ymul; k++) { +%% if use_bg + GP_HLine(context, x_start, x_start + style->pixel_xmul - 1, cur_y, GP_MIX_PIXELS_{{ pt.name }}(fg, bg, gray)); +%% else + unsigned int l; + + for (l = x_start; l < x_start + style->pixel_xmul; l++) + GP_MixPixel_Raw_Clipped_{{ pt.name }}(context, l, cur_y, fg, gray); +%% endif + } } y += style->pixel_ymul + style->pixel_yspace; @@ -134,20 +137,37 @@ static void text_draw_8BPP_{{ pt.name }}(GP_Context *context, GP_TextStyle *styl if (p == str) x -= glyph->bearing_x * x_mul; } +%% endmacro + +%% for pt in pixeltypes +%% if not pt.is_unknown() + +static void text_8BPP_bg_{{ pt.name }}(GP_Context *context, GP_TextStyle *style, + GP_Coord x, GP_Coord y, + GP_Pixel fg, GP_Pixel bg, const char *str) +{ +{{ text_8BPP(pt, True) }} +} + +static void text_8BPP_{{ pt.name }}(GP_Context *context, GP_TextStyle *style, + GP_Coord x, GP_Coord y, + GP_Pixel fg, const char *str) +{ +{{ text_8BPP(pt, False) }} } %% endif %% endfor -static void text_draw_8BPP(GP_Context *context, GP_TextStyle *style, - GP_Coord x, GP_Coord y, - GP_Pixel fg, GP_Pixel bg, const char *str) +static void text_8BPP_bg(GP_Context *context, GP_TextStyle *style, + GP_Coord x, GP_Coord y, + GP_Pixel fg, GP_Pixel bg, const char *str) { switch (context->pixel_type) { %% for pt in pixeltypes %% if not pt.is_unknown() case GP_PIXEL_{{ pt.name }}: - text_draw_8BPP_{{ pt.name }}(context, style, x, y, fg, bg, str); + text_8BPP_bg_{{ pt.name }}(context, style, x, y, fg, bg, str); break; %% endif %% endfor @@ -156,9 +176,25 @@ static void text_draw_8BPP(GP_Context *context, GP_TextStyle *style, } } +static void text_8BPP(GP_Context *context, GP_TextStyle *style, + GP_Coord x, GP_Coord y, + GP_Pixel fg, const char *str) +{ + switch (context->pixel_type) { +%% for pt in pixeltypes +%% if not pt.is_unknown() + case GP_PIXEL_{{ pt.name }}: + text_8BPP_{{ pt.name }}(context, style, x, y, fg, str); + break; +%% endif +%% endfor + default: + GP_ABORT("Invalid context->pixel_type"); + } +} void GP_Text_Raw(GP_Context *context, GP_TextStyle *style, - GP_Coord x, GP_Coord y, + GP_Coord x, GP_Coord y, uint8_t flags, GP_Pixel fg, GP_Pixel bg, const char *str) { switch (style->font->glyph_bitmap_format) { @@ -166,7 +202,10 @@ void GP_Text_Raw(GP_Context *context, GP_TextStyle *style, text_draw_1BPP(context, style, x, y, fg, str); break; case GP_FONT_BITMAP_8BPP: - text_draw_8BPP(context, style, x, y, fg, bg, str); + if (flags) + text_8BPP(context, style, x, y, fg, str); + else + text_8BPP_bg(context, style, x, y, fg, bg, str); break; default: GP_ABORT("Invalid font glyph bitmap format"); ----------------------------------------------------------------------- Summary of changes: include/text/GP_Text.h | 9 +++++- libs/text/GP_Text.c | 4 +- libs/text/GP_Text.gen.c.t | 71 ++++++++++++++++++++++++++++++++++---------- 3 files changed, 65 insertions(+), 19 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: 5177ae606db5d0f61c99540aeffb1d7b9114ebef
by metan 11 Mar '12

11 Mar '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 5177ae606db5d0f61c99540aeffb1d7b9114ebef (commit) from f83ed3f17db2867b1b7e0fa6cbeed18fcd7dbbc8 (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/5177ae606db5d0f61c99540aeffb1d7b9114… commit 5177ae606db5d0f61c99540aeffb1d7b9114ebef Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun Mar 11 21:22:41 2012 +0100 pylib, demos: Another round of fixes for pyton 3.2 diff --git a/demos/py_simple/gravplots_AA.py b/demos/py_simple/gravplots_AA.py index 1b48453..284061e 100755 --- a/demos/py_simple/gravplots_AA.py +++ b/demos/py_simple/gravplots_AA.py @@ -69,35 +69,35 @@ class elem(object): def main(): bk = backends.BackendSDLInit(W, H, BPP, 0, "Gravplots AA") assert bk - print bk - print "Modify source for parameters," - print "Kill to terminate ;-)" + print(bk) + print("Modify source for parameters,") + print("Kill to terminate ;-)") black = bk.context.RGBToPixel(0, 0, 0) es = [elem() for i in range(N)] while True: for e in es: for e2 in es: - if not (e is e2): - e.grav(e2, 1.0) + if not (e is e2): + e.grav(e2, 1.0) for e in es: e.move(1.0) if AA: - x = int((e.x % W) * 0x100) - y = int(e.y * 0x100) - if e.vx > 0.2: - gfx.VLineAA(bk.context, x + 0x100, y - 0x300, y + 0x300, black) - if e.vx < -0.2: - gfx.VLineAA(bk.context, x - 0x100, y - 0x300, y + 0x300, black) - gfx.PutPixelAA(bk.context, x, y, bk.context.RGBToPixel(e.r, e.g, e.b)) + x = int((e.x % W) * 0x100) + y = int(e.y * 0x100) + if e.vx > 0.2: + gfx.VLineAA(bk.context, x + 0x100, y - 0x300, y + 0x300, black) + if e.vx < -0.2: + gfx.VLineAA(bk.context, x - 0x100, y - 0x300, y + 0x300, black) + gfx.PutPixelAA(bk.context, x, y, bk.context.RGBToPixel(e.r, e.g, e.b)) else: - x = int(e.x % W) - y = int(e.y) - if e.vx > 0.2: - gfx.VLine(bk.context, x + 1, y - 2, y + 2, black) - if e.vx < -0.2: - gfx.VLine(bk.context, x - 1, y - 2, y + 2, black) - core.PutPixel(bk.context, x, y, bk.context.RGBToPixel(e.r, e.g, e.b)) + x = int(e.x % W) + y = int(e.y) + if e.vx > 0.2: + gfx.VLine(bk.context, x + 1, y - 2, y + 2, black) + if e.vx < -0.2: + gfx.VLine(bk.context, x - 1, y - 2, y + 2, black) + core.PutPixel(bk.context, x, y, bk.context.RGBToPixel(e.r, e.g, e.b)) bk.Flip() global TIMEOUT if TIMEOUT > 0: diff --git a/demos/py_simple/plot.py b/demos/py_simple/plot.py index 96ce3e3..d58e574 100755 --- a/demos/py_simple/plot.py +++ b/demos/py_simple/plot.py @@ -15,71 +15,71 @@ env['cos'] = cos env['sqrt'] = sqrt def compute(func, x, y_min, y_max): - env['x'] = x - try: - ret = eval(func, env) - except ZeroDivisionError, d: - return -1 + env['x'] = x + try: + ret = eval(func, env) + except ZeroDivisionError: + return -1 - return - H * ret / (y_max - y_min) + (H * y_max) / (y_max - y_min) + return - H * ret / (y_max - y_min) + (H * y_max) / (y_max - y_min) def x_to_x(x, x_min, x_max): - return (x_max - x_min) * x / W + x_min + return (x_max - x_min) * x / W + x_min class plotter(object): - def __init__(self, func, x_min, x_max, y_min, y_max): - self.x = 0.0 - self.y = compute(func, x_to_x(self.x, x_min, x_max), y_min, y_max) - self.y_min = y_min - self.y_max = y_max - self.x_min = x_min - self.x_max = x_max - self.func = func - def next(self): - x = x_to_x(self.x + 1, self.x_min, self.x_max) - new_y = compute(self.func, x, self.y_min, self.y_max) - - inc = 1.0 - - while (abs(new_y - self.y) > 1 and inc > EPS): - x = x_to_x(self.x + inc, self.x_min, self.x_max) - new_y = compute(self.func, x, self.y_min, self.y_max) - inc /= 2 - - self.x += inc - self.y = new_y - - print self.x, self.y + def __init__(self, func, x_min, x_max, y_min, y_max): + self.x = 0.0 + self.y = compute(func, x_to_x(self.x, x_min, x_max), y_min, y_max) + self.y_min = y_min + self.y_max = y_max + self.x_min = x_min + self.x_max = x_max + self.func = func + def next(self): + x = x_to_x(self.x + 1, self.x_min, self.x_max) + new_y = compute(self.func, x, self.y_min, self.y_max) + + inc = 1.0 + + while (abs(new_y - self.y) > 1 and inc > EPS): + x = x_to_x(self.x + inc, self.x_min, self.x_max) + new_y = compute(self.func, x, self.y_min, self.y_max) + inc /= 2 + + self.x += inc + self.y = new_y + + print(self.x, self.y) def main(): - bk = backends.BackendSDLInit(W, H, 0, 0, "Plot AA") - assert bk - print bk - print "Modify source for parameters," - print "Kill to terminate ;-)" - print "Usage: function x_min x_max y_min y_max" - black = bk.context.RGBToPixel(0, 0, 0) - - x_min = float(sys.argv[2]) - x_max = float(sys.argv[3]) - y_min = float(sys.argv[4]) - y_max = float(sys.argv[5]) - p = plotter(sys.argv[1], x_min, x_max, y_min, y_max) - - r = 255 - g = 0 - b = 0 - - while p.x < W: - x = int((p.x + 0.5) * 0x100) - y = int((p.y + 0.5) * 0x100) - gfx.PutPixelAA(bk.context, x, y, bk.context.RGBToPixel(int(r), int(g), int(b))) - bk.Flip() - p.next() - - while True: - pass + bk = backends.BackendSDLInit(W, H, 0, 0, "Plot AA") + assert bk + print(bk) + print("Modify source for parameters,") + print("Kill to terminate ;-)") + print("Usage: function x_min x_max y_min y_max") + black = bk.context.RGBToPixel(0, 0, 0) + + x_min = float(sys.argv[2]) + x_max = float(sys.argv[3]) + y_min = float(sys.argv[4]) + y_max = float(sys.argv[5]) + p = plotter(sys.argv[1], x_min, x_max, y_min, y_max) + + r = 255 + g = 0 + b = 0 + + while p.x < W: + x = int((p.x + 0.5) * 0x100) + y = int((p.y + 0.5) * 0x100) + gfx.PutPixelAA(bk.context, x, y, bk.context.RGBToPixel(int(r), int(g), int(b))) + bk.Flip() + p.next() + + while True: + pass if __name__ == '__main__': - main() + main() diff --git a/demos/py_simple/sinplots_AA.py b/demos/py_simple/sinplots_AA.py index aa86bf9..1d29329 100755 --- a/demos/py_simple/sinplots_AA.py +++ b/demos/py_simple/sinplots_AA.py @@ -31,9 +31,9 @@ class plotter(object): def main(): bk = backends.BackendSDLInit(W, H, 16, 0, "Sinplots AA") assert bk - print bk - print "Modify source for parameters," - print "Kill to terminate ;-)" + print(bk) + print("Modify source for parameters,") + print("Kill to terminate ;-)") black = bk.context.RGBToPixel(0, 0, 0) ps = [plotter() for i in range(N)] @@ -44,15 +44,15 @@ def main(): (x, y) = p.pos(t) (r, g, b) = p.color(t) if AA: - x = int(x * 0x100) - y = int(y * 0x100) - gfx.VLineAA(bk.context, x + 0x100, y - 0x200, y + 0x200, black) - gfx.PutPixelAA(bk.context, x, y, bk.context.RGBToPixel(int(r), int(g), int(b))) + x = int(x * 0x100) + y = int(y * 0x100) + gfx.VLineAA(bk.context, x + 0x100, y - 0x200, y + 0x200, black) + gfx.PutPixelAA(bk.context, x, y, bk.context.RGBToPixel(int(r), int(g), int(b))) else: - x = int(x) - y = int(y) - gfx.VLine(bk.context, x + 1, y - 2, y + 2, black) - core.PutPixel(bk.context, x, y, bk.context.RGBToPixel(int(r), int(g), int(b))) + x = int(x) + y = int(y) + gfx.VLine(bk.context, x + 1, y - 2, y + 2, black) + core.PutPixel(bk.context, x, y, bk.context.RGBToPixel(int(r), int(g), int(b))) bk.Flip() if __name__ == '__main__': diff --git a/pylib/gfxprim/backends/__init__.py b/pylib/gfxprim/backends/__init__.py index 224e0e5..f0ebdae 100644 --- a/pylib/gfxprim/backends/__init__.py +++ b/pylib/gfxprim/backends/__init__.py @@ -22,7 +22,7 @@ def _init(module): extend_context(Context) # Extend GP_Backend with convenience methods - from _extend_backend import extend_backend + from ._extend_backend import extend_backend extend_backend(Backend) # Import some members from the SWIG module ----------------------------------------------------------------------- Summary of changes: demos/py_simple/gravplots_AA.py | 38 ++++++------ demos/py_simple/plot.py | 116 ++++++++++++++++++------------------ demos/py_simple/sinplots_AA.py | 22 ++++---- pylib/gfxprim/backends/__init__.py | 2 +- 4 files changed, 89 insertions(+), 89 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: f83ed3f17db2867b1b7e0fa6cbeed18fcd7dbbc8
by metan 10 Mar '12

10 Mar '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 f83ed3f17db2867b1b7e0fa6cbeed18fcd7dbbc8 (commit) from 7479594ee56b8759d967aa72795dc1b5fdfa2327 (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/f83ed3f17db2867b1b7e0fa6cbeed18fcd7d… commit f83ed3f17db2867b1b7e0fa6cbeed18fcd7dbbc8 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat Mar 10 21:56:30 2012 +0100 configure: Add check for swig. diff --git a/configure b/configure index 24fc5f2..394b1b7 100755 --- a/configure +++ b/configure @@ -48,6 +48,17 @@ def python_module_installed(cfg, module): sys.stderr.write('Yesn') return True +def check_for_swig(cfg): + sys.stderr.write("Checking for working swig ... ") + + ret = os.system("%s -version &> /dev/null" % cfg['SWIG'][0]) + + if ret: + sys.stderr.write('Non') + cfg['SWIG'][0] = '' + else: + sys.stderr.write("Yesn") + # # Library checking api # @@ -121,6 +132,7 @@ def basic_checks(cfg): exit(1) if not python_module_installed(cfg, 'jinja2'): exit(1) + check_for_swig(cfg) sys.stderr.write("n") # ----------------------------------------------------------------------- Summary of changes: configure | 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.")

1 0

[repo.or.cz] gfxprim.git branch master updated: 7479594ee56b8759d967aa72795dc1b5fdfa2327
by metan 10 Mar '12

10 Mar '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 7479594ee56b8759d967aa72795dc1b5fdfa2327 (commit) via 5e630cee800ff49fecff7495053b9d69cc46e7bf (commit) from 7b23123f57a91074e51df400c9a0a8bee83c69e0 (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/7479594ee56b8759d967aa72795dc1b5fdfa… commit 7479594ee56b8759d967aa72795dc1b5fdfa2327 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat Mar 10 21:29:32 2012 +0100 libs: Fix library build when SDL is not present. diff --git a/libs/SDL/GP_SDL_Context.c b/libs/SDL/GP_SDL_Context.c index f0a0747..5ced9cc 100644 --- a/libs/SDL/GP_SDL_Context.c +++ b/libs/SDL/GP_SDL_Context.c @@ -19,11 +19,16 @@ * 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> * * * *****************************************************************************/ #include "GP_Core.h" + +#include "../../config.h" + +#ifdef HAVE_LIBSDL + #include "GP_SDL.h" GP_RetCode GP_SDL_ContextFromSurface(GP_Context *context, SDL_Surface *surf) @@ -59,3 +64,5 @@ GP_RetCode GP_SDL_ContextFromSurface(GP_Context *context, SDL_Surface *surf) return GP_ESUCCESS; } + +#endif /* HAVE_LIBSDL */ diff --git a/libs/SDL/GP_SDL_VideoInit.c b/libs/SDL/GP_SDL_VideoInit.c index 4175d96..8ce6419 100644 --- a/libs/SDL/GP_SDL_VideoInit.c +++ b/libs/SDL/GP_SDL_VideoInit.c @@ -19,10 +19,14 @@ * 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> * * * *****************************************************************************/ +#include "../../config.h" + +#ifdef HAVE_LIBSDL + #include "GP.h" #include "GP_SDL.h" @@ -30,11 +34,10 @@ #include <string.h> GP_RetCode GP_SDL_VideoInit(GP_Context *context, int width, int height, - int argc, char **argv) + int argc, char **argv) { - if (context == NULL) { + if (context == NULL) return GP_ENULLPTR; - } /* switches that can be set on the command line */ int display_bpp = 0; @@ -42,28 +45,22 @@ GP_RetCode GP_SDL_VideoInit(GP_Context *context, int width, int height, if (argc > 0) { - if (argv == NULL) { + if (argv == NULL) return GP_ENULLPTR; - } /* extract settings from the command line */ int i; for (i = 1; i < argc; i++) { - if (strcmp(argv[i], "--8bpp") == 0) { + if (strcmp(argv[i], "--8bpp") == 0) display_bpp = 8; - } - else if (strcmp(argv[i], "--16bpp") == 0) { + else if (strcmp(argv[i], "--16bpp") == 0) display_bpp = 16; - } - else if (strcmp(argv[i], "--24bpp") == 0) { + else if (strcmp(argv[i], "--24bpp") == 0) display_bpp = 24; - } - else if (strcmp(argv[i], "--32bpp") == 0) { + else if (strcmp(argv[i], "--32bpp") == 0) display_bpp = 32; - } - else if (strcmp(argv[i], "--debug") == 0) { + else if (strcmp(argv[i], "--debug") == 0) debug = 1; - } } } @@ -110,3 +107,5 @@ GP_RetCode GP_SDL_VideoInit(GP_Context *context, int width, int height, return GP_ESUCCESS; } + +#endif /* HAVE_LIBSDL */ diff --git a/libs/backends/GP_SDL.c b/libs/backends/GP_SDL.c index 809d4b6..6a8d0d4 100644 --- a/libs/backends/GP_SDL.c +++ b/libs/backends/GP_SDL.c @@ -25,13 +25,13 @@ #include "../../config.h" +#ifdef HAVE_LIBSDL + #include "core/GP_Debug.h" #include "input/GP_InputDriverSDL.h" #include "GP_Backend.h" #include "GP_SDL.h" -#ifdef HAVE_LIBSDL - #include <SDL/SDL.h> #include <SDL/SDL_mutex.h> @@ -185,8 +185,13 @@ GP_Backend *GP_BackendSDLInit(GP_Size w, GP_Size h, uint8_t bpp, uint8_t flags, #else -GP_Backend *GP_BackendSDLInit(GP_Size w, GP_Size h, uint8_t bpp, uint8_t flags, - const char *caption) +#include "GP_Backend.h" + +GP_Backend *GP_BackendSDLInit(GP_Size w __attribute__((unused)), + GP_Size h __attribute__((unused)), + uint8_t bpp __attribute__((unused)), + uint8_t flags __attribute__((unused)), + const char *caption __attribute__((unused))) { return NULL; } diff --git a/libs/input/GP_InputDriverSDL.c b/libs/input/GP_InputDriverSDL.c index 967fdac..3b7ec01 100644 --- a/libs/input/GP_InputDriverSDL.c +++ b/libs/input/GP_InputDriverSDL.c @@ -16,10 +16,13 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, * * Boston, MA 02110-1301 USA * * * - * Copyright (C) 2009-2011 Cyril Hrubis <metan(a)ucw.cz> * + * Copyright (C) 2009-2012 Cyril Hrubis <metan(a)ucw.cz> * * * *****************************************************************************/ +#include "../../config.h" + +#ifdef HAVE_LIBSDL #include "GP_Event.h" #include "GP_InputDriverSDL.h" @@ -134,3 +137,5 @@ void GP_InputDriverSDLEventPut(SDL_Event *ev) break; } } + +#endif /* HAVE_LIBSDL */ http://repo.or.cz/w/gfxprim.git/commit/5e630cee800ff49fecff7495053b9d69cc46… commit 5e630cee800ff49fecff7495053b9d69cc46e7bf Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat Mar 10 20:57:46 2012 +0100 pylib: Fixes for python 3.2, still throws some warnings. diff --git a/pylib/gp_codegen/gfxprimconfig.py b/pylib/gp_codegen/gfxprimconfig.py index 81d3f32..39ad70f 100644 --- a/pylib/gp_codegen/gfxprimconfig.py +++ b/pylib/gp_codegen/gfxprimconfig.py @@ -40,10 +40,10 @@ class GfxPrimConfig(object): # Dictionary of all pixelsizes by BPP { bpp : list of BE, LE } self.pixelsizes_by_bpp = dict() for i in self.pixelsizes: - if i.size not in self.pixelsizes_by_bpp: - self.pixelsizes_by_bpp[i.size] = [i.bit_endian] - else: - self.pixelsizes_by_bpp[i.size].append(i.bit_endian) + if i.size not in self.pixelsizes_by_bpp: + self.pixelsizes_by_bpp[i.size] = [i.bit_endian] + else: + self.pixelsizes_by_bpp[i.size].append(i.bit_endian) # Set of all encountered channel names self.channels = set() diff --git a/pylib/gp_codegen/pixelsize.py b/pylib/gp_codegen/pixelsize.py index 88f7364..59f7c91 100644 --- a/pylib/gp_codegen/pixelsize.py +++ b/pylib/gp_codegen/pixelsize.py @@ -20,12 +20,12 @@ class PixelSize(object): self.suffix = suffix if not self.suffix: if self.size == 0: - self.suffix = "INVALID" + self.suffix = "INVALID" else: - if bit_endian: - self.suffix = '%dBPP_%s' % (size, bit_endian) - else: - self.suffix = '%dBPP' % (size,) + if bit_endian: + self.suffix = '%dBPP_%s' % (size, bit_endian) + else: + self.suffix = '%dBPP' % (size,) def needs_bit_endian(self): return (self.size % 8) != 0 @@ -33,7 +33,7 @@ class PixelSize(object): def description(self): if self.bit_endian: return "pixel size %d, bit endian %s, suffix %s" % (self.size, - self.bit_endian, self.suffix) + self.bit_endian, self.suffix) else: return "pixel size %d, suffix %s" % (self.size, self.suffix) diff --git a/pylib/gp_codegen/render_utils.py b/pylib/gp_codegen/render_utils.py index 9c9c1a8..0e781db 100644 --- a/pylib/gp_codegen/render_utils.py +++ b/pylib/gp_codegen/render_utils.py @@ -31,7 +31,7 @@ def create_environment(config, template_dir): env.globals['BE'] = BE env.globals['len'] = len env.globals['error'] = template_error - env.globals['hex'] = lambda(x): hex(x).rstrip('L') + env.globals['hex'] = lambda x: hex(x).rstrip('L') # Propagate some python buildins env.globals['int'] = int; env.globals['float'] = float; @@ -92,7 +92,10 @@ def load_gfxprimconfig(config_file = None): "BE": BE, "GfxPrimConfig": GfxPrimConfig } - execfile(config_file, globals(), l) + # python 3.2 doesn't have execfile, curse you python devs + # execfile(config_file, globals(), l) + exec(compile(open(config_file).read(), config_file, 'exec'), globals(), l) + config = l["config"] return config diff --git a/pylib/gp_codegen/test_collection.py b/pylib/gp_codegen/test_collection.py index 254cd21..ad3b78f 100644 --- a/pylib/gp_codegen/test_collection.py +++ b/pylib/gp_codegen/test_collection.py @@ -40,7 +40,7 @@ def find_tests(fname, suites): name, args = find_GP_directive("GP_SUITE", suite_re, l, fname=fname, line=i) if name: if args: - log.warning("%s:%s: Suite should have no arguments other than name.", fname, i) + log.warning("%s:%s: Suite should have no arguments other than name.", fname, i) suites.setdefault(name, []) suite = name # Look for test declaration @@ -48,10 +48,10 @@ def find_tests(fname, suites): if name: test_suite = suite if 'suite' in args: - test_suite = args['suite'] + test_suite = args['suite'] if not test_suite: - test_suite = 'default' - log.warning("%s:%s: No suite defined before test %s, using %r.", fname, i, name, test_suite) + test_suite = 'default' + log.warning("%s:%s: No suite defined before test %s, using %r.", fname, i, name, test_suite) args['name'] = name args['fname'] = fname args['line'] = i @@ -85,11 +85,11 @@ def find_GP_directive(name, regexp, l, fname='unknown', line=0): d = m.groups()[0].split(',', 1) args = {} if len(d)>1: - try: - s = 'dict( ' + d[1].strip(" tn"") + ' )' - args = eval(s) - except: - log.fatal("%s:%s: error parsing arguments: %r", fname, line, s) + try: + s = 'dict( ' + d[1].strip(" tn"") + ' )' + args = eval(s) + except: + log.fatal("%s:%s: error parsing arguments: %r", fname, line, s) return d[0].strip(), args return None, None ----------------------------------------------------------------------- Summary of changes: libs/SDL/GP_SDL_Context.c | 9 ++++++++- libs/SDL/GP_SDL_VideoInit.c | 31 +++++++++++++++---------------- libs/backends/GP_SDL.c | 13 +++++++++---- libs/input/GP_InputDriverSDL.c | 7 ++++++- pylib/gp_codegen/gfxprimconfig.py | 8 ++++---- pylib/gp_codegen/pixelsize.py | 12 ++++++------ pylib/gp_codegen/render_utils.py | 7 +++++-- pylib/gp_codegen/test_collection.py | 18 +++++++++--------- 8 files changed, 62 insertions(+), 43 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