X-Git-Url: http://pileus.org/git/?p=grits;a=blobdiff_plain;f=src%2Fgrits-opengl.h;h=0686df3989ff387e0716dbfb9bfef3566046dd7b;hp=0b5a9b6ee6f1f778543989923084f56e8ecfdd28;hb=4a002d3be2d7d321797f18ff12b6fcd3f19d0066;hpb=d8948985b467a5cfd0447ae413ed1c5d01afb024

diff --git a/src/grits-opengl.h b/src/grits-opengl.h
index 0b5a9b6..0686df3 100644
--- a/src/grits-opengl.h
+++ b/src/grits-opengl.h
@@ -15,30 +15,30 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GIS_OPENGL_H__
-#define __GIS_OPENGL_H__
+#ifndef __GRITS_OPENGL_H__
+#define __GRITS_OPENGL_H__
 
 #include <glib-object.h>
 
 /* Type macros */
-#define GIS_TYPE_OPENGL            (gis_opengl_get_type())
-#define GIS_OPENGL(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj),   GIS_TYPE_OPENGL, GisOpenGL))
-#define GIS_IS_OPENGL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj),   GIS_TYPE_OPENGL))
-#define GIS_OPENGL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST   ((klass), GIS_TYPE_OPENGL, GisOpenGLClass))
-#define GIS_IS_OPENGL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE   ((klass), GIS_TYPE_OPENGL))
-#define GIS_OPENGL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),   GIS_TYPE_OPENGL, GisOpenGLClass))
+#define GRITS_TYPE_OPENGL            (grits_opengl_get_type())
+#define GRITS_OPENGL(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj),   GRITS_TYPE_OPENGL, GritsOpenGL))
+#define GRITS_IS_OPENGL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj),   GRITS_TYPE_OPENGL))
+#define GRITS_OPENGL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST   ((klass), GRITS_TYPE_OPENGL, GritsOpenGLClass))
+#define GRITS_IS_OPENGL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE   ((klass), GRITS_TYPE_OPENGL))
+#define GRITS_OPENGL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),   GRITS_TYPE_OPENGL, GritsOpenGLClass))
 
-typedef struct _GisOpenGL      GisOpenGL;
-typedef struct _GisOpenGLClass GisOpenGLClass;
+typedef struct _GritsOpenGL      GritsOpenGL;
+typedef struct _GritsOpenGLClass GritsOpenGLClass;
 
 #include "grits-viewer.h"
 #include "roam.h"
 
-struct _GisOpenGL {
-	GisViewer parent_instance;
+struct _GritsOpenGL {
+	GritsViewer parent_instance;
 
 	/* instance members */
-	GTree      *objects;
+	GQueue     *objects;
 	GMutex     *objects_lock;
 	RoamSphere *sphere;
 	GMutex     *sphere_lock;
@@ -47,17 +47,18 @@ struct _GisOpenGL {
 
 	/* for testing */
 	gboolean    wireframe;
+	gboolean    pickmode;
 };
 
-struct _GisOpenGLClass {
-	GisViewerClass parent_class;
+struct _GritsOpenGLClass {
+	GritsViewerClass parent_class;
 
 	/* class members */
 };
 
-GType gis_opengl_get_type(void);
+GType grits_opengl_get_type(void);
 
 /* Methods */
-GisViewer *gis_opengl_new(GisPlugins *plugins, GisPrefs *prefs);
+GritsViewer *grits_opengl_new(GritsPlugins *plugins, GritsPrefs *prefs);
 
 #endif