X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=src%2Fgis-opengl.h;h=ce65cbc6edc30b107cc88ed9c5e86fa4186d2f4d;hb=01ca3d15f0981393709f25efc6b4a0e067e0c815;hp=069456fb11fd24417d2a6a8b98cd2883eabe7d9f;hpb=ac7156bd84aef88b712f117f7e2f3d847d371719;p=grits

diff --git a/src/gis-opengl.h b/src/gis-opengl.h
index 069456f..ce65cbc 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,42 +31,30 @@
 typedef struct _GisOpenGL      GisOpenGL;
 typedef struct _GisOpenGLClass GisOpenGLClass;
 
-#include "gis-view.h"
-#include "gis-world.h"
-#include "gis-plugin.h"
+#include "gis-viewer.h"
 #include "roam.h"
-#include "wms.h"
 
 struct _GisOpenGL {
-	GtkDrawingArea parent_instance;
+	GisViewer parent_instance;
 
 	/* instance members */
-	GisWorld   *world;
-	GisView    *view;
-	GisPlugins *plugins;
+	GTree      *objects;
 	RoamSphere *sphere;
-	WmsInfo    *bmng;
-	WmsInfo    *srtm;
-	guint       sm_source;
+	guint       sm_source[2];
+
+	/* for testing */
+	gboolean    wireframe;
 };
 
 struct _GisOpenGLClass {
-	GtkDrawingAreaClass parent_class;
-	
+	GisViewerClass parent_class;
+
 	/* class members */
 };
 
 GType gis_opengl_get_type(void);
 
 /* Methods */
-GisOpenGL *gis_opengl_new(GisWorld *world, GisView *view, GisPlugins *plugins);
-
-void gis_opengl_center_position(GisOpenGL *gis, gdouble lat, gdouble lon, gdouble elev);
-
-void gis_opengl_redraw(GisOpenGL *gis);
-
-void gis_opengl_begin(GisOpenGL *gis);
-void gis_opengl_end(GisOpenGL *gis);
-void gis_opengl_flush(GisOpenGL *gis);
+GisViewer *gis_opengl_new(GisPlugins *plugins);
 
 #endif