Gfxprim

gfxprim@ucw.cz

929 discussions

[repo.or.cz] gfxprim.git branch master updated: a9124caa3f7c756fc3c7bdba6ffadd4307222454
by metan 07 Apr '12

07 Apr '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 a9124caa3f7c756fc3c7bdba6ffadd4307222454 (commit) via 1a1deab3f85d569bdac0c221b1924c1080b6c054 (commit) via ad9c55f95d4a092aa12b9212294d87d2d57b29ae (commit) via 5b78a3437eb7f15c79b8add4a1deffc57a67839d (commit) from 8c1e7985a175989be85334919aac053c290933a3 (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/a9124caa3f7c756fc3c7bdba6ffadd430722… commit a9124caa3f7c756fc3c7bdba6ffadd4307222454 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat Apr 7 20:00:28 2012 +0200 build: Don't build SDL tests when SDL is not available. diff --git a/tests/SDL/Makefile b/tests/SDL/Makefile index 7c91120..529dd83 100644 --- a/tests/SDL/Makefile +++ b/tests/SDL/Makefile @@ -5,9 +5,11 @@ CSOURCES=$(shell echo *.c) INCLUDE=core gfx SDL backends LDLIBS+=-lGP -L$(TOPDIR)/build/ -lGP_SDL -lSDL +ifeq ($(HAVE_LIBSDL),yes) APPS=pixeltest fileview fonttest linetest randomshapetest shapetest sierpinsky symbolstest textaligntest trianglefps input blittest subcontext showimage aatest mixpixeltest +endif include $(TOPDIR)/pre.mk include $(TOPDIR)/app.mk http://repo.or.cz/w/gfxprim.git/commit/1a1deab3f85d569bdac0c221b1924c1080b6… commit 1a1deab3f85d569bdac0c221b1924c1080b6c054 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat Apr 7 19:59:57 2012 +0200 build: Allow for empty APP in app.mk. diff --git a/app.mk b/app.mk index d852703..c743505 100644 --- a/app.mk +++ b/app.mk @@ -1,7 +1,3 @@ -ifndef APPS -$(error APPS not defined, fix your library Makefile) -endif - LDLIBS+=-lm -ldl ALL+=$(APPS) http://repo.or.cz/w/gfxprim.git/commit/ad9c55f95d4a092aa12b9212294d87d2d57b… commit ad9c55f95d4a092aa12b9212294d87d2d57b29ae Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat Apr 7 19:51:00 2012 +0200 configure: Propagage HAVE_LIBFOO into config.gen.mk too. diff --git a/configure b/configure index 51840ea..f26c95e 100755 --- a/configure +++ b/configure @@ -124,8 +124,12 @@ class libraries: # def write_config_mk(self, f): for i in self.libraries: + f.write("# %s - %sn" % (i[0], i[1])) if self.results[i[0]]: - f.write("# %snCFLAGS+=%snLDFLAGS+=%sn" % (i[0], i[3], i[4])) + f.write("HAVE_%s=yesn" % i[0].upper()) + f.write("CFLAGS+=%snLDFLAGS+=%sn" % (i[3], i[4])) + else: + f.write("HAVE_%s=non" % i[0].upper()) def basic_checks(cfg): sys.stderr.write("Basic checksn") http://repo.or.cz/w/gfxprim.git/commit/5b78a3437eb7f15c79b8add4a1deffc57a67… commit 5b78a3437eb7f15c79b8add4a1deffc57a67839d Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat Apr 7 19:38:52 2012 +0200 configure: reformat the code to use 4 spaces. diff --git a/configure b/configure index 60d6e14..51840ea 100755 --- a/configure +++ b/configure @@ -1,220 +1,222 @@ #!/usr/bin/env python # -# This is simple script to detect libraries and configure -# standard features. +# This is simple script to detect libraries and configure standard features. # import os import sys from optparse import OptionParser def header_exists(cfg, filename): - fpath = cfg['include_path'][0] + '/' + filename - - sys.stderr.write("Checking for '%s' ... " % fpath) - - try: - st = os.stat(fpath) - sys.stderr.write("Yesn") - return True - except os.error: - sys.stderr.write("Non") - return False + fpath = cfg['include_path'][0] + '/' + filename + + sys.stderr.write("Checking for '%s' ... " % fpath) + + try: + st = os.stat(fpath) + sys.stderr.write("Yesn") + return True + except os.error: + sys.stderr.write("Non") + return False def c_try_compile(cfg, code, msg): - sys.stderr.write(msg) - - ret = os.system("echo '%s' | %s -x c -o /dev/null - > /dev/null 2>&1" % (code, cfg["CC"][0])) - - if ret: - sys.stderr.write("Non") - return False - else: - sys.stderr.write("Yesn") - return True + sys.stderr.write(msg) + + ret = os.system("echo '%s' | %s -x c -o /dev/null - > /dev/null 2>&1" % + (code, cfg["CC"][0])) + + if ret: + sys.stderr.write("Non") + return False + else: + sys.stderr.write("Yesn") + return True def c_compiler_exists(cfg): - return c_try_compile(cfg, "int main(void) { return 0; }", - "Checking for working compiler (%s) ... " % cfg["CC"][0]) + return c_try_compile(cfg, "int main(void) { return 0; }", + "Checking for working compiler (%s) ... " % + cfg["CC"][0]) def python_module_installed(cfg, module): - sys.stderr.write("Checking for python module %s ... " % module) + sys.stderr.write("Checking for python module %s ... " % module) - ret = os.system("echo 'import %s' | %s > /dev/null 2>&1" % (module, cfg['PYTHON_BIN'][0])) + ret = os.system("echo 'import %s' | %s > /dev/null 2>&1" % + (module, cfg['PYTHON_BIN'][0])) - if ret: - sys.stderr.write('Non') - return False - else: - sys.stderr.write('Yesn') - return True + if ret: + sys.stderr.write('Non') + return False + else: + sys.stderr.write('Yesn') + return True def check_for_swig(cfg): - sys.stderr.write("Checking for working swig ... ") + sys.stderr.write("Checking for working swig ... ") - ret = os.system("%s -version > /dev/null 2>&1" % cfg['SWIG'][0]) + ret = os.system("%s -version > /dev/null 2>&1" % cfg['SWIG'][0]) - if ret: - sys.stderr.write('Non') - cfg['SWIG'][0] = '' - else: - sys.stderr.write("Yesn") + if ret: + sys.stderr.write('Non') + cfg['SWIG'][0] = '' + else: + sys.stderr.write("Yesn") # # Library checking api # class libraries: - def __init__(self, libraries, cfg): - self.libraries = libraries - self.cfg = cfg; - # Create dictionary for check results - self.results = dict() - # - # Print summary - # - def print_summary(self): - sys.stderr.write("Libraries to link againstn") - sys.stderr.write("-------------------------n") - - for i in self.libraries: - sys.stderr.write("%10s" % i[0]) - - if (self.results[i[0]]): - sys.stderr.write(" : Enabledn") - else: - sys.stderr.write(" : Disabledn") - - sys.stderr.write(" - %snn" % i[1]) - # - # Enable/Disable library - # - def set(self, name, val): - if name not in map(lambda s: s[0], self.libraries): - sys.stderr.write("ERROR: Invalid library '%s'n" % name) - exit(1) - else: - self.results[name] = val - # - # Calls a function on arguments, all is stored in array if - # not set previously - # (I know this smells like a lisp, but I can't help myself) - # - def check(self): - sys.stderr.write("Checking for librariesn") - sys.stderr.write("----------------------n") - for i in self.libraries: - if i[0] not in self.results: - self.results[i[0]] = i[2][0](self.cfg, *i[2][1:]) - sys.stderr.write("n") - # - # Writes '#define HAVE_XXX_H' into passed file - # - def write_config_h(self, f): - for i in self.libraries: - f.write("/*n * %sn */n" % i[1]) - if self.results[i[0]]: - f.write("#define HAVE_%sn" % i[0].upper()) - else: - f.write("//#define HAVE_%sn" % i[0].upper()) - f.write("n") - - # - # Writes LDFLAGS and CFLAGS into passed file - # - def write_config_mk(self, f): - for i in self.libraries: - if self.results[i[0]]: - f.write("# %snCFLAGS+=%snLDFLAGS+=%sn" % (i[0], i[3], i[4])) + def __init__(self, libraries, cfg): + self.libraries = libraries + self.cfg = cfg; + # Create dictionary for check results + self.results = dict() + # + # Print summary + # + def print_summary(self): + sys.stderr.write("Libraries to link againstn") + sys.stderr.write("-------------------------n") + + for i in self.libraries: + sys.stderr.write("%10s" % i[0]) + + if (self.results[i[0]]): + sys.stderr.write(" : Enabledn") + else: + sys.stderr.write(" : Disabledn") + + sys.stderr.write(" - %snn" % i[1]) + # + # Enable/Disable library + # + def set(self, name, val): + if name not in map(lambda s: s[0], self.libraries): + sys.stderr.write("ERROR: Invalid library '%s'n" % name) + exit(1) + else: + self.results[name] = val + # + # Calls a function on arguments, all is stored in array if + # not set previously + # (I know this smells like a lisp, but I can't help myself) + # + def check(self): + sys.stderr.write("Checking for librariesn") + sys.stderr.write("----------------------n") + for i in self.libraries: + if i[0] not in self.results: + self.results[i[0]] = i[2][0](self.cfg, *i[2][1:]) + sys.stderr.write("n") + # + # Writes '#define HAVE_XXX_H' into passed file + # + def write_config_h(self, f): + for i in self.libraries: + f.write("/*n * %sn */n" % i[1]) + if self.results[i[0]]: + f.write("#define HAVE_%sn" % i[0].upper()) + else: + f.write("//#define HAVE_%sn" % i[0].upper()) + f.write("n") + + # + # Writes LDFLAGS and CFLAGS into passed file + # + def write_config_mk(self, f): + for i in self.libraries: + if self.results[i[0]]: + f.write("# %snCFLAGS+=%snLDFLAGS+=%sn" % (i[0], i[3], i[4])) def basic_checks(cfg): - sys.stderr.write("Basic checksn") - sys.stderr.write("------------n") - if not c_compiler_exists(cfg): - exit(1) - if not python_module_installed(cfg, 'jinja2'): - exit(1) - check_for_swig(cfg) - sys.stderr.write("n") + sys.stderr.write("Basic checksn") + sys.stderr.write("------------n") + if not c_compiler_exists(cfg): + exit(1) + if not python_module_installed(cfg, 'jinja2'): + exit(1) + check_for_swig(cfg) + sys.stderr.write("n") # # Write configuration files # def write_config_h(cfg, libs): - f = open("config.h", "w") - f.write("#ifndef CONFIG_Hn#define CONFIG_Hnn") - libs.write_config_h(f); - f.write("#endif /* CONFIG_H */n"); - sys.stderr.write("Config 'config.h' writtenn") - f.close() + f = open("config.h", "w") + f.write("#ifndef CONFIG_Hn#define CONFIG_Hnn") + libs.write_config_h(f); + f.write("#endif /* CONFIG_H */n"); + sys.stderr.write("Config 'config.h' writtenn") + f.close() def write_config_mk(cfg, libs): - f = open('config.gen.mk', 'w') - for i in cfg: - f.write("# %sn%s=%sn" % (cfg[i][1], i, cfg[i][0])) - libs.write_config_mk(f); - f.close() - sys.stderr.write("Config 'config.gen.mk' writtenn") + f = open('config.gen.mk', 'w') + for i in cfg: + f.write("# %sn%s=%sn" % (cfg[i][1], i, cfg[i][0])) + libs.write_config_mk(f); + f.close() + sys.stderr.write("Config 'config.gen.mk' writtenn") if __name__ == '__main__': - # - # Dictionary for default configuration parameters - # - cfg = {'CC' : ['gcc', 'Path/name of the C compiler'], - 'CFLAGS' : ['-W -Wall -Wextra -fPIC -O2 -ggdb', 'C compiler flags'], - 'PYTHON_BIN' : ['python', 'Path/name of python interpreter'], - 'SWIG' : ['swig', 'Simplified Wrapper and Interface Generator'], - 'include_path': ['/usr/include', 'Path to the system headers']} - - # - # Library detection/enable disable - # - # name, description, [detection], cflags, ldflags - # - l = libraries([["libpng", - "Portable Network Graphics Library", - [header_exists, "png.h"], "", "-lpng"], - ["libsdl", - "Simple Direct Media Layer", - [header_exists, "SDL/SDL.h"], "", ""], - ["jpeg", - "Library to load, handle and manipulate images in the JPEG format", - [header_exists, "jpeglib.h"], "", "-ljpeg"], - ["freetype", - "A high-quality and portable font engine", - [header_exists, "ft2build.h"], "", "`freetype-config --libs`"]], cfg) - - parser = OptionParser(); - - # Enable disable libraries for linking - parser.add_option("-e", "--enable", dest="enable", action="append", - help="force enable library linking", metavar="libfoo") - parser.add_option("-d", "--disable", dest="disable", action="append", - help="disable library linking", metavar="libfoo") - - # Add cfg config options - for i in cfg: - parser.add_option("", "--"+i, dest=i, metavar=cfg[i][0], help=cfg[i][1]) - - (options, args) = parser.parse_args(); - - # - # Enable/Disable libraries as user requested - # These are not checked later - # - if options.enable: - for i in options.enable: - l.set(i, True); - if options.disable: - for i in options.disable: - l.set(i, False); - - for i in cfg: - if getattr(options, i): - cfg[i][0] = getattr(options, i) - - basic_checks(cfg); - - l.check() - l.print_summary() - - write_config_h(cfg, l); - write_config_mk(cfg, l); + # + # Dictionary for default configuration parameters + # + cfg = {'CC' : ['gcc', 'Path/name of the C compiler'], + 'CFLAGS' : ['-W -Wall -Wextra -fPIC -O2 -ggdb', 'C compiler flags'], + 'PYTHON_BIN' : ['python', 'Path/name of python interpreter'], + 'SWIG' : ['swig', 'Simplified Wrapper and Interface Generator'], + 'include_path': ['/usr/include', 'Path to the system headers']} + + # + # Library detection/enable disable + # + # name, description, [detection], cflags, ldflags + # + l = libraries([["libpng", + "Portable Network Graphics Library", + [header_exists, "png.h"], "", "-lpng"], + ["libsdl", + "Simple Direct Media Layer", + [header_exists, "SDL/SDL.h"], "", ""], + ["jpeg", + "Library to load, handle and manipulate images in the JPEG format", + [header_exists, "jpeglib.h"], "", "-ljpeg"], + ["freetype", + "A high-quality and portable font engine", + [header_exists, "ft2build.h"], "", "`freetype-config --libs`"]], cfg) + + parser = OptionParser(); + + # Enable disable libraries for linking + parser.add_option("-e", "--enable", dest="enable", action="append", + help="force enable library linking", metavar="libfoo") + parser.add_option("-d", "--disable", dest="disable", action="append", + help="disable library linking", metavar="libfoo") + + # Add cfg config options + for i in cfg: + parser.add_option("", "--"+i, dest=i, metavar=cfg[i][0], help=cfg[i][1]) + + (options, args) = parser.parse_args(); + + # + # Enable/Disable libraries as user requested + # These are not checked later + # + if options.enable: + for i in options.enable: + l.set(i, True); + if options.disable: + for i in options.disable: + l.set(i, False); + + for i in cfg: + if getattr(options, i): + cfg[i][0] = getattr(options, i) + + basic_checks(cfg); + + l.check() + l.print_summary() + + write_config_h(cfg, l); + write_config_mk(cfg, l); ----------------------------------------------------------------------- Summary of changes: app.mk | 4 - configure | 374 ++++++++++++++++++++++++++-------------------------- tests/SDL/Makefile | 2 + 3 files changed, 192 insertions(+), 188 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: 8c1e7985a175989be85334919aac053c290933a3
by metan 07 Apr '12

07 Apr '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 8c1e7985a175989be85334919aac053c290933a3 (commit) from 8bb3b493c0a89be19912de69a505e78708f98b19 (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/8c1e7985a175989be85334919aac053c2909… commit 8c1e7985a175989be85334919aac053c290933a3 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat Apr 7 19:31:15 2012 +0200 demos: Add simple ttf font demo. diff --git a/demos/Makefile b/demos/Makefile index 3198465..1d61deb 100644 --- a/demos/Makefile +++ b/demos/Makefile @@ -1,3 +1,3 @@ TOPDIR=.. -SUBDIRS=grinder spiv particle +SUBDIRS=grinder spiv particle ttf2img include $(TOPDIR)/post.mk diff --git a/demos/ttf2img/Makefile b/demos/ttf2img/Makefile new file mode 100644 index 0000000..aab67a7 --- /dev/null +++ b/demos/ttf2img/Makefile @@ -0,0 +1,12 @@ +TOPDIR=../.. + +CSOURCES=$(shell echo *.c) + +INCLUDE= +LDLIBS+=-lGP -L$(TOPDIR)/build/ + +APPS=ttf2img + +include $(TOPDIR)/pre.mk +include $(TOPDIR)/app.mk +include $(TOPDIR)/post.mk diff --git a/demos/ttf2img/runtest.sh b/demos/ttf2img/runtest.sh new file mode 100755 index 0000000..0794707 --- /dev/null +++ b/demos/ttf2img/runtest.sh @@ -0,0 +1,9 @@ +#!/bin/bash +# +# Run dynamically linked test. +# + +PROG="$1" +shift + +LD_LIBRARY_PATH=../../build/ ./$PROG "$@" diff --git a/demos/ttf2img/ttf2img.c b/demos/ttf2img/ttf2img.c new file mode 100644 index 0000000..0dea1fe --- /dev/null +++ b/demos/ttf2img/ttf2img.c @@ -0,0 +1,96 @@ +/***************************************************************************** + * This file is part of gfxprim library. * + * * + * Gfxprim is free software; you can redistribute it and/or * + * modify it under the terms of the GNU Lesser General Public * + * License as published by the Free Software Foundation; either * + * version 2.1 of the License, or (at your option) any later version. * + * * + * Gfxprim is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with gfxprim; if not, write to the Free Software * + * Foundation, Inc., 51 Franklin Street, Fifth Floor, * + * Boston, MA 02110-1301 USA * + * * + * Copyright (C) 2009-2012 Cyril Hrubis <metan(a)ucw.cz> * + * * + *****************************************************************************/ + + /* + + Uses gfxprim to render small image with defined string. + + */ + +#include <GP.h> + +static const char help[] = { + "usage: ttf2img -f font.ttf -i file.png -s string [-d debug_level]n", +}; + +static void print_help(int i) +{ + fputs(help, stderr); + exit(i); +} + +int main(int argc, char *argv[]) +{ + const char *font_path = NULL; + const char *img_path = NULL; + const char *string = "Foo Bar!"; + int opt, debug_level = 0; + int img_w = 400, img_h = 100; + + while ((opt = getopt(argc, argv, "d:f:i:s:")) != -1) { + switch (opt) { + case 'f': + font_path = optarg; + break; + case 'i': + img_path = optarg; + break; + case 'd': + debug_level = atoi(optarg); + break; + case 'h': + print_help(0); + break; + case 's': + string = optarg; + break; + default: + fprintf(stderr, "Invalid paramter '%c'n", opt); + print_help(1); + } + } + + if (font_path == NULL || img_path == NULL) + print_help(1); + + GP_SetDebugLevel(debug_level); + + GP_Context *context = GP_ContextAlloc(img_w, img_h, GP_PIXEL_RGB888); + + GP_Pixel black_pixel = GP_ColorToContextPixel(GP_COL_BLACK, context); + GP_Pixel white_pixel = GP_ColorToContextPixel(GP_COL_WHITE, context); + + GP_Fill(context, white_pixel); + + GP_TextStyle style = GP_DEFAULT_TEXT_STYLE; + + style.font = GP_FontFaceLoad(font_path, 27, 0); + + GP_Text(context, &style, img_w/2, img_h/2, GP_ALIGN_CENTER|GP_VALIGN_CENTER, + black_pixel, white_pixel, string); + + GP_SavePNG(img_path, context, NULL); + + GP_ContextFree(context); + + return 0; +} ----------------------------------------------------------------------- Summary of changes: demos/Makefile | 2 +- demos/{grinder => ttf2img}/Makefile | 6 +- demos/{particle => ttf2img}/runtest.sh | 0 demos/{particle/space.h => ttf2img/ttf2img.c} | 94 +++++++++++++++---------- 4 files changed, 60 insertions(+), 42 deletions(-) copy demos/{grinder => ttf2img}/Makefile (70%) copy demos/{particle => ttf2img}/runtest.sh (100%) copy demos/{particle/space.h => ttf2img/ttf2img.c} (54%) 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: 8bb3b493c0a89be19912de69a505e78708f98b19
by metan 03 Apr '12

03 Apr '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 8bb3b493c0a89be19912de69a505e78708f98b19 (commit) from fde90a28ce68be92f54b9ca7be882ddc7eb20361 (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/8bb3b493c0a89be19912de69a505e78708f9… commit 8bb3b493c0a89be19912de69a505e78708f98b19 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Tue Apr 3 00:45:02 2012 +0200 core: Fix subcontext rotation. diff --git a/libs/core/GP_Context.c b/libs/core/GP_Context.c index ca95b46..87a44d1 100644 --- a/libs/core/GP_Context.c +++ b/libs/core/GP_Context.c @@ -161,6 +161,9 @@ GP_Context *GP_ContextSubContext(GP_Context *context, GP_Context *subcontext, GP_Coord x, GP_Coord y, GP_Size w, GP_Size h) { GP_CHECK(context, "NULL context"); + + GP_TRANSFORM_RECT(context, x, y, w, h); + GP_CHECK(context->w >= x + w, "Subcontext w out of original context."); GP_CHECK(context->h >= y + h, "Subcontext h out of original context."); ----------------------------------------------------------------------- Summary of changes: libs/core/GP_Context.c | 3 +++ 1 files changed, 3 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: 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

← Newer
1
...
58
59
60
61
62
63
64
...
93
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

Gfxprim