Move OpenGL code from GisOpenGL to objects
authorAndy Spencer <andy753421@gmail.com>
Sun, 24 Oct 2010 11:57:09 +0000 (11:57 +0000)
committerAndy Spencer <andy753421@gmail.com>
Mon, 25 Oct 2010 05:01:32 +0000 (05:01 +0000)
commit72643f9bd6c87e08670eb1a0aad2da5573b99774
treea7a4ecb26854853b1c4d84ab2cf50732526aec5e
parent2be8bbde8f465947d364b28c5e156631caed6d25
Move OpenGL code from GisOpenGL to objects

Add draw functions to GisObjectClass which should be set by subclasses.
This allows outside object types to be written in the normal way
(instead of always using GisCallback).

This also moves a lot of drawing code out of GisOpenGL which should
prevent it from becoming too big.

Unfortunately, there are some pesky dependency problems between
GisObject/GisViewer/GisOpenGL/GTK now. For example, Wms pulls in
GisTile, which pulls in GisViewer/GisViewer, which pulls in all of GTK.
12 files changed:
examples/plugin/teapot.c
src/data/Makefile.am
src/gis-opengl.c
src/gis-viewer.h
src/objects/Makefile.am
src/objects/gis-callback.c
src/objects/gis-callback.h
src/objects/gis-marker.c
src/objects/gis-object.c
src/objects/gis-object.h
src/objects/gis-tile.c
src/plugins/env.c