X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=src%2Fgis-opengl.h;h=df40002fa84a9765eb5c3554be1bed553e16a418;hb=10671a702a73850f66173d0ddc0632b768affb7e;hp=b1f7b567f8640a0fa5541f3f15f58790f4897333;hpb=b088e18d9e838064bb264a145ff66e57886ee42a;p=grits

diff --git a/src/gis-opengl.h b/src/gis-opengl.h
index b1f7b56..df40002 100644
--- a/src/gis-opengl.h
+++ b/src/gis-opengl.h
@@ -1,5 +1,5 @@
 /*
- * 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
@@ -38,10 +38,10 @@ struct _GisOpenGL {
 	GisViewer parent_instance;
 
 	/* instance members */
+	GTree      *objects;
 	RoamSphere *sphere;
+	GMutex     *sphere_lock;
 	guint       sm_source[2];
-	cairo_t    *canvas;
-	guint       canvas_tex;
 
 	/* for testing */
 	gboolean    wireframe;
@@ -56,6 +56,6 @@ struct _GisOpenGLClass {
 GType gis_opengl_get_type(void);
 
 /* Methods */
-GisViewer *gis_opengl_new(GisPlugins *plugins);
+GisViewer *gis_opengl_new(GisPlugins *plugins, GisPrefs *prefs);
 
 #endif