X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=src%2Fgis-opengl.h;h=0ef682df6a243fdebe7429b8c775eedbcf6f3bba;hb=a15a1829ffbf0176930601ee9ac7cc0c07fa2d06;hp=2e80d07cad55824e3ff27e09d7828e9136a5a9a8;hpb=ad940f5d65ed4c95f72cac825244cae53dd6c78d;p=grits

diff --git a/src/gis-opengl.h b/src/gis-opengl.h
index 2e80d07..0ef682d 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,19 +31,13 @@
 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[2];
 
@@ -54,7 +46,7 @@ struct _GisOpenGL {
 };
 
 struct _GisOpenGLClass {
-	GtkDrawingAreaClass parent_class;
+	GisViewerClass parent_class;
 
 	/* class members */
 };
@@ -62,28 +54,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_project(GisOpenGL *opengl,
-		gdouble lat, gdouble lon, gdouble elev,
-		gdouble *px, gdouble *py, gdouble *pz);
-
-void gis_opengl_render_tile(GisOpenGL *opengl, GisTile *tile);
-
-void gis_opengl_render_tiles(GisOpenGL *opengl, GisTile *root);
-
-void gis_opengl_set_height_func(GisOpenGL *self, GisTile *tile,
-		RoamHeightFunc height_func, gpointer user_data, gboolean update);
-
-void gis_opengl_clear_height_func(GisOpenGL *self);
-
-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