Add locking when modifying for viewer object lists

[grits] / src / gis-opengl.h

diff --git a/src/gis-opengl.h b/src/gis-opengl.h
index fcaaa0e636c5d450b248bac9b5d6631abf7f79b7..72d7b13bdf0fe62050ad28a4bbc190e06fce401e 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>
- * 
+ * Copyright (C) 2009-2010 Andy Spencer <andy753421@gmail.com>
+ *
  * 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/>.
  */
@@ -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,33 @@
 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;
+       GMutex     *objects_lock;
        RoamSphere *sphere;
-       WmsInfo    *bmng;
-       WmsInfo    *srtm;
-       guint       sm_source;
+       GMutex     *sphere_lock;
+       guint       sm_source[2];
+       guint       ue_source;
+
+       /* 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, GisPrefs *prefs);
 
 #endif