X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=src%2Fgis-opengl.h;h=b1f7b567f8640a0fa5541f3f15f58790f4897333;hb=b088e18d9e838064bb264a145ff66e57886ee42a;hp=19feefce186b5aa616d1d49f0153a2bd6642069b;hpb=f510823bdc5b77fa0c5336ad608f13f251a0ada5;p=grits

diff --git a/src/gis-opengl.h b/src/gis-opengl.h
index 19feefc..b1f7b56 100644
--- a/src/gis-opengl.h
+++ b/src/gis-opengl.h
@@ -18,8 +18,6 @@
 #ifndef __GIS_OPENGL_H__
 #define __GIS_OPENGL_H__
 
-#include <gtk/gtk.h>
-#include <gtk/gtkgl.h>
 #include <glib-object.h>
 
 /* Type macros */
@@ -33,28 +31,24 @@
 typedef struct _GisOpenGL      GisOpenGL;
 typedef struct _GisOpenGLClass GisOpenGLClass;
 
-#include "gis-view.h"
-#include "gis-world.h"
-#include "gis-plugin.h"
-#include "gis-tile.h"
+#include "gis-viewer.h"
 #include "roam.h"
 
 struct _GisOpenGL {
-	GtkDrawingArea parent_instance;
+	GisViewer parent_instance;
 
 	/* instance members */
-	GisWorld   *world;
-	GisView    *view;
-	GisPlugins *plugins;
 	RoamSphere *sphere;
-	guint       sm_source;
+	guint       sm_source[2];
+	cairo_t    *canvas;
+	guint       canvas_tex;
 
 	/* for testing */
 	gboolean    wireframe;
 };
 
 struct _GisOpenGLClass {
-	GtkDrawingAreaClass parent_class;
+	GisViewerClass parent_class;
 
 	/* class members */
 };
@@ -62,19 +56,6 @@ struct _GisOpenGLClass {
 GType gis_opengl_get_type(void);
 
 /* Methods */
-GisOpenGL *gis_opengl_new(GisWorld *world, GisView *view, GisPlugins *plugins);
-
-void gis_opengl_center_position(GisOpenGL *opengl,
-		gdouble lat, gdouble lon, gdouble elev);
-
-void gis_opengl_render_tile(GisOpenGL *opengl, GisTile *tile);
-
-void gis_opengl_render_tiles(GisOpenGL *opengl, GisTile *root);
-
-void gis_opengl_redraw(GisOpenGL *opengl);
-
-void gis_opengl_begin(GisOpenGL *opengl);
-void gis_opengl_end(GisOpenGL *opengl);
-void gis_opengl_flush(GisOpenGL *opengl);
+GisViewer *gis_opengl_new(GisPlugins *plugins);
 
 #endif