Fix naming for the GisView/GisWorld -> GisViewer merge

[grits] / src / gis-opengl.h

diff --git a/src/gis-opengl.h b/src/gis-opengl.h
index 19feefce186b5aa616d1d49f0153a2bd6642069b..a0f612596e0a8541458f7911cd3e09ee5ace0f2b 100644 (file)
--- a/src/gis-opengl.h
+++ b/src/gis-opengl.h
@@ -33,8 +33,7 @@
 typedef struct _GisOpenGL      GisOpenGL;
 typedef struct _GisOpenGLClass GisOpenGLClass;
 
-#include "gis-view.h"
-#include "gis-world.h"
+#include "gis-viewer.h"
 #include "gis-plugin.h"
 #include "gis-tile.h"
 #include "roam.h"
@@ -43,11 +42,10 @@ struct _GisOpenGL {
        GtkDrawingArea parent_instance;
 
        /* instance members */
-       GisWorld   *world;
-       GisView    *view;
+       GisViewer  *viewer;
        GisPlugins *plugins;
        RoamSphere *sphere;
-       guint       sm_source;
+       guint       sm_source[2];
 
        /* for testing */
        gboolean    wireframe;
@@ -62,15 +60,24 @@ struct _GisOpenGLClass {
 GType gis_opengl_get_type(void);
 
 /* Methods */
-GisOpenGL *gis_opengl_new(GisWorld *world, GisView *view, GisPlugins *plugins);
+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);