Add preliminary support for points/markers

[grits] / src / gis-opengl.h

diff --git a/src/gis-opengl.h b/src/gis-opengl.h
index fcaaa0e636c5d450b248bac9b5d6631abf7f79b7..2e80d07cad55824e3ff27e09d7828e9136a5a9a8 100644 (file)
--- a/src/gis-opengl.h
+++ b/src/gis-opengl.h
@@ -1,16 +1,16 @@
 /*
  * Copyright (C) 2009 Andy Spencer <spenceal@rose-hulman.edu>
- * 
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
@@ -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;
+       guint       sm_source[2];
+
+       /* for testing */
+       gboolean    wireframe;
 };
 
 struct _GisOpenGLClass {
        GtkDrawingAreaClass parent_class;
-       
+
        /* class members */
 };
 
@@ -63,12 +64,26 @@ 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_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 *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