libgis -> grits: Fix build after rename

[grits] / examples / plugin / teapot.c

diff --git a/examples/plugin/teapot.c b/examples/plugin/teapot.c
index 06d466e13d414391c391f2f81f943359e441bdee..d2a51feac8faaa1c503f0497f15aa2fd2beaa9fa 100644 (file)
--- a/examples/plugin/teapot.c
+++ b/examples/plugin/teapot.c
@@ -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
@@ -18,44 +18,26 @@
 #include <gtk/gtkgl.h>
 #include <GL/gl.h>
 
-#include <gis/gis.h>
+#include <grits.h>
 
 #include "teapot.h"
 
 /***********
  * Helpers *
  ***********/
-static gboolean rotate(gpointer _self)
+static gboolean rotate(gpointer _teapot)
 {
-       GisPluginTeapot *self = _self;
-       if (gtk_toggle_button_get_active(self->button)) {
-               self->rotation += 1.0;
-               gtk_widget_queue_draw(GTK_WIDGET(self->viewer));
+       GisPluginTeapot *teapot = _teapot;
+       if (gtk_toggle_button_get_active(teapot->button)) {
+               teapot->rotation += 1.0;
+               gtk_widget_queue_draw(GTK_WIDGET(teapot->viewer));
        }
        return TRUE;
 }
 
-
-/***********
- * Methods *
- ***********/
-GisPluginTeapot *gis_plugin_teapot_new(GisViewer *viewer, GisPrefs *prefs)
+static void expose(GisCallback *callback, GisOpenGL *opengl, gpointer _teapot)
 {
-       g_debug("GisPluginTeapot: new");
-       GisPluginTeapot *self = g_object_new(GIS_TYPE_PLUGIN_TEAPOT, NULL);
-       self->viewer = viewer;
-       return self;
-}
-
-static GtkWidget *gis_plugin_teapot_get_config(GisPlugin *_self)
-{
-       GisPluginTeapot *self = GIS_PLUGIN_TEAPOT(_self);
-       return GTK_WIDGET(self->button);
-}
-
-static void gis_plugin_teapot_expose(GisPlugin *_self)
-{
-       GisPluginTeapot *self = GIS_PLUGIN_TEAPOT(_self);
+       GisPluginTeapot *teapot = GIS_PLUGIN_TEAPOT(_teapot);
        g_debug("GisPluginTeapot: expose");
 
        glMatrixMode(GL_PROJECTION);
@@ -74,13 +56,36 @@ static void gis_plugin_teapot_expose(GisPlugin *_self)
        glEnable(GL_COLOR_MATERIAL);
 
        glTranslatef(-0.5, -0.5, -2);
-       glRotatef(self->rotation, 1, 1, 0);
+       glRotatef(teapot->rotation, 1, 1, 0);
        glColor4f(0.9, 0.9, 0.7, 1.0);
        glDisable(GL_CULL_FACE);
        gdk_gl_draw_teapot(TRUE, 0.25);
 }
 
 
+/***********
+ * Methods *
+ ***********/
+GisPluginTeapot *gis_plugin_teapot_new(GisViewer *viewer, GisPrefs *prefs)
+{
+       g_debug("GisPluginTeapot: new");
+       GisPluginTeapot *teapot = g_object_new(GIS_TYPE_PLUGIN_TEAPOT, NULL);
+       teapot->viewer = viewer;
+
+       /* Add renderers */
+       GisCallback *callback = gis_callback_new(expose, teapot);
+       gis_viewer_add(viewer, GIS_OBJECT(callback), GIS_LEVEL_OVERLAY+1, 0);
+
+       return teapot;
+}
+
+static GtkWidget *gis_plugin_teapot_get_config(GisPlugin *_teapot)
+{
+       GisPluginTeapot *teapot = GIS_PLUGIN_TEAPOT(_teapot);
+       return GTK_WIDGET(teapot->button);
+}
+
+
 /****************
  * GObject code *
  ****************/
@@ -93,23 +98,22 @@ static void gis_plugin_teapot_plugin_init(GisPluginInterface *iface)
 {
        g_debug("GisPluginTeapot: plugin_init");
        /* Add methods to the interface */
-       iface->expose     = gis_plugin_teapot_expose;
        iface->get_config = gis_plugin_teapot_get_config;
 }
 /* Class/Object init */
-static void gis_plugin_teapot_init(GisPluginTeapot *self)
+static void gis_plugin_teapot_init(GisPluginTeapot *teapot)
 {
        g_debug("GisPluginTeapot: init");
        /* Set defaults */
-       self->button    = GTK_TOGGLE_BUTTON(gtk_toggle_button_new_with_label("Rotate"));
-       self->rotate_id = g_timeout_add(1000/60, rotate, self);
-       self->rotation  = 30.0;
+       teapot->button    = GTK_TOGGLE_BUTTON(gtk_toggle_button_new_with_label("Rotate"));
+       teapot->rotate_id = g_timeout_add(1000/60, rotate, teapot);
+       teapot->rotation  = 30.0;
 }
 static void gis_plugin_teapot_dispose(GObject *gobject)
 {
        g_debug("GisPluginTeapot: dispose");
-       GisPluginTeapot *self = GIS_PLUGIN_TEAPOT(gobject);
-       g_source_remove(self->rotate_id);
+       GisPluginTeapot *teapot = GIS_PLUGIN_TEAPOT(gobject);
+       g_source_remove(teapot->rotate_id);
        /* Drop references */
        G_OBJECT_CLASS(gis_plugin_teapot_parent_class)->dispose(gobject);
 }