Gfxprim February 2012

gfxprim@ucw.cz

2 participants
48 discussions

[repo.or.cz] gfxprim.git branch pywrap updated: 728d939d4eb86089c8c09a13c6e7b8694a067d2c
by metan 25 Feb '12

25 Feb '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, pywrap has been updated via 728d939d4eb86089c8c09a13c6e7b8694a067d2c (commit) from 2f2ccc529e4ea63e975e7815f0259f2ff3711deb (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/728d939d4eb86089c8c09a13c6e7b8694a06… commit 728d939d4eb86089c8c09a13c6e7b8694a067d2c Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat Feb 25 15:10:34 2012 +0100 demos: Fix python demos (the backend initalization has changed). diff --git a/demos/py_simple/gravplots_AA.py b/demos/py_simple/gravplots_AA.py index 3061d0a..1b48453 100755 --- a/demos/py_simple/gravplots_AA.py +++ b/demos/py_simple/gravplots_AA.py @@ -67,7 +67,7 @@ class elem(object): def main(): - bk = backends.BackendSDLInit(W, H, BPP, 0) + bk = backends.BackendSDLInit(W, H, BPP, 0, "Gravplots AA") assert bk print bk print "Modify source for parameters," diff --git a/demos/py_simple/sinplots_AA.py b/demos/py_simple/sinplots_AA.py index 1e2db04..aa86bf9 100755 --- a/demos/py_simple/sinplots_AA.py +++ b/demos/py_simple/sinplots_AA.py @@ -29,7 +29,7 @@ class plotter(object): def main(): - bk = backends.BackendSDLInit(W, H, 16, 0) + bk = backends.BackendSDLInit(W, H, 16, 0, "Sinplots AA") assert bk print bk print "Modify source for parameters," ----------------------------------------------------------------------- Summary of changes: demos/py_simple/gravplots_AA.py | 2 +- demos/py_simple/sinplots_AA.py | 2 +- 2 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 pywrap updated: 2f2ccc529e4ea63e975e7815f0259f2ff3711deb
by metan 25 Feb '12

25 Feb '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, pywrap has been updated via 2f2ccc529e4ea63e975e7815f0259f2ff3711deb (commit) via 56312f60da9d1cd165f522489a4c8b1821ec2820 (commit) via 90bea6f18d4e4562f63f196e9029fe2603793e83 (commit) via 89969fce89eede52612a2fa38ffa109dc66b38fb (commit) via bac5c04edb39e16dd0632b1d900daa77d350bdb1 (commit) via 7cb9b250da3dd979a43169cd7fdb47c0dbcb1437 (commit) via 5fe09088bb3606b059aab62e0decdb05e122e34f (commit) via 548b430abfdc45d7fdae3c88fc998c9431179f54 (commit) via 017a24fe557af8dfd0f3b98796ef439db5246a84 (commit) via 0a5fbacf4887f8cf496cf45c9fa7121f091f1153 (commit) via 40ef6e9a083f24ff72acc2a52e0902cb35d5a768 (commit) via c1d7712882e1eebc596ebba1dbf597deb66a105a (commit) via 95b8a1898cd06074a268d53022229875e689ed7b (commit) via 2988715637a4e169cf766abe2f777c76600180c7 (commit) via 30ca8e94204a8e1d24346bedc088197b0e877846 (commit) via 8fd80e09adcbee684f691159ea96bb852c5d17a8 (commit) via b2930cfac623e072342fd297ad3b82e28e2aba83 (commit) from 2465d9f19ff464a62ca5a8488188cf234eac2fc0 (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/2f2ccc529e4ea63e975e7815f0259f2ff371… commit 2f2ccc529e4ea63e975e7815f0259f2ff3711deb Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat Feb 25 15:01:56 2012 +0100 build: Update pywrap build system. diff --git a/pylib/gfxprim/Makefile b/pylib/gfxprim/Makefile index e668b60..71ce926 100644 --- a/pylib/gfxprim/Makefile +++ b/pylib/gfxprim/Makefile @@ -1,3 +1,3 @@ TOPDIR=../.. SUBDIRS=core loaders backends gfx filters text -include $(TOPDIR)/include.mk +include $(TOPDIR)/post.mk diff --git a/pylib/gfxprim/backends/Makefile b/pylib/gfxprim/backends/Makefile index 11180f9..66f7833 100644 --- a/pylib/gfxprim/backends/Makefile +++ b/pylib/gfxprim/backends/Makefile @@ -2,5 +2,7 @@ TOPDIR=../../.. LIBNAME=backends INCLUDE=core LDLIBS+=-lGP_backends -lSDL + +include $(TOPDIR)/pre.mk include $(TOPDIR)/pywrap.mk -include $(TOPDIR)/include.mk +include $(TOPDIR)/post.mk diff --git a/pylib/gfxprim/core/Makefile b/pylib/gfxprim/core/Makefile index 312df53..5d655a8 100644 --- a/pylib/gfxprim/core/Makefile +++ b/pylib/gfxprim/core/Makefile @@ -1,4 +1,6 @@ TOPDIR=../../.. LIBNAME=core + +include $(TOPDIR)/pre.mk include $(TOPDIR)/pywrap.mk -include $(TOPDIR)/include.mk +include $(TOPDIR)/post.mk diff --git a/pylib/gfxprim/filters/Makefile b/pylib/gfxprim/filters/Makefile index 6e03032..b1faad7 100644 --- a/pylib/gfxprim/filters/Makefile +++ b/pylib/gfxprim/filters/Makefile @@ -1,5 +1,7 @@ TOPDIR=../../.. LIBNAME=filters INCLUDE=core + +include $(TOPDIR)/pre.mk include $(TOPDIR)/pywrap.mk -include $(TOPDIR)/include.mk +include $(TOPDIR)/post.mk diff --git a/pylib/gfxprim/gfx/Makefile b/pylib/gfxprim/gfx/Makefile index db31c60..e8ba808 100644 --- a/pylib/gfxprim/gfx/Makefile +++ b/pylib/gfxprim/gfx/Makefile @@ -1,5 +1,7 @@ TOPDIR=../../.. LIBNAME=gfx INCLUDE=core + +include $(TOPDIR)/pre.mk include $(TOPDIR)/pywrap.mk -include $(TOPDIR)/include.mk +include $(TOPDIR)/post.mk diff --git a/pylib/gfxprim/loaders/Makefile b/pylib/gfxprim/loaders/Makefile index 196c9c1..41a94ed 100644 --- a/pylib/gfxprim/loaders/Makefile +++ b/pylib/gfxprim/loaders/Makefile @@ -1,5 +1,7 @@ TOPDIR=../../.. LIBNAME=loaders INCLUDE=core + +include $(TOPDIR)/pre.mk include $(TOPDIR)/pywrap.mk -include $(TOPDIR)/include.mk +include $(TOPDIR)/post.mk diff --git a/pylib/gfxprim/text/Makefile b/pylib/gfxprim/text/Makefile index 9549bc3..cebfb3c 100644 --- a/pylib/gfxprim/text/Makefile +++ b/pylib/gfxprim/text/Makefile @@ -1,5 +1,7 @@ TOPDIR=../../.. LIBNAME=text INCLUDE=core + +include $(TOPDIR)/pre.mk include $(TOPDIR)/pywrap.mk -include $(TOPDIR)/include.mk +include $(TOPDIR)/post.mk diff --git a/pywrap.mk b/pywrap.mk index b03ab6d..014393a 100644 --- a/pywrap.mk +++ b/pywrap.mk @@ -13,7 +13,7 @@ ifneq ($(SWIG),) INCLUDES+=$(addprefix -I$(TOPDIR)/include/, $(INCLUDE)) -all: $(SWIG_LIB) $(SWIG_PY) +ALL+=$(SWIG_LIB) $(SWIG_PY) $(SWIG_C) $(SWIG_PY): $(SWIG_SRC) ifdef VERBOSE http://repo.or.cz/w/gfxprim.git/commit/56312f60da9d1cd165f522489a4c8b1821ec… commit 56312f60da9d1cd165f522489a4c8b1821ec2820 Merge: 2465d9f 90bea6f Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat Feb 25 14:55:31 2012 +0100 Merge branch 'master' into pywrap Conflicts: pylib/Makefile diff --cc include/core/Makefile index 7eb72be,95e7064..340958b --- a/include/core/Makefile +++ b/include/core/Makefile @@@ -1,7 -1,9 +1,9 @@@ TOPDIR=../.. GENHEADERS=GP_Convert_Scale.gen.h GP_Pixel.gen.h GP_GetPutPixel.gen.h GP_Convert.gen.h GP_FnPerBpp.gen.h - GP_MixPixels.gen.h GP_GammaCorrection.gen.h + GP_MixPixels.gen.h GP_GammaCorrection.gen.h LIBNAME=core + + include $(TOPDIR)/pre.mk include $(TOPDIR)/gen.mk - include $(TOPDIR)/include.mk + include $(TOPDIR)/post.mk ----------------------------------------------------------------------- Summary of changes: Makefile | 6 +- app.mk | 3 +- demos/Makefile | 2 +- demos/fbshow/Makefile | 3 +- demos/fbshow/fbshow.c | 44 ++--- demos/grinder/Makefile | 3 +- demos/grinder/grinder.c | 63 +++++- demos/particle/Makefile | 3 +- demos/particle/particle_demo.c | 17 +-- demos/particle/space.c | 2 +- gen.mk | 7 +- include/GP.h | 4 +- include/Makefile | 2 +- include/backends/GP_Backend.h | 15 +- .../GP_BMP.h => backends/GP_BackendInit.h} | 48 +++--- include/backends/GP_Backends.h | 11 +- include/backends/GP_SDL.h | 5 +- include/core/Makefile | 4 +- include/input/GP_Event.h | 2 +- .../{backends/GP_Backends.h => input/GP_Input.h} | 22 +-- lib.mk | 42 ++-- libs/Makefile | 2 +- libs/SDL/Makefile | 4 +- .../GP_Backends.h => libs/backends/GP_Backend.c | 33 ++-- libs/backends/GP_BackendInit.c | 216 ++++++++++++++++++++ libs/backends/GP_SDL.c | 23 ++- libs/backends/Makefile | 4 +- libs/core/Makefile | 3 +- libs/filters/Makefile | 3 +- libs/gfx/Makefile | 3 +- libs/input/Makefile | 4 +- libs/loaders/Makefile | 4 +- libs/text/Makefile | 3 +- include.mk => post.mk | 25 ++- pre.mk | 1 + pylib/Makefile | 7 +- pylib/gfxprim/Makefile | 2 +- pylib/gfxprim/backends/Makefile | 4 +- pylib/gfxprim/core/Makefile | 4 +- pylib/gfxprim/filters/Makefile | 4 +- pylib/gfxprim/gfx/Makefile | 4 +- pylib/gfxprim/loaders/Makefile | 4 +- pylib/gfxprim/text/Makefile | 4 +- pywrap.mk | 2 +- tests/Makefile | 2 +- tests/SDL/Makefile | 3 +- tests/core/Makefile | 2 +- tests/drivers/Makefile | 3 +- 48 files changed, 484 insertions(+), 197 deletions(-) copy include/{loaders/GP_BMP.h => backends/GP_BackendInit.h} (67%) copy include/{backends/GP_Backends.h => input/GP_Input.h} (86%) copy include/backends/GP_Backends.h => libs/backends/GP_Backend.c (78%) create mode 100644 libs/backends/GP_BackendInit.c rename include.mk => post.mk (79%) create mode 100644 pre.mk 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: 90bea6f18d4e4562f63f196e9029fe2603793e83
by metan 25 Feb '12

25 Feb '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 90bea6f18d4e4562f63f196e9029fe2603793e83 (commit) from 89969fce89eede52612a2fa38ffa109dc66b38fb (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/90bea6f18d4e4562f63f196e9029fe260379… commit 90bea6f18d4e4562f63f196e9029fe2603793e83 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat Feb 25 14:52:54 2012 +0100 build: Small cleanup + rebuild target. diff --git a/Makefile b/Makefile index 6337e40..d180dd5 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ TOPDIR=. SUBDIRS=include libs tests pylib demos -include include.mk +include post.mk # # Make sure tests are build after library and diff --git a/app.mk b/app.mk index 460ebf7..d852703 100644 --- a/app.mk +++ b/app.mk @@ -4,8 +4,7 @@ endif LDLIBS+=-lm -ldl -all: $(APPS) - +ALL+=$(APPS) CLEAN+=$(APPS) %: %.o diff --git a/demos/Makefile b/demos/Makefile index 107f998..c148243 100644 --- a/demos/Makefile +++ b/demos/Makefile @@ -1,3 +1,3 @@ TOPDIR=.. SUBDIRS=grinder fbshow particle -include $(TOPDIR)/include.mk +include $(TOPDIR)/post.mk diff --git a/demos/fbshow/Makefile b/demos/fbshow/Makefile index c5acfc4..8921aff 100644 --- a/demos/fbshow/Makefile +++ b/demos/fbshow/Makefile @@ -11,5 +11,6 @@ APPS=fbshow fbshow: cpu_timer.o -include $(TOPDIR)/include.mk +include $(TOPDIR)/pre.mk include $(TOPDIR)/app.mk +include $(TOPDIR)/post.mk diff --git a/demos/grinder/Makefile b/demos/grinder/Makefile index c77d449..56117e6 100644 --- a/demos/grinder/Makefile +++ b/demos/grinder/Makefile @@ -9,5 +9,6 @@ APPS=grinder grinder: params.o histogram.o -include $(TOPDIR)/include.mk +include $(TOPDIR)/pre.mk include $(TOPDIR)/app.mk +include $(TOPDIR)/post.mk diff --git a/demos/particle/Makefile b/demos/particle/Makefile index 9843284..17cd059 100644 --- a/demos/particle/Makefile +++ b/demos/particle/Makefile @@ -9,5 +9,6 @@ APPS=particle_demo $(APPS): space.o -include $(TOPDIR)/include.mk +include $(TOPDIR)/pre.mk include $(TOPDIR)/app.mk +include $(TOPDIR)/post.mk diff --git a/gen.mk b/gen.mk index ef10aa4..14aac0d 100644 --- a/gen.mk +++ b/gen.mk @@ -1,5 +1,5 @@ # -# This is makefile rule for generating C sources from python generators +# This is makefile rule for generating C sources from python templates # ifndef LIBNAME $(error LIBNAME not defined, fix your library Makefile) @@ -14,14 +14,14 @@ GENSOURCES= endif # -# Generate genfiles for generated sources +# We add these to CSOURCES which is handled in post.mk # CSOURCES+=$(GENSOURCES) # # Make the genrated headers actually build # -all: $(GENHEADERS) $(GENSOURCES) +ALL+=$(GENHEADERS) $(GENSOURCES) # # Base common templates location @@ -49,4 +49,3 @@ else @echo "GEN $@" @${PYTHON} ${TOPDIR}/pylib/bin/generate_file.py -t $(TEMPLATE_DIR) "$@.t" "$@" endif - diff --git a/include/Makefile b/include/Makefile index 03277e3..f098ae0 100644 --- a/include/Makefile +++ b/include/Makefile @@ -1,3 +1,3 @@ TOPDIR=.. SUBDIRS=core -include $(TOPDIR)/include.mk +include $(TOPDIR)/post.mk diff --git a/include/core/Makefile b/include/core/Makefile index bf82884..95e7064 100644 --- a/include/core/Makefile +++ b/include/core/Makefile @@ -3,5 +3,7 @@ GENHEADERS=GP_Convert_Scale.gen.h GP_Pixel.gen.h GP_GetPutPixel.gen.h GP_Convert.gen.h GP_FnPerBpp.gen.h GP_MixPixels.gen.h GP_GammaCorrection.gen.h LIBNAME=core + +include $(TOPDIR)/pre.mk include $(TOPDIR)/gen.mk -include $(TOPDIR)/include.mk +include $(TOPDIR)/post.mk diff --git a/lib.mk b/lib.mk index 397515a..1eceafa 100644 --- a/lib.mk +++ b/lib.mk @@ -1,31 +1,27 @@ +# +# Most of the libraries just generate object files that +# are later linked in build into the libGP.so +# ifndef LIBNAME $(error LIBNAME not defined, fix your library Makefile) endif -LIB=libGP_$(LIBNAME) -LIBP=$(TOPDIR)/build/ - # -# If set to yes, builds single library for directory +# Rules for single library, applied only when objects +# are not linked to the libGP.so. This generates libGP_$(LIBNAME). # ifeq ($(BUILDLIB),yes) -all: $(LIBP)$(LIB).so $(LIBP)$(LIB).a -endif +# BUILDLIB = yes -ifeq ($(BUILDLIB),yes) +LIB=libGP_$(LIBNAME) +LIBP=$(TOPDIR)/build/ + +ALL+=$(LIBP)$(LIB).so $(LIBP)$(LIB).a CLEAN+=$(LIBP)$(LIB).so $(LIBP)$(LIB).so.0 $(LIBP)$(LIB).a -endif +OBJS=$(CSOURCES:.c=.o) -# -# Trigger libGP.XX library rebuild -# -all: $(OBJECTS) - @$(MAKE) --no-print-directory -C $(TOPDIR)/build/ -# -# Rules for single library -# -$(LIBP)$(LIB).so: $(OBJECTS) +$(LIBP)$(LIB).so: $(OBJS) ifdef VERBOSE rm -f $(LIBP)$(LIB).so.0 cd $(LIBP) && ln -s $(LIB).so $(LIB).so.0 @@ -37,7 +33,7 @@ else @$(CC) -fPIC -dPIC --shared -Wl,-soname -Wl,$(LIB).so.0 $(OBJECTS) -o $@ endif -$(LIBP)$(LIB).a: $(OBJECTS) +$(LIBP)$(LIB).a: $(OBJS) ifdef VERBOSE $(AR) rcs $@ $(OBJECTS) else @@ -45,4 +41,12 @@ else @$(AR) rcs $@ $(OBJECTS) endif -CLEAN+=$(OBJECTS) +else +# BUILDLIB = no + +ALL+=rebuild_lib + +rebuild_lib: + @$(MAKE) --no-print-directory -C $(TOPDIR)/build/ + +endif diff --git a/libs/Makefile b/libs/Makefile index 0842fc9..01fbd7a 100644 --- a/libs/Makefile +++ b/libs/Makefile @@ -1,3 +1,3 @@ TOPDIR=.. SUBDIRS=core gfx text loaders filters input backends SDL -include $(TOPDIR)/include.mk +include $(TOPDIR)/post.mk diff --git a/libs/SDL/Makefile b/libs/SDL/Makefile index 5ce0549..637277c 100644 --- a/libs/SDL/Makefile +++ b/libs/SDL/Makefile @@ -3,5 +3,7 @@ CSOURCES=$(shell ls *.c) INCLUDE=core LIBNAME=SDL BUILDLIB=yes -include $(TOPDIR)/include.mk + +include $(TOPDIR)/pre.mk include $(TOPDIR)/lib.mk +include $(TOPDIR)/post.mk diff --git a/libs/backends/Makefile b/libs/backends/Makefile index 60bbdaf..e59e2c1 100644 --- a/libs/backends/Makefile +++ b/libs/backends/Makefile @@ -2,5 +2,7 @@ TOPDIR=../.. CSOURCES=$(shell ls *.c) LIBNAME=backends BUILDLIB=yes -include $(TOPDIR)/include.mk + +include $(TOPDIR)/pre.mk include $(TOPDIR)/lib.mk +include $(TOPDIR)/post.mk diff --git a/libs/core/Makefile b/libs/core/Makefile index 2baef75..65d8440 100644 --- a/libs/core/Makefile +++ b/libs/core/Makefile @@ -4,6 +4,7 @@ GENSOURCES=GP_Pixel.gen.c GP_Blit.gen.c GP_Convert.gen.c CSOURCES=$(filter-out $(wildcard *.gen.c),$(wildcard *.c)) LIBNAME=core +include $(TOPDIR)/pre.mk include $(TOPDIR)/gen.mk -include $(TOPDIR)/include.mk include $(TOPDIR)/lib.mk +include $(TOPDIR)/post.mk diff --git a/libs/filters/Makefile b/libs/filters/Makefile index d3b6012..216d06d 100644 --- a/libs/filters/Makefile +++ b/libs/filters/Makefile @@ -15,9 +15,10 @@ CSOURCES=$(filter-out $(wildcard *.gen.c),$(wildcard *.c)) LIBNAME=filters INCLUDE=core +include $(TOPDIR)/pre.mk include $(TOPDIR)/gen.mk -include $(TOPDIR)/include.mk include $(TOPDIR)/lib.mk +include $(TOPDIR)/post.mk $(POINT_FILTERS) $(ARITHMETIC_FILTERS) $(STATS_FILTERS): $(TEMPLATE_DIR)/filter.c.t $(STATS_FILTERS): $(TEMPLATE_DIR)/filter.stats.c.t diff --git a/libs/gfx/Makefile b/libs/gfx/Makefile index 60a485b..dae754e 100644 --- a/libs/gfx/Makefile +++ b/libs/gfx/Makefile @@ -4,6 +4,7 @@ GENSOURCES=GP_LineAA.gen.c GP_PutPixelAA.gen.c GP_HLineAA.gen.c GP_VLineAA.gen.c LIBNAME=gfx +include $(TOPDIR)/pre.mk include $(TOPDIR)/gen.mk -include $(TOPDIR)/include.mk include $(TOPDIR)/lib.mk +include $(TOPDIR)/post.mk diff --git a/libs/input/Makefile b/libs/input/Makefile index afadcd1..4896a22 100644 --- a/libs/input/Makefile +++ b/libs/input/Makefile @@ -2,5 +2,7 @@ TOPDIR=../.. CSOURCES=$(shell ls *.c) INCLUDE=core LIBNAME=input -include $(TOPDIR)/include.mk + +include $(TOPDIR)/pre.mk include $(TOPDIR)/lib.mk +include $(TOPDIR)/post.mk diff --git a/libs/loaders/Makefile b/libs/loaders/Makefile index 5d037b7..0adfcfb 100644 --- a/libs/loaders/Makefile +++ b/libs/loaders/Makefile @@ -2,5 +2,7 @@ TOPDIR=../.. CSOURCES=$(shell ls *.c) INCLUDE=core LIBNAME=loaders -include $(TOPDIR)/include.mk + +include $(TOPDIR)/pre.mk include $(TOPDIR)/lib.mk +include $(TOPDIR)/post.mk diff --git a/libs/text/Makefile b/libs/text/Makefile index d58db9a..48c746f 100644 --- a/libs/text/Makefile +++ b/libs/text/Makefile @@ -3,9 +3,10 @@ GENSOURCES=GP_Text.gen.c CSOURCES=$(filter-out $(wildcard *.gen.c),$(wildcard *.c)) LIBNAME=text +include $(TOPDIR)/pre.mk include $(TOPDIR)/gen.mk -include $(TOPDIR)/include.mk include $(TOPDIR)/lib.mk +include $(TOPDIR)/post.mk GP_FreeType.dep: CFLAGS+=`freetype-config --cflags` GP_FreeType.o: CFLAGS+=`freetype-config --cflags` diff --git a/include.mk b/post.mk similarity index 79% rename from include.mk rename to post.mk index c8f8b18..fd95b0a 100644 --- a/include.mk +++ b/post.mk @@ -5,19 +5,22 @@ ifndef SUBDIRS SUBDIRS= endif -.PHONY: $(SUBDIRS) all clean help +.PHONY: $(SUBDIRS) all clean rebuild help all: $(SUBDIRS) clean: $(SUBDIRS) +rebuild: $(SUBDIRS) help: @echo "*** Available targets ***" @echo "" - @echo "help: prints this help" + @echo "help: prints this help" @echo "" - @echo "clean: cleans current directory and all subdirectories" + @echo "clean: cleans current directory and all subdirectories" @echo "" - @echo "all: make current directory and all subdirectories" + @echo "all: make current directory and all subdirectories" + @echo "" + @echo "rebuild: does clean and all" @echo "" @echo "The default silent output could be turned off by defining" @echo "'VERBOSE' shell variable as 'VERBOSE=1 make'" @@ -38,10 +41,9 @@ ifeq ($(MAKECMDGOALS),) COMPILE=yes endif -# -# Potential python dependencies for generated files and scripts -# -PYTHON_FILES=$(shell find "${PYLIBSDIR}" -name '*.py') +ifeq ($(MAKECMDGOALS),rebuild) +COMPILE=yes +endif # # 1. Generate and include dependencies for all C sources @@ -54,7 +56,7 @@ ifeq ($(COMPILE),yes) -include $(DEPFILES) endif CLEAN+=$(subst .c,.dep,$(CSOURCES)) -OBJECTS=$(CSOURCES:.c=.o) +OBJECTS+=$(CSOURCES:.c=.o) CLEAN+=$(OBJECTS) endif @@ -111,3 +113,8 @@ else @rm -f $(CLEAN) endif endif + +compile: $(DEPFILES) $(OBJECTS) $(ALL) + +rebuild: clean + @$(MAKE) --no-print-directory all diff --git a/pre.mk b/pre.mk new file mode 100644 index 0000000..b815a42 --- /dev/null +++ b/pre.mk @@ -0,0 +1 @@ +all: compile diff --git a/pylib/Makefile b/pylib/Makefile index 2d01e96..70aa08b 100644 --- a/pylib/Makefile +++ b/pylib/Makefile @@ -3,9 +3,7 @@ TOPDIR=.. # # Add .pyc files to CLEAN list # +PYTHON_FILES=$(shell find "${PYLIBSDIR}" -name '*.py') CLEAN+=$(patsubst %.py, %.pyc, ${PYTHON_FILES}) -include $(TOPDIR)/include.mk - -all: - @true +include $(TOPDIR)/post.mk diff --git a/tests/Makefile b/tests/Makefile index cfeab1c..d7405d2 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -1,3 +1,3 @@ TOPDIR=.. SUBDIRS=core SDL drivers -include $(TOPDIR)/include.mk +include $(TOPDIR)/post.mk diff --git a/tests/SDL/Makefile b/tests/SDL/Makefile index efb5272..7c91120 100644 --- a/tests/SDL/Makefile +++ b/tests/SDL/Makefile @@ -9,5 +9,6 @@ APPS=pixeltest fileview fonttest linetest randomshapetest shapetest sierpinsky symbolstest textaligntest trianglefps input blittest subcontext showimage aatest mixpixeltest -include $(TOPDIR)/include.mk +include $(TOPDIR)/pre.mk include $(TOPDIR)/app.mk +include $(TOPDIR)/post.mk diff --git a/tests/core/Makefile b/tests/core/Makefile index 9cef404..8ab278b 100644 --- a/tests/core/Makefile +++ b/tests/core/Makefile @@ -9,5 +9,5 @@ GENSOURCES+=GP_Convert.test.gen.c GP_WritePixel.test.gen.c all: $(TESTSUITE) include $(TOPDIR)/tests.mk -include $(TOPDIR)/include.mk +include $(TOPDIR)/post.mk diff --git a/tests/drivers/Makefile b/tests/drivers/Makefile index dcf4129..c2d2679 100644 --- a/tests/drivers/Makefile +++ b/tests/drivers/Makefile @@ -6,5 +6,6 @@ LDLIBS+=-lGP -lGP_backends -lSDL -L$(TOPDIR)/build/ APPS=$(CSOURCES:.c=) -include $(TOPDIR)/include.mk +include $(TOPDIR)/pre.mk include $(TOPDIR)/app.mk +include $(TOPDIR)/post.mk ----------------------------------------------------------------------- Summary of changes: Makefile | 2 +- app.mk | 3 +-- demos/Makefile | 2 +- demos/fbshow/Makefile | 3 ++- demos/grinder/Makefile | 3 ++- demos/particle/Makefile | 3 ++- gen.mk | 7 +++---- include/Makefile | 2 +- include/core/Makefile | 4 +++- lib.mk | 42 +++++++++++++++++++++++------------------- libs/Makefile | 2 +- libs/SDL/Makefile | 4 +++- libs/backends/Makefile | 4 +++- libs/core/Makefile | 3 ++- libs/filters/Makefile | 3 ++- libs/gfx/Makefile | 3 ++- libs/input/Makefile | 4 +++- libs/loaders/Makefile | 4 +++- libs/text/Makefile | 3 ++- include.mk => post.mk | 25 ++++++++++++++++--------- pre.mk | 1 + pylib/Makefile | 6 ++---- tests/Makefile | 2 +- tests/SDL/Makefile | 3 ++- tests/core/Makefile | 2 +- tests/drivers/Makefile | 3 ++- 26 files changed, 85 insertions(+), 58 deletions(-) rename include.mk => post.mk (79%) create mode 100644 pre.mk 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 tests deleted: 9771ff1a54b004327cf9c82cc7e44b2071cc415f
by gavento 25 Feb '12

25 Feb '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, tests has been deleted was 9771ff1a54b004327cf9c82cc7e44b2071cc415f ----------------------------------------------------------------------- 9771ff1a54b004327cf9c82cc7e44b2071cc415f Somewhat finalized testing layout ----------------------------------------------------------------------- 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: 89969fce89eede52612a2fa38ffa109dc66b38fb
by metan 25 Feb '12

25 Feb '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 discards b46945e420e4e1c804fba10c0deadbe0cbc3bb6b (commit) discards fa7c182aef8d59c8f1e073a726826e61bc2aece1 (commit) via 89969fce89eede52612a2fa38ffa109dc66b38fb (commit) This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this: * -- * -- B -- O -- O -- O (b46945e420e4e1c804fba10c0deadbe0cbc3bb6b) N -- N -- N (89969fce89eede52612a2fa38ffa109dc66b38fb) When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B. 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/89969fce89eede52612a2fa38ffa109dc66b… commit 89969fce89eede52612a2fa38ffa109dc66b38fb Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat Feb 25 14:05:14 2012 +0100 backends: Fix backend string parsing. diff --git a/libs/backends/GP_BackendInit.c b/libs/backends/GP_BackendInit.c index 7b80816..48ff440 100644 --- a/libs/backends/GP_BackendInit.c +++ b/libs/backends/GP_BackendInit.c @@ -67,7 +67,7 @@ static int sdl_params_to_flags(const char *param, GP_Size *w, GP_Size *h, return 1; } -static GP_Backend *backend_sdl_init(const char *params, const char *caption, +static GP_Backend *backend_sdl_init(char *params, const char *caption, FILE *help) { if (params == NULL) @@ -76,22 +76,26 @@ static GP_Backend *backend_sdl_init(const char *params, const char *caption, GP_Size w = 0, h = 0; uint8_t flags = 0; - const char *s = params; + char *s = params; - do { + for (;;) { switch (*s) { case ':': - s = '0'; - case '0': + (*s) = '0'; if (sdl_params_to_flags(params, &w, &h, &flags, help)) return NULL; s++; params = s; break; + case '0': + if (sdl_params_to_flags(params, &w, &h, &flags, help)) + return NULL; + + return GP_BackendSDLInit(w, h, 0, flags, caption); + break; } - } while (*(s++) != '0'); - - return GP_BackendSDLInit(w, h, 0, flags, caption); + s++; + } } static void backend_fb_help(FILE *help, const char *err) @@ -107,7 +111,7 @@ static void backend_fb_help(FILE *help, const char *err) "FB:[/dev/fbX]n"); } -static GP_Backend *backend_fb_init(const char *params, const char *caption, +static GP_Backend *backend_fb_init(char *params, const char *caption, FILE *help) { const char *fb = "/dev/fb0"; @@ -127,7 +131,7 @@ static const char *backend_names[] = { NULL, }; -static GP_Backend *(*backend_inits[])(const char *, const char *, FILE *) = { +static GP_Backend *(*backend_inits[])(char *, const char *, FILE *) = { backend_sdl_init, backend_fb_init, NULL, @@ -171,7 +175,7 @@ static int get_backend(const char *name) return -1; } -static GP_Backend *init_backend(const char *name, const char *params, +static GP_Backend *init_backend(const char *name, char *params, const char *caption, FILE *help) { int i = get_backend(name); @@ -206,7 +210,7 @@ GP_Backend *GP_BackendInit(const char *params, const char *caption, FILE *help) } } - GP_DEBUG(1, "Have backend name '%s'", buf); + GP_DEBUG(1, "Have backend name '%s' params '%s'", buf, backend_params); return init_backend(buf, backend_params, caption, help); } ----------------------------------------------------------------------- Summary of changes: 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: b46945e420e4e1c804fba10c0deadbe0cbc3bb6b
by metan 25 Feb '12

25 Feb '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 b46945e420e4e1c804fba10c0deadbe0cbc3bb6b (commit) via fa7c182aef8d59c8f1e073a726826e61bc2aece1 (commit) from bac5c04edb39e16dd0632b1d900daa77d350bdb1 (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/b46945e420e4e1c804fba10c0deadbe0cbc3… commit b46945e420e4e1c804fba10c0deadbe0cbc3bb6b Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat Feb 25 12:40:35 2012 +0100 backends: Fix backend string parsing. diff --git a/libs/backends/GP_BackendInit.c b/libs/backends/GP_BackendInit.c index 61f4001..48ff440 100644 --- a/libs/backends/GP_BackendInit.c +++ b/libs/backends/GP_BackendInit.c @@ -57,8 +57,6 @@ static int sdl_params_to_flags(const char *param, GP_Size *w, GP_Size *h, int sw, sh; unsigned int n; - printf("%s", param); - if (sscanf(param, "%i%*[xX]%i%n", &sw, &sh, &n) == 2 && n == strlen(param)) { *w = sw; *h = sh; @@ -80,21 +78,24 @@ static GP_Backend *backend_sdl_init(char *params, const char *caption, char *s = params; - do { + for (;;) { switch (*s) { case ':': (*s) = '0'; if (sdl_params_to_flags(params, &w, &h, &flags, help)) return NULL; s++; + params = s; + break; case '0': if (sdl_params_to_flags(params, &w, &h, &flags, help)) return NULL; + + return GP_BackendSDLInit(w, h, 0, flags, caption); break; } - } while (*(s++) != '0'); - - return GP_BackendSDLInit(w, h, 0, flags, caption); + s++; + } } static void backend_fb_help(FILE *help, const char *err) http://repo.or.cz/w/gfxprim.git/commit/fa7c182aef8d59c8f1e073a726826e61bc2a… commit fa7c182aef8d59c8f1e073a726826e61bc2aece1 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat Feb 25 14:05:14 2012 +0100 FIX diff --git a/libs/backends/GP_BackendInit.c b/libs/backends/GP_BackendInit.c index 7b80816..61f4001 100644 --- a/libs/backends/GP_BackendInit.c +++ b/libs/backends/GP_BackendInit.c @@ -57,6 +57,8 @@ static int sdl_params_to_flags(const char *param, GP_Size *w, GP_Size *h, int sw, sh; unsigned int n; + printf("%s", param); + if (sscanf(param, "%i%*[xX]%i%n", &sw, &sh, &n) == 2 && n == strlen(param)) { *w = sw; *h = sh; @@ -67,7 +69,7 @@ static int sdl_params_to_flags(const char *param, GP_Size *w, GP_Size *h, return 1; } -static GP_Backend *backend_sdl_init(const char *params, const char *caption, +static GP_Backend *backend_sdl_init(char *params, const char *caption, FILE *help) { if (params == NULL) @@ -76,17 +78,18 @@ static GP_Backend *backend_sdl_init(const char *params, const char *caption, GP_Size w = 0, h = 0; uint8_t flags = 0; - const char *s = params; + char *s = params; do { switch (*s) { case ':': - s = '0'; - case '0': + (*s) = '0'; if (sdl_params_to_flags(params, &w, &h, &flags, help)) return NULL; s++; - params = s; + case '0': + if (sdl_params_to_flags(params, &w, &h, &flags, help)) + return NULL; break; } } while (*(s++) != '0'); @@ -107,7 +110,7 @@ static void backend_fb_help(FILE *help, const char *err) "FB:[/dev/fbX]n"); } -static GP_Backend *backend_fb_init(const char *params, const char *caption, +static GP_Backend *backend_fb_init(char *params, const char *caption, FILE *help) { const char *fb = "/dev/fb0"; @@ -127,7 +130,7 @@ static const char *backend_names[] = { NULL, }; -static GP_Backend *(*backend_inits[])(const char *, const char *, FILE *) = { +static GP_Backend *(*backend_inits[])(char *, const char *, FILE *) = { backend_sdl_init, backend_fb_init, NULL, @@ -171,7 +174,7 @@ static int get_backend(const char *name) return -1; } -static GP_Backend *init_backend(const char *name, const char *params, +static GP_Backend *init_backend(const char *name, char *params, const char *caption, FILE *help) { int i = get_backend(name); @@ -206,7 +209,7 @@ GP_Backend *GP_BackendInit(const char *params, const char *caption, FILE *help) } } - GP_DEBUG(1, "Have backend name '%s'", buf); + GP_DEBUG(1, "Have backend name '%s' params '%s'", buf, backend_params); return init_backend(buf, backend_params, caption, help); } ----------------------------------------------------------------------- Summary of changes: libs/backends/GP_BackendInit.c | 28 ++++++++++++++++------------ 1 files changed, 16 insertions(+), 12 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 pywrap updated: 2465d9f19ff464a62ca5a8488188cf234eac2fc0
by gavento 25 Feb '12

25 Feb '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, pywrap has been updated via 2465d9f19ff464a62ca5a8488188cf234eac2fc0 (commit) from e345fda1e7684c1869952e03d5cf6b88b8116499 (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/2465d9f19ff464a62ca5a8488188cf234eac… commit 2465d9f19ff464a62ca5a8488188cf234eac2fc0 Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Sat Feb 25 00:12:09 2012 +0100 demos: cool particle pywrap demo (AA, save) Try it out! diff --git a/demos/py_simple/gravplots_AA.py b/demos/py_simple/gravplots_AA.py new file mode 100755 index 0000000..3061d0a --- /dev/null +++ b/demos/py_simple/gravplots_AA.py @@ -0,0 +1,111 @@ +#!/usr/bin/env python +import gfxprim.core as core +import gfxprim.backends as backends +import gfxprim.loaders as loaders +import gfxprim.gfx as gfx +import random +from math import sqrt + +AA = True +W = 320*2 +H = 240*2 +BPP = 24 +N = 8 # Try 5 or 42 + +# Gravity, brake factor and desired total speeds (in dir. X and total) +G = 0.1 # Adjust: 0.1 for N<20, 0.01 for N=100 +BRAKE = 0.001 +VX0 = 0.6 +V0 = 0.9 + +# Try one max and other ~50 : +MAXR = 255 +MAXG = 255 +MAXB = 255 + +# timeout in moves, -1 for none +TIMEOUT = -1 +# after timeout save to this file, None for none +SAVETO = "gravplot.png" + +class elem(object): + def __init__(self): + #self.x = random.uniform(0.0 * W, 0.6 * W) + self.x = 0 + self.y = random.uniform(0.2 * H, 0.8 * H) + self.vx = random.uniform(VX0 - 0.5, VX0 + 0.5) + self.vy = random.uniform(-0.5, 0.5) + self.r = random.randint(MAXR / 5, MAXR) + self.g = random.randint(MAXG / 5, MAXG) + self.b = random.randint(MAXB / 5, MAXB) + + def grav(self, other, t): + dx = other.x - self.x + dy = other.y - self.y + # Minimal distance is bounded + d2 = max(dx ** 2 + dy ** 2, 0.1 ** 2) + f = G / d2 + self.vx += dx * f * t + self.vy += dy * f * t + + def move(self, t): + self.x += self.vx * t + self.y += self.vy * t + # "Gravity" to y=H/2 + if self.y > 0.6 * H: + self.vy -= V0 * t * BRAKE + if self.y < 0.4 * H: + self.vy += V0 * t * BRAKE + # Magic to adjust speed + v = sqrt(self.vx ** 2 + self.vy ** 2) + self.vx *= (1.0 - BRAKE) + (BRAKE * V0 / v) + self.vy *= (1.0 - BRAKE) + (BRAKE * V0 / v) + self.vx = (1.0 - BRAKE) * self.vx + BRAKE * VX0 + # Bound speed + self.vx = max(min(self.vx, 4.0), -4.0) + self.vy = max(min(self.vy, 4.0), -4.0) + + +def main(): + bk = backends.BackendSDLInit(W, H, BPP, 0) + assert bk + 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) + 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)) + 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)) + bk.Flip() + global TIMEOUT + if TIMEOUT > 0: + TIMEOUT -= 1 + if TIMEOUT == 0: + break + if SAVETO: + bk.context.Save(SAVETO) + +if __name__ == '__main__': + main() ----------------------------------------------------------------------- Summary of changes: demos/py_simple/gravplots_AA.py | 111 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 111 insertions(+), 0 deletions(-) create mode 100755 demos/py_simple/gravplots_AA.py 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 pywrap updated: e345fda1e7684c1869952e03d5cf6b88b8116499
by gavento 24 Feb '12

24 Feb '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, pywrap has been updated via e345fda1e7684c1869952e03d5cf6b88b8116499 (commit) via 42ef30f3b79bde06f2081ce92ff3b141771a5051 (commit) via 6e75cff5b5c5a6cd6986304f3a75aecf6fd05010 (commit) via cd95c746b36256361430395355e7f6f308f36b44 (commit) from 14fc5c33518764dfb5a938c5aa5a38ce4810badf (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/e345fda1e7684c1869952e03d5cf6b88b811… commit e345fda1e7684c1869952e03d5cf6b88b8116499 Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Fri Feb 24 23:28:55 2012 +0100 pywrap: fix Context.create to CamelCase diff --git a/pylib/gfxprim/core/_extend_context.py b/pylib/gfxprim/core/_extend_context.py index 351c2a5..4b73ec9 100644 --- a/pylib/gfxprim/core/_extend_context.py +++ b/pylib/gfxprim/core/_extend_context.py @@ -39,7 +39,7 @@ def extend_context(_context): pixeltype_no = target_type ## TODO also accept PixelType return core_c.GP_ContextConvert(self, pixeltype_no) - @extend(_context, name='create') + @extend(_context, name='Create') @staticmethod def Create(w, h, pixeltype): "Allocate a new w*h bitmap of given type." http://repo.or.cz/w/gfxprim.git/commit/42ef30f3b79bde06f2081ce92ff3b141771a… commit 42ef30f3b79bde06f2081ce92ff3b141771a5051 Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Fri Feb 24 23:28:07 2012 +0100 pywrap: simplified access to members of Context diff --git a/pylib/gfxprim/core/_extend_context.py b/pylib/gfxprim/core/_extend_context.py index e012b3f..351c2a5 100644 --- a/pylib/gfxprim/core/_extend_context.py +++ b/pylib/gfxprim/core/_extend_context.py @@ -15,22 +15,10 @@ def extend_context(_context): @extend(_context, name='__repr__') def context_str(self): return "<Context %dx%d, %dbpp, GP_Context %sowned, %s parent>" % ( - self.w, self.h, self._bpp, + self.w, self.h, self.bpp, "" if self.thisown else "not ", "with" if self.parent else "no") - @add_swig_getmethod(_context) - def w(self): - return core_c.GP_ContextW(self) - - @add_swig_getmethod(_context) - def h(self): - return core_c.GP_ContextH(self) - - @add_swig_getmethod(_context) - def pixel_type(self): - return self._pixel_type - @extend(_context) def Subcontext(self, x, y, w, h): "Create a subcontext (rectangular view)." diff --git a/pylib/gfxprim/core/core.i b/pylib/gfxprim/core/core.i index 2fb33ca..046481a 100644 --- a/pylib/gfxprim/core/core.i +++ b/pylib/gfxprim/core/core.i @@ -4,7 +4,7 @@ #include "core/GP_Core.h" %} -#define __attribute__(X) +#define __attribute__(X) %include <stdint.i> @@ -47,21 +47,20 @@ * GP_Context wrapping */ -/* Rename accesors to GP_Context attributes to "_attribute" */ +/* Make some members RO */ +%immutable GP_Context::w; +%immutable GP_Context::h; +%immutable GP_Context::pixel_type; +%immutable GP_Context::bpp; +%immutable GP_Context::bytes_per_row; +/* Rename "internal" GP_Context */ %rename("_%s") "GP_Context::pixels"; -%rename("_%s") "GP_Context::bpp"; -%rename("_%s") "GP_Context::bytes_per_row"; -%rename("_%s") "GP_Context::w"; -%rename("_%s") "GP_Context::h"; %rename("_%s") "GP_Context::offset"; -%rename("_%s") "GP_Context::pixel_type"; %rename("_%s") "GP_Context::axes_swap"; %rename("_%s") "GP_Context::x_swap"; %rename("_%s") "GP_Context::y_swap"; %rename("_%s") "GP_Context::bit_endian"; %rename("_%s") "GP_Context::free_pixels"; -/* This nice batch would work in swig 2.0, sigh: - * %rename("_%s", regexmatch$name="^GP_Context::") ""; */ %feature("autodoc", "Proxy of C GP_Context struct http://repo.or.cz/w/gfxprim.git/commit/6e75cff5b5c5a6cd6986304f3a75aecf6fd0… commit 6e75cff5b5c5a6cd6986304f3a75aecf6fd05010 Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Fri Feb 24 23:20:09 2012 +0100 pywrap: fix a warning (make member RO) diff --git a/pylib/gfxprim/backends/backends.i b/pylib/gfxprim/backends/backends.i index 5a03736..1592509 100644 --- a/pylib/gfxprim/backends/backends.i +++ b/pylib/gfxprim/backends/backends.i @@ -5,7 +5,7 @@ #include "GP_Backends.h" %} -#define __attribute__(X) +#define __attribute__(X) %include <stdint.i> %feature("autodoc"); @@ -27,6 +27,7 @@ %ignore GP_Backend::priv; %ignore GP_Backend::fd_list; +%immutable GP_Backend::name; %ignore GP_BackendFD; %include "GP_Backend.h" http://repo.or.cz/w/gfxprim.git/commit/cd95c746b36256361430395355e7f6f308f3… commit cd95c746b36256361430395355e7f6f308f36b44 Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Fri Feb 24 22:29:06 2012 +0100 demos: pywrap demo (SDL, AA and non-AA, no event-handling) diff --git a/demos/py_simple/runpytest.sh b/demos/py_simple/runpytest.sh new file mode 100755 index 0000000..264af15 --- /dev/null +++ b/demos/py_simple/runpytest.sh @@ -0,0 +1,9 @@ +#!/bin/bash +# +# Run python test with dynamically linked libGP. +# + +PROG="$1" +shift + +LD_LIBRARY_PATH=../../build/ PYTHONPATH=$PYTHONPATH:../../pylib/ ./$PROG "$@" diff --git a/demos/py_simple/sinplots_AA.py b/demos/py_simple/sinplots_AA.py new file mode 100755 index 0000000..1e2db04 --- /dev/null +++ b/demos/py_simple/sinplots_AA.py @@ -0,0 +1,59 @@ +#!/usr/bin/env python +import gfxprim.core as core +import gfxprim.backends as backends +import gfxprim.gfx as gfx +import random +from math import sin + +AA = True +W = 320 +H = 240 +N = 10 + +class plotter(object): + def __init__(self): + self.x0 = random.uniform(0, W) + self.y0 = random.uniform(H*0.2, H*0.8) + self.a = H * (0.06 + random.uniform(0, 0.1) + random.uniform(0, 0.2)) + self.period = 4.0 + random.expovariate(4.0/W) + self.speed = random.uniform(0.04, min(max(0.05, 0.5 * self.period / self.a), 1.0)) + def pos(self, t): + x = self.x0 + self.speed * t + y = self.y0 + sin(x / self.period) * self.a + return (x % W, y) + def color(self, t): + return ( + 128 + 120 * sin(t / (self.a + 10.0)), + 128 + 120 * sin(t / (self.y0 + 3.0)), + 128 + 120 * sin(t / (self.x0 + 5.0))) + + +def main(): + bk = backends.BackendSDLInit(W, H, 16, 0) + assert bk + 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)] + t = random.uniform(0.0, 10.0 * W) + while True: + t += 1.0 + for p in ps: + (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))) + 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))) + bk.Flip() + +if __name__ == '__main__': + main() ----------------------------------------------------------------------- Summary of changes: demos/py_simple/runpytest.sh | 9 +++++ demos/py_simple/sinplots_AA.py | 59 +++++++++++++++++++++++++++++++++ pylib/gfxprim/backends/backends.i | 3 +- pylib/gfxprim/core/_extend_context.py | 16 +-------- pylib/gfxprim/core/core.i | 17 ++++----- 5 files changed, 80 insertions(+), 24 deletions(-) create mode 100755 demos/py_simple/runpytest.sh create mode 100755 demos/py_simple/sinplots_AA.py 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 pywrap updated: 14fc5c33518764dfb5a938c5aa5a38ce4810badf
by gavento 24 Feb '12

24 Feb '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, pywrap has been updated via 14fc5c33518764dfb5a938c5aa5a38ce4810badf (commit) from 1815d235fb569edde9ce1a16bc0df773cbd6e51b (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/14fc5c33518764dfb5a938c5aa5a38ce4810… commit 14fc5c33518764dfb5a938c5aa5a38ce4810badf Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Fri Feb 24 22:16:08 2012 +0100 pywrap: minor fix diff --git a/pylib/gfxprim/core/_extend_context.py b/pylib/gfxprim/core/_extend_context.py index 340e142..e012b3f 100644 --- a/pylib/gfxprim/core/_extend_context.py +++ b/pylib/gfxprim/core/_extend_context.py @@ -64,7 +64,7 @@ def extend_context(_context): @extend(_context) def RGBToPixel(self, r, g, b): "Convert RGB888 (values 0-255) to context pixel type." - return GP_RGBToPixel(r, g, b, self.pixel_type) + return core_c.GP_RGBToPixel(int(r), int(g), int(b), self.pixel_type) @extend(_context) def RGBAToPixel(self, r, g, b): ----------------------------------------------------------------------- Summary of changes: pylib/gfxprim/core/_extend_context.py | 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 pywrap updated: 1815d235fb569edde9ce1a16bc0df773cbd6e51b
by gavento 24 Feb '12

24 Feb '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, pywrap has been updated via 1815d235fb569edde9ce1a16bc0df773cbd6e51b (commit) via 045bf5ca3eb9490641721f1fe995da9b2f7995ff (commit) via ae9991521c625c6e992a7f41e776a4df5f26e27c (commit) via 688f686e2af5d8b93644a133b5d78306f75ba33b (commit) via 6e374f36d66099a2b22f2159f8e01f29a5b6e93b (commit) via 292cb728884ef43f466027f5a5b7425db253c844 (commit) via 3b82597d1e2542af499e250d84f34d98721833e7 (commit) via 258d6567abfed2915878ef6464514ab612139120 (commit) via d495753c9dc9129b0511b3dc59e0fff2884c3e2b (commit) via 4ec758f1d45d859fbf84bff6e8a314c1192f3b68 (commit) via ba3602872b1b7c717a0c82d4937380feee6240d0 (commit) via 83704e9f8be3359c9be0b4c2a9569b5aa4aa0812 (commit) via bee9bc07dfddc0a717246842c29b79cbaa26ab24 (commit) via 31d264d14f9777dd0e934fedb2b0af0665a0b3f7 (commit) from 0aed5090e5722d19b06bf91f6652923b1127a2c9 (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/1815d235fb569edde9ce1a16bc0df773cbd6… commit 1815d235fb569edde9ce1a16bc0df773cbd6e51b Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Fri Feb 24 20:50:17 2012 +0100 pywrap: make all modules by default diff --git a/pylib/gfxprim/Makefile b/pylib/gfxprim/Makefile index f5bf693..e668b60 100644 --- a/pylib/gfxprim/Makefile +++ b/pylib/gfxprim/Makefile @@ -1,3 +1,3 @@ TOPDIR=../.. -SUBDIRS=core loaders +SUBDIRS=core loaders backends gfx filters text include $(TOPDIR)/include.mk http://repo.or.cz/w/gfxprim.git/commit/045bf5ca3eb9490641721f1fe995da9b2f79… commit 045bf5ca3eb9490641721f1fe995da9b2f7995ff Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Fri Feb 24 20:49:30 2012 +0100 pywrap: forgotten file I forgot to commit pywrap.mk with .swig to .i change diff --git a/pywrap.mk b/pywrap.mk index ab8dcf7..b03ab6d 100644 --- a/pywrap.mk +++ b/pywrap.mk @@ -2,7 +2,7 @@ ifndef LIBNAME $(error LIBNAME not defined, fix your library Makefile) endif -SWIG_SRC=$(LIBNAME).swig +SWIG_SRC=$(LIBNAME).i SWIG_PY=$(LIBNAME)_c.py SWIG_C=$(LIBNAME)_wrap.c SWIG_LIB=_$(LIBNAME)_c.so http://repo.or.cz/w/gfxprim.git/commit/ae9991521c625c6e992a7f41e776a4df5f26… commit ae9991521c625c6e992a7f41e776a4df5f26e27c Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Fri Feb 24 20:48:28 2012 +0100 pywrap: and finally ... added text module! diff --git a/pylib/gfxprim/text/C.py b/pylib/gfxprim/text/C.py new file mode 100644 index 0000000..c8f987f --- /dev/null +++ b/pylib/gfxprim/text/C.py @@ -0,0 +1,3 @@ +""" +Submodule for constants +""" diff --git a/pylib/gfxprim/text/Makefile b/pylib/gfxprim/text/Makefile new file mode 100644 index 0000000..9549bc3 --- /dev/null +++ b/pylib/gfxprim/text/Makefile @@ -0,0 +1,5 @@ +TOPDIR=../../.. +LIBNAME=text +INCLUDE=core +include $(TOPDIR)/pywrap.mk +include $(TOPDIR)/include.mk diff --git a/pylib/gfxprim/text/__init__.py b/pylib/gfxprim/text/__init__.py new file mode 100644 index 0000000..a24cb69 --- /dev/null +++ b/pylib/gfxprim/text/__init__.py @@ -0,0 +1,27 @@ +from . import text_c + +from . import C + +def _init(module): + + # Imports from the SWIG module + import re + def strip_GP(s): + return re.sub('^GP_', '', s) + + # Import constants from the SWIG module + from ..utils import import_members + const_regexes = ['^GP_[A-Z0-9_]*$'] + import_members(text_c, C, include=const_regexes, sub=strip_GP) + + # Import functions from the SWIG module + import_members(text_c, module, sub=strip_GP, + exclude=const_regexes + [ + '.*_Raw', + '^w+_swigregister$', + '^gfxprim$', + '^cvar$', + '^_w+$']) + +_init(locals()) +del _init diff --git a/pylib/gfxprim/text/text.i b/pylib/gfxprim/text/text.i new file mode 100644 index 0000000..94f8baf --- /dev/null +++ b/pylib/gfxprim/text/text.i @@ -0,0 +1,23 @@ +%module(package="gfxprim.text") text_c + +%{ +#include "text/GP_Text.h" +#include "text/GP_Font.h" +%} + +#define __attribute__(X) + +%import ../core/core.i + +%include <stdint.i> + +%nodefaultctor; + +%ignore GP_GlyphBitmap::bitmap; +%ignore GP_FontFace::glyph_offsets; +%include "GP_Text.h" +%include "GP_Font.h" +%include "GP_DefaultFont.h" +%include "GP_TextMetric.h" +%include "GP_TextStyle.h" + http://repo.or.cz/w/gfxprim.git/commit/688f686e2af5d8b93644a133b5d78306f75b… commit 688f686e2af5d8b93644a133b5d78306f75ba33b Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Fri Feb 24 20:37:24 2012 +0100 pywrap: wrappers for filters, not well-filtered * More work may be necessary (parameters? any allocations?) diff --git a/pylib/gfxprim/filters/C.py b/pylib/gfxprim/filters/C.py new file mode 100644 index 0000000..c8f987f --- /dev/null +++ b/pylib/gfxprim/filters/C.py @@ -0,0 +1,3 @@ +""" +Submodule for constants +""" diff --git a/pylib/gfxprim/filters/Makefile b/pylib/gfxprim/filters/Makefile new file mode 100644 index 0000000..6e03032 --- /dev/null +++ b/pylib/gfxprim/filters/Makefile @@ -0,0 +1,5 @@ +TOPDIR=../../.. +LIBNAME=filters +INCLUDE=core +include $(TOPDIR)/pywrap.mk +include $(TOPDIR)/include.mk diff --git a/pylib/gfxprim/filters/__init__.py b/pylib/gfxprim/filters/__init__.py new file mode 100644 index 0000000..96ed8c9 --- /dev/null +++ b/pylib/gfxprim/filters/__init__.py @@ -0,0 +1,26 @@ +from . import filters_c + +from . import C + +def _init(module): + + # Imports from the SWIG module + import re + def strip_GP(s): + return re.sub('^GP_', '', s) + + # Import constants from the SWIG module + from ..utils import import_members + const_regexes = ['^GP_[A-Z0-9_]*$'] + import_members(filters_c, C, include=const_regexes, sub=strip_GP) + + # Import functions from the SWIG module + import_members(filters_c, module, sub=strip_GP, + exclude=const_regexes + [ + '.*_Raw', + '^w+_swigregister$', + '^gfxprim$', + '^_w+$']) + +_init(locals()) +del _init diff --git a/pylib/gfxprim/filters/filters.i b/pylib/gfxprim/filters/filters.i new file mode 100644 index 0000000..34baeb9 --- /dev/null +++ b/pylib/gfxprim/filters/filters.i @@ -0,0 +1,26 @@ +%module(package="gfxprim.filters") filters_c + +%{ +#include "filters/GP_Filters.h" +%} + +#define __attribute__(X) + +%import ../core/core.i + +%include <stdint.i> + +%nodefaultctor; + +%include "GP_Filters.h" + +/* Listed in GP_Filters.h: */ +%include "GP_FilterParam.h" +%include "GP_Point.h" +%include "GP_Arithmetic.h" +%ignore GP_Histogram::hist; +%include "GP_Stats.h" +%include "GP_Rotate.h" +%include "GP_Linear.h" +%include "GP_Resize.h" +/* %include "GP_Dither.h" -- missing symbols */ http://repo.or.cz/w/gfxprim.git/commit/6e374f36d66099a2b22f2159f8e01f29a5b6… commit 6e374f36d66099a2b22f2159f8e01f29a5b6e93b Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Fri Feb 24 20:34:45 2012 +0100 pywrap: fix excluded elements diff --git a/pylib/gfxprim/backends/__init__.py b/pylib/gfxprim/backends/__init__.py index 9aac820..224e0e5 100644 --- a/pylib/gfxprim/backends/__init__.py +++ b/pylib/gfxprim/backends/__init__.py @@ -39,6 +39,7 @@ def _init(module): import_members(backends_c, module, sub=strip_GP, exclude=const_regexes + [ '^GP_Backend$', + '^gfxprim$', '^w+_swigregister$', '^_w+$']) diff --git a/pylib/gfxprim/gfx/__init__.py b/pylib/gfxprim/gfx/__init__.py index 6d03923..c80ae6a 100644 --- a/pylib/gfxprim/gfx/__init__.py +++ b/pylib/gfxprim/gfx/__init__.py @@ -12,9 +12,7 @@ def _init(module): # Import constants from the SWIG module from ..utils import import_members - const_regexes = [ - '^GP_[A-Z0-9_]*$', - '^GP_PIXEL_x[A-Z0-9_]*$'] + const_regexes = ['^GP_[A-Z0-9_]*$'] import_members(gfx_c, C, include=const_regexes, sub=strip_GP) # Import functions from the SWIG module @@ -22,7 +20,7 @@ def _init(module): exclude=const_regexes + [ '.*_Raw', '^w+_swigregister$', - '^core_c$', + '^gfxprim$', '^_w+$']) _init(locals()) diff --git a/pylib/gfxprim/loaders/__init__.py b/pylib/gfxprim/loaders/__init__.py index ed235bc..c3fe31b 100644 --- a/pylib/gfxprim/loaders/__init__.py +++ b/pylib/gfxprim/loaders/__init__.py @@ -17,7 +17,7 @@ def _init(module): import_members(loaders_c, module, sub=strip_GP, exclude=[ '^w+_swigregister$', - '^core_c$', + '^gfxprim$', '^_w+$']) _init(locals()) http://repo.or.cz/w/gfxprim.git/commit/292cb728884ef43f466027f5a5b7425db253… commit 292cb728884ef43f466027f5a5b7425db253c844 Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Fri Feb 24 20:28:14 2012 +0100 Update .gitignore (include libraries) diff --git a/.gitignore b/.gitignore index 52f0d89..7d18a2b 100644 --- a/.gitignore +++ b/.gitignore @@ -4,7 +4,8 @@ *.gen.c *.gen.h *.swp -libGP.so* -libGP.a +*.so.* +*.so +*.a config.h config.gen.mk http://repo.or.cz/w/gfxprim.git/commit/3b82597d1e2542af499e250d84f34d987218… commit 3b82597d1e2542af499e250d84f34d98721833e7 Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Fri Feb 24 20:23:33 2012 +0100 pywrap: separate constants for gfx diff --git a/pylib/gfxprim/gfx/C.py b/pylib/gfxprim/gfx/C.py new file mode 100644 index 0000000..c8f987f --- /dev/null +++ b/pylib/gfxprim/gfx/C.py @@ -0,0 +1,3 @@ +""" +Submodule for constants +""" diff --git a/pylib/gfxprim/gfx/__init__.py b/pylib/gfxprim/gfx/__init__.py index 4bbaa40..6d03923 100644 --- a/pylib/gfxprim/gfx/__init__.py +++ b/pylib/gfxprim/gfx/__init__.py @@ -1,16 +1,25 @@ from . import gfx_c +from . import C + def _init(module): + # Imports from the SWIG module import re def strip_GP(s): return re.sub('^GP_', '', s) - # Import functions from the SWIG module + # Import constants from the SWIG module from ..utils import import_members + const_regexes = [ + '^GP_[A-Z0-9_]*$', + '^GP_PIXEL_x[A-Z0-9_]*$'] + import_members(gfx_c, C, include=const_regexes, sub=strip_GP) + + # Import functions from the SWIG module import_members(gfx_c, module, sub=strip_GP, - exclude=[ + exclude=const_regexes + [ '.*_Raw', '^w+_swigregister$', '^core_c$', http://repo.or.cz/w/gfxprim.git/commit/258d6567abfed2915878ef6464514ab61213… commit 258d6567abfed2915878ef6464514ab612139120 Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Fri Feb 24 20:11:09 2012 +0100 pywrap: wrappers for gfx module diff --git a/pylib/gfxprim/gfx/Makefile b/pylib/gfxprim/gfx/Makefile new file mode 100644 index 0000000..db31c60 --- /dev/null +++ b/pylib/gfxprim/gfx/Makefile @@ -0,0 +1,5 @@ +TOPDIR=../../.. +LIBNAME=gfx +INCLUDE=core +include $(TOPDIR)/pywrap.mk +include $(TOPDIR)/include.mk diff --git a/pylib/gfxprim/gfx/__init__.py b/pylib/gfxprim/gfx/__init__.py new file mode 100644 index 0000000..4bbaa40 --- /dev/null +++ b/pylib/gfxprim/gfx/__init__.py @@ -0,0 +1,20 @@ +from . import gfx_c + +def _init(module): + + # Imports from the SWIG module + import re + def strip_GP(s): + return re.sub('^GP_', '', s) + + # Import functions from the SWIG module + from ..utils import import_members + import_members(gfx_c, module, sub=strip_GP, + exclude=[ + '.*_Raw', + '^w+_swigregister$', + '^core_c$', + '^_w+$']) + +_init(locals()) +del _init diff --git a/pylib/gfxprim/gfx/gfx.i b/pylib/gfxprim/gfx/gfx.i new file mode 100644 index 0000000..1f59443 --- /dev/null +++ b/pylib/gfxprim/gfx/gfx.i @@ -0,0 +1,37 @@ +%module(package="gfxprim.gfx") gfx_c + +%{ +#include "gfx/GP_Gfx.h" +%} + +#define __attribute__(X) + +%import ../core/core.i + +%include <stdint.i> + +%nodefaultctor; + +%include "GP_Gfx.h" + +/* Listed in GP_Gfx.h: */ +%include "GP_Fill.h" +%include "GP_HLine.h" +%include "GP_VLine.h" +%include "GP_Line.h" +%include "GP_Rect.h" +%include "GP_Triangle.h" +%include "GP_Tetragon.h" +%include "GP_Circle.h" +/* %include "GP_CircleSeg.h" -- missing symbols */ +%include "GP_Ellipse.h" +%include "GP_Arc.h" +%include "GP_Polygon.h" +%include "GP_Symbol.h" + +%include "GP_PutPixelAA.h" +%include "GP_VLineAA.h" +%include "GP_HLineAA.h" +%include "GP_LineAA.h" +%include "GP_RectAA.h" + http://repo.or.cz/w/gfxprim.git/commit/d495753c9dc9129b0511b3dc59e0fff2884c… commit d495753c9dc9129b0511b3dc59e0fff2884c3e2b Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Fri Feb 24 20:10:34 2012 +0100 pywrap: clean old links diff --git a/pylib/_gfxprim_core_c.so b/pylib/_gfxprim_core_c.so deleted file mode 120000 index b0aff10..0000000 --- a/pylib/_gfxprim_core_c.so +++ /dev/null @@ -1 +0,0 @@ -../build/_gfxprim_core_c.so No newline at end of file diff --git a/pylib/_gfxprim_loaders_c.so b/pylib/_gfxprim_loaders_c.so deleted file mode 120000 index 41a41f9..0000000 --- a/pylib/_gfxprim_loaders_c.so +++ /dev/null @@ -1 +0,0 @@ -../build/_gfxprim_loaders_c.so No newline at end of file http://repo.or.cz/w/gfxprim.git/commit/4ec758f1d45d859fbf84bff6e8a314c1192f… commit 4ec758f1d45d859fbf84bff6e8a314c1192f3b68 Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Fri Feb 24 19:56:34 2012 +0100 pywrap: use .i instead of .pywrap diff --git a/pylib/gfxprim/backends/backends.swig b/pylib/gfxprim/backends/backends.i similarity index 96% rename from pylib/gfxprim/backends/backends.swig rename to pylib/gfxprim/backends/backends.i index 9c2eea1..5a03736 100644 --- a/pylib/gfxprim/backends/backends.swig +++ b/pylib/gfxprim/backends/backends.i @@ -10,7 +10,7 @@ %feature("autodoc"); -%import ../core/core.swig +%import ../core/core.i /* diff --git a/pylib/gfxprim/core/core.swig b/pylib/gfxprim/core/core.i similarity index 100% rename from pylib/gfxprim/core/core.swig rename to pylib/gfxprim/core/core.i diff --git a/pylib/gfxprim/loaders/loaders.swig b/pylib/gfxprim/loaders/loaders.i similarity index 95% rename from pylib/gfxprim/loaders/loaders.swig rename to pylib/gfxprim/loaders/loaders.i index aeb5ad2..990b07d 100644 --- a/pylib/gfxprim/loaders/loaders.swig +++ b/pylib/gfxprim/loaders/loaders.i @@ -7,7 +7,7 @@ #define __attribute__(X) -%import ../core/core.swig +%import ../core/core.i %include <stdint.i> http://repo.or.cz/w/gfxprim.git/commit/ba3602872b1b7c717a0c82d4937380feee62… commit ba3602872b1b7c717a0c82d4937380feee6240d0 Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Fri Feb 24 19:52:24 2012 +0100 pywrap: Clean and simplify backend wrappers diff --git a/pylib/gfxprim/backends/__init__.py b/pylib/gfxprim/backends/__init__.py index f33aa9b..9aac820 100644 --- a/pylib/gfxprim/backends/__init__.py +++ b/pylib/gfxprim/backends/__init__.py @@ -7,40 +7,25 @@ Accessing a context after its backend has ben freed will probably end your (program's) world """ -# HACK to allow backends_c to find core_c -def import_backends_c_helper(): - from os.path import dirname - import sys - oldpath = sys.path[:] - sys.path.append(dirname(__file__) + '/../core') - from . import backends_c - sys.path = oldpath - return backends_c -backends_c = import_backends_c_helper() -del import_backends_c_helper - -# Extend Context with convenience methods -def extend(): - from . import extend_context - from ..core import Context - extend_context.extend_context_class(Context) -extend() -del extend - +from . import backends_c # Pull GP_Backend Backend = backends_c.GP_Backend -# Extend GP_Backend with convenience methods -from . import extend_backend -extend_backend.extend_backend_class(Backend) -del extend_backend - # Constants module from . import C -# Import some members from the SWIG module -def import_helper(module): +def _init(module): + # Extend Context with convenience methods + from ._extend_context import extend_context + from ..core import Context + extend_context(Context) + + # Extend GP_Backend with convenience methods + from _extend_backend import extend_backend + extend_backend(Backend) + + # Import some members from the SWIG module from ..utils import import_members import re def strip_GP(s): @@ -56,5 +41,6 @@ def import_helper(module): '^GP_Backend$', '^w+_swigregister$', '^_w+$']) -import_helper(locals()) -del import_helper + +_init(locals()) +del _init diff --git a/pylib/gfxprim/backends/extend_backend.py b/pylib/gfxprim/backends/_extend_backend.py similarity index 71% rename from pylib/gfxprim/backends/extend_backend.py rename to pylib/gfxprim/backends/_extend_backend.py index bbd52cd..2f739fc 100644 --- a/pylib/gfxprim/backends/extend_backend.py +++ b/pylib/gfxprim/backends/_extend_backend.py @@ -1,29 +1,29 @@ from ..utils import extend, add_swig_getmethod, add_swig_setmethod from . import backends_c -def extend_backend_class(_backend_class): +def extend_backend(_backend): """ - Extends _backend_class class with convenience methods. + Extends _backend class with convenience methods. Called once on module inicialization. """ - @extend(_backend_class, name='__str__') - @extend(_backend_class, name='__repr__') + @extend(_backend, name='__str__') + @extend(_backend, name='__repr__') def backend_str(self): return "<Backend "%s", GP_Backend %sowned>" % ( self.name, "" if self.thisown else "not ") - @extend(_backend_class) + @extend(_backend) def Flip(self): "If display is buffered, this copies content of context onto display." return backends_c.GP_BackendFlip(self) - @extend(_backend_class) + @extend(_backend) def UpdateRect(self, rect): "Update a rectangle on a buffered backend." return backends_c.GP_BackendUpdateRect(self, rect[0], rect[1], rect[2], rect[3]) - @extend(_backend_class) + @extend(_backend) def Poll(self): "Poll the backend for events." return backends_c.GP_BackendPoll(self) diff --git a/pylib/gfxprim/backends/_extend_context.py b/pylib/gfxprim/backends/_extend_context.py new file mode 100644 index 0000000..f1754a5 --- /dev/null +++ b/pylib/gfxprim/backends/_extend_context.py @@ -0,0 +1,8 @@ +from ..utils import extend, add_swig_getmethod, add_swig_setmethod +from . import backends_c + +def extend_context(_context): + """ + Extends _context class with backend support. + """ + extend(_context, name='backend')(None) diff --git a/pylib/gfxprim/backends/backends.swig b/pylib/gfxprim/backends/backends.swig index 792e789..9c2eea1 100644 --- a/pylib/gfxprim/backends/backends.swig +++ b/pylib/gfxprim/backends/backends.swig @@ -1,4 +1,4 @@ -%module backends_c +%module(package="gfxprim.backends") backends_c %{ #include "GP_Backend.h" diff --git a/pylib/gfxprim/backends/extend_context.py b/pylib/gfxprim/backends/extend_context.py deleted file mode 100644 index f959547..0000000 --- a/pylib/gfxprim/backends/extend_context.py +++ /dev/null @@ -1,8 +0,0 @@ -from ..utils import extend, add_swig_getmethod, add_swig_setmethod -from . import backends_c - -def extend_context_class(_context_class): - """ - Extends _context_class class with backend support. - """ - extend(_context_class, name='backend')(None) http://repo.or.cz/w/gfxprim.git/commit/83704e9f8be3359c9be0b4c2a9569b5aa4aa… commit 83704e9f8be3359c9be0b4c2a9569b5aa4aa0812 Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Fri Feb 24 19:46:48 2012 +0100 pywrap: Simplify and clean core SWIG imports diff --git a/pylib/gfxprim/core/__init__.py b/pylib/gfxprim/core/__init__.py index 21699f7..7589d14 100644 --- a/pylib/gfxprim/core/__init__.py +++ b/pylib/gfxprim/core/__init__.py @@ -1,16 +1,17 @@ from . import core_c -Context = core_c.Context - -# Extend Context with convenience methods -from . import extend_context -extend_context.extend_context_class(Context) -del extend_context +Context = core_c.GP_Context +# Constants from . import C -# Import some members from the SWIG module -def import_helper(module): +def _init(module): + + # Extend Context with convenience methods + from ._extend_context import extend_context + extend_context(Context) + + # Import some members from the SWIG module import re from ..utils import import_members @@ -33,5 +34,6 @@ def import_helper(module): '^w+_swigregister$', '^cvar$', '^_w+$']) -import_helper(locals()) -del import_helper + +_init(locals()) +del _init diff --git a/pylib/gfxprim/core/extend_context.py b/pylib/gfxprim/core/_extend_context.py similarity index 77% rename from pylib/gfxprim/core/extend_context.py rename to pylib/gfxprim/core/_extend_context.py index f8f197d..340e142 100644 --- a/pylib/gfxprim/core/extend_context.py +++ b/pylib/gfxprim/core/_extend_context.py @@ -1,57 +1,57 @@ from ..utils import extend, add_swig_getmethod, add_swig_setmethod from . import core_c -def extend_context_class(_context_class): +def extend_context(_context): """ - Extends _context_class class with core module methods and properties + Extends _context class with core module methods and properties for object-oriented usage. Called once on module inicialization. """ # Add "parent" attribute - extend(_context_class, name='parent')(None) + extend(_context, name='parent')(None) - @extend(_context_class, name='__str__') - @extend(_context_class, name='__repr__') + @extend(_context, name='__str__') + @extend(_context, name='__repr__') def context_str(self): return "<Context %dx%d, %dbpp, GP_Context %sowned, %s parent>" % ( self.w, self.h, self._bpp, "" if self.thisown else "not ", "with" if self.parent else "no") - @add_swig_getmethod(_context_class) + @add_swig_getmethod(_context) def w(self): return core_c.GP_ContextW(self) - @add_swig_getmethod(_context_class) + @add_swig_getmethod(_context) def h(self): return core_c.GP_ContextH(self) - @add_swig_getmethod(_context_class) + @add_swig_getmethod(_context) def pixel_type(self): return self._pixel_type - @extend(_context_class) + @extend(_context) def Subcontext(self, x, y, w, h): "Create a subcontext (rectangular view)." c = core_c.GP_ContextSubContext(self, None, x, y, w, h) c.parent = self return c - @extend(_context_class) + @extend(_context) def Copy(self, withdata): "Copy the context to a new context. Pixel data are copie optionally." flags = core_c.GP_COPY_WITH_PIXELS if withdata else 0 return core_c.GP_ContextCopy(self, flags) - @extend(_context_class) + @extend(_context) def Convert(self, target_type): """Converts context to a different pixel type, allocates new context. See GP_ContextConvert() for details.""" pixeltype_no = target_type ## TODO also accept PixelType return core_c.GP_ContextConvert(self, pixeltype_no) - @extend(_context_class, name='create') + @extend(_context, name='create') @staticmethod def Create(w, h, pixeltype): "Allocate a new w*h bitmap of given type." @@ -61,12 +61,12 @@ def extend_context_class(_context_class): c = core_c.GP_ContextAlloc(w, h, pixeltype_no) return c - @extend(_context_class) + @extend(_context) def RGBToPixel(self, r, g, b): "Convert RGB888 (values 0-255) to context pixel type." return GP_RGBToPixel(r, g, b, self.pixel_type) - @extend(_context_class) + @extend(_context) def RGBAToPixel(self, r, g, b): "Convert RGBA8888 (values 0-255) to context pixel type." return GP_RGBToPixel(r, g, b, self.pixel_type) diff --git a/pylib/gfxprim/core/core.swig b/pylib/gfxprim/core/core.swig index 481ab1b..2fb33ca 100644 --- a/pylib/gfxprim/core/core.swig +++ b/pylib/gfxprim/core/core.swig @@ -1,4 +1,4 @@ -%module core_c +%module(package="gfxprim.core") core_c %{ #include "core/GP_Core.h" @@ -63,7 +63,6 @@ /* This nice batch would work in swig 2.0, sigh: * %rename("_%s", regexmatch$name="^GP_Context::") ""; */ -%rename("Context") "GP_Context"; %feature("autodoc", "Proxy of C GP_Context struct @@ -72,7 +71,8 @@ All attributes of GP_Context are accessible directly as _attribute (self._w etc.), but it is reccomended to use redefined properties: self.w: Context width (transformed) -self.h: Context width (transformed) +self.h: Context height (transformed) +self.pixel_type: Context pixel type (number) Some context-related methods are provided as class members for convenience. http://repo.or.cz/w/gfxprim.git/commit/bee9bc07dfddc0a717246842c29b79cbaa26… commit bee9bc07dfddc0a717246842c29b79cbaa26ab24 Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Fri Feb 24 19:38:32 2012 +0100 pywrap: set SWIG in config.mk diff --git a/config.mk b/config.mk index 53bcc7c..889944f 100644 --- a/config.mk +++ b/config.mk @@ -13,3 +13,5 @@ PYTHON_INCLUDE=/usr/include/python2.6 PYTHON=PYTHONPATH=$$PYTHONPATH:${PYLIBSDIR} ${PYTHON_BIN} -Werror SWIGOPTS=-Wextra -w322,314 -I/usr/include/ + +SWIG=swig http://repo.or.cz/w/gfxprim.git/commit/31d264d14f9777dd0e934fedb2b0af0665a0… commit 31d264d14f9777dd0e934fedb2b0af0665a0b3f7 Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Fri Feb 24 19:36:15 2012 +0100 pywrap: simplify, clean loading, proper module names diff --git a/pylib/gfxprim/loaders/__init__.py b/pylib/gfxprim/loaders/__init__.py index 5c62e9d..ed235bc 100644 --- a/pylib/gfxprim/loaders/__init__.py +++ b/pylib/gfxprim/loaders/__init__.py @@ -1,37 +1,24 @@ +from . import loaders_c -# HACK to allow loaders_c to find core_c -def import_loaders_c_helper(): - from os.path import dirname - import sys - oldpath = sys.path[:] - sys.path.append(dirname(__file__) + '/../core') - from . import loaders_c - sys.path = oldpath - return loaders_c -loaders_c = import_loaders_c_helper() -del import_loaders_c_helper +def _init(module): -# Extend Context with convenience methods -def extend(): - from . import extend_context + # Extend Context with convenience methods + from _extend_context import extend_context from ..core import Context - extend_context.extend_context_class(Context) -extend() -del extend + extend_context(Context) -# Import some members from the SWIG module -def import_helper(module): - from ..utils import import_members + # Imports from the SWIG module import re def strip_GP(s): return re.sub('^GP_', '', s) - # Functions + # Import functions from the SWIG module + from ..utils import import_members import_members(loaders_c, module, sub=strip_GP, exclude=[ '^w+_swigregister$', '^core_c$', '^_w+$']) -import_helper(locals()) -del import_helper +_init(locals()) +del _init diff --git a/pylib/gfxprim/loaders/extend_context.py b/pylib/gfxprim/loaders/_extend_context.py similarity index 85% rename from pylib/gfxprim/loaders/extend_context.py rename to pylib/gfxprim/loaders/_extend_context.py index c8334ae..5e0b8c4 100644 --- a/pylib/gfxprim/loaders/extend_context.py +++ b/pylib/gfxprim/loaders/_extend_context.py @@ -1,20 +1,20 @@ from ..utils import extend, add_swig_getmethod, add_swig_setmethod from . import loaders_c -def extend_context_class(_context_class): +def extend_context(_context): """ - Extends _context_class class with loader module methods for calling convenience. + Extends _context class with loader module methods for calling convenience. Called once on loaders module inicialization. """ - @extend(_context_class, name='load') + @extend(_context, name='load') @staticmethod def Load(filename): "Load image from given file, guess type." c = loaders_c.GP_LoadImage_Wrap(filename) return c - @extend(_context_class) + @extend(_context) def Save(self, filename, format=None): """Save the image in given format (or guess it from the extension) diff --git a/pylib/gfxprim/loaders/loaders.swig b/pylib/gfxprim/loaders/loaders.swig index 1f171a3..aeb5ad2 100644 --- a/pylib/gfxprim/loaders/loaders.swig +++ b/pylib/gfxprim/loaders/loaders.swig @@ -1,4 +1,4 @@ -%module loaders_c +%module(package="gfxprim.loaders") loaders_c %{ #include "core/GP_Core.h" ----------------------------------------------------------------------- Summary of changes: .gitignore | 5 +- config.mk | 2 + pylib/_gfxprim_core_c.so | 1 - pylib/_gfxprim_loaders_c.so | 1 - pylib/gfxprim/Makefile | 2 +- pylib/gfxprim/backends/__init__.py | 45 +++++++------------- .../{extend_backend.py => _extend_backend.py} | 14 +++--- pylib/gfxprim/backends/_extend_context.py | 8 ++++ .../gfxprim/backends/{backends.swig => backends.i} | 4 +- pylib/gfxprim/backends/extend_context.py | 8 ---- pylib/gfxprim/core/__init__.py | 22 +++++---- .../core/{extend_context.py => _extend_context.py} | 28 ++++++------ pylib/gfxprim/core/{core.swig => core.i} | 6 +- pylib/gfxprim/{backends => filters}/C.py | 0 pylib/gfxprim/{loaders => filters}/Makefile | 2 +- pylib/gfxprim/filters/__init__.py | 26 +++++++++++ pylib/gfxprim/filters/filters.i | 26 +++++++++++ pylib/gfxprim/{backends => gfx}/C.py | 0 pylib/gfxprim/{loaders => gfx}/Makefile | 2 +- pylib/gfxprim/gfx/__init__.py | 27 ++++++++++++ pylib/gfxprim/gfx/gfx.i | 37 ++++++++++++++++ pylib/gfxprim/loaders/__init__.py | 35 +++++---------- .../{extend_context.py => _extend_context.py} | 8 ++-- pylib/gfxprim/loaders/{loaders.swig => loaders.i} | 4 +- pylib/gfxprim/{backends => text}/C.py | 0 pylib/gfxprim/{loaders => text}/Makefile | 2 +- pylib/gfxprim/text/__init__.py | 27 ++++++++++++ pylib/gfxprim/text/text.i | 23 ++++++++++ pywrap.mk | 2 +- 29 files changed, 255 insertions(+), 112 deletions(-) delete mode 120000 pylib/_gfxprim_core_c.so delete mode 120000 pylib/_gfxprim_loaders_c.so rename pylib/gfxprim/backends/{extend_backend.py => _extend_backend.py} (71%) create mode 100644 pylib/gfxprim/backends/_extend_context.py rename pylib/gfxprim/backends/{backends.swig => backends.i} (90%) delete mode 100644 pylib/gfxprim/backends/extend_context.py rename pylib/gfxprim/core/{extend_context.py => _extend_context.py} (77%) rename pylib/gfxprim/core/{core.swig => core.i} (95%) copy pylib/gfxprim/{backends => filters}/C.py (100%) copy pylib/gfxprim/{loaders => filters}/Makefile (84%) create mode 100644 pylib/gfxprim/filters/__init__.py create mode 100644 pylib/gfxprim/filters/filters.i copy pylib/gfxprim/{backends => gfx}/C.py (100%) copy pylib/gfxprim/{loaders => gfx}/Makefile (84%) create mode 100644 pylib/gfxprim/gfx/__init__.py create mode 100644 pylib/gfxprim/gfx/gfx.i rename pylib/gfxprim/loaders/{extend_context.py => _extend_context.py} (85%) rename pylib/gfxprim/loaders/{loaders.swig => loaders.i} (87%) copy pylib/gfxprim/{backends => text}/C.py (100%) copy pylib/gfxprim/{loaders => text}/Makefile (84%) create mode 100644 pylib/gfxprim/text/__init__.py create mode 100644 pylib/gfxprim/text/text.i 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

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

Gfxprim February 2012