X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=src%2Fgis-opengl.h;h=a77b5a43d6f289cdae4fed3de6bf9725fa504ca0;hb=e1c0182c49c7899345b6e0e3de5fd0eae69764df;hp=a0f612596e0a8541458f7911cd3e09ee5ace0f2b;hpb=a2a902d978b6050289f7a92794fb1dc0aa2b5e26;p=grits

diff --git a/src/gis-opengl.h b/src/gis-opengl.h
index a0f6125..a77b5a4 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 */
@@ -34,17 +32,15 @@ typedef struct _GisOpenGL      GisOpenGL;
 typedef struct _GisOpenGLClass GisOpenGLClass;
 
 #include "gis-viewer.h"
-#include "gis-plugin.h"
-#include "gis-tile.h"
 #include "roam.h"
 
 struct _GisOpenGL {
-	GtkDrawingArea parent_instance;
+	GisViewer parent_instance;
 
 	/* instance members */
-	GisViewer  *viewer;
-	GisPlugins *plugins;
+	GTree      *objects;
 	RoamSphere *sphere;
+	GMutex     *sphere_lock;
 	guint       sm_source[2];
 
 	/* for testing */
@@ -52,7 +48,7 @@ struct _GisOpenGL {
 };
 
 struct _GisOpenGLClass {
-	GtkDrawingAreaClass parent_class;
+	GisViewerClass parent_class;
 
 	/* class members */
 };
@@ -60,28 +56,6 @@ struct _GisOpenGLClass {
 GType gis_opengl_get_type(void);
 
 /* Methods */
-GisOpenGL *gis_opengl_new(GisViewer *viewer, 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