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

diff --git a/src/gis-opengl.h b/src/gis-opengl.h
index 069456f..256d0d0 100644
--- a/src/gis-opengl.h
+++ b/src/gis-opengl.h
@@ -36,8 +36,8 @@ typedef struct _GisOpenGLClass GisOpenGLClass;
 #include "gis-view.h"
 #include "gis-world.h"
 #include "gis-plugin.h"
+#include "gis-tile.h"
 #include "roam.h"
-#include "wms.h"
 
 struct _GisOpenGL {
 	GtkDrawingArea parent_instance;
@@ -47,14 +47,15 @@ struct _GisOpenGL {
 	GisView    *view;
 	GisPlugins *plugins;
 	RoamSphere *sphere;
-	WmsInfo    *bmng;
-	WmsInfo    *srtm;
 	guint       sm_source;
+
+	/* for testing */
+	gboolean    wireframe;
 };
 
 struct _GisOpenGLClass {
 	GtkDrawingAreaClass parent_class;
-	
+
 	/* class members */
 };
 
@@ -63,12 +64,22 @@ 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_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_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 *gis);
+void gis_opengl_redraw(GisOpenGL *opengl);
 
-void gis_opengl_begin(GisOpenGL *gis);
-void gis_opengl_end(GisOpenGL *gis);
-void gis_opengl_flush(GisOpenGL *gis);
+void gis_opengl_begin(GisOpenGL *opengl);
+void gis_opengl_end(GisOpenGL *opengl);
+void gis_opengl_flush(GisOpenGL *opengl);
 
 #endif