Switch from GtkGLExt to internal OpenGL handling

[grits] / examples / plugin / teapot.c

diff --git a/examples/plugin/teapot.c b/examples/plugin/teapot.c
index 445c15771aeb584221bd5056f428ec20bc4b3b44..2a1201d9c02a0e53d17bdb60eceade1cbb0eaff8 100644 (file)
--- a/examples/plugin/teapot.c
+++ b/examples/plugin/teapot.c
@@ -15,30 +15,30 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <gtk/gtkgl.h>
 #include <GL/gl.h>
+#include <GL/glut.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));
+       GritsPluginTeapot *teapot = _teapot;
+       if (gtk_toggle_button_get_active(teapot->button)) {
+               teapot->rotation += 1.0;
+               gtk_widget_queue_draw(GTK_WIDGET(teapot->viewer));
        }
        return TRUE;
 }
 
-static gpointer expose(GisCallback *callback, gpointer _self)
+static void expose(GritsCallback *callback, GritsOpenGL *opengl, gpointer _teapot)
 {
-       GisPluginTeapot *self = GIS_PLUGIN_TEAPOT(_self);
-       g_debug("GisPluginTeapot: expose");
+       GritsPluginTeapot *teapot = GRITS_PLUGIN_TEAPOT(_teapot);
+       g_debug("GritsPluginTeapot: expose");
 
        glMatrixMode(GL_PROJECTION);
        glLoadIdentity();
@@ -56,35 +56,33 @@ static gpointer expose(GisCallback *callback, gpointer _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);
-
-       return NULL;
+       glutSolidTeapot(2.5);
 }
 
 
 /***********
  * Methods *
  ***********/
-GisPluginTeapot *gis_plugin_teapot_new(GisViewer *viewer, GisPrefs *prefs)
+GritsPluginTeapot *grits_plugin_teapot_new(GritsViewer *viewer, GritsPrefs *prefs)
 {
-       g_debug("GisPluginTeapot: new");
-       GisPluginTeapot *self = g_object_new(GIS_TYPE_PLUGIN_TEAPOT, NULL);
-       self->viewer = viewer;
+       g_debug("GritsPluginTeapot: new");
+       GritsPluginTeapot *teapot = g_object_new(GRITS_TYPE_PLUGIN_TEAPOT, NULL);
+       teapot->viewer = viewer;
 
        /* Add renderers */
-       GisCallback *callback = gis_callback_new(expose, self);
-       gis_viewer_add(viewer, GIS_OBJECT(callback), GIS_LEVEL_WORLD, 0);
+       GritsCallback *callback = grits_callback_new(expose, teapot);
+       grits_viewer_add(viewer, GRITS_OBJECT(callback), GRITS_LEVEL_OVERLAY+1, 0);
 
-       return self;
+       return teapot;
 }
 
-static GtkWidget *gis_plugin_teapot_get_config(GisPlugin *_self)
+static GtkWidget *grits_plugin_teapot_get_config(GritsPlugin *_teapot)
 {
-       GisPluginTeapot *self = GIS_PLUGIN_TEAPOT(_self);
-       return GTK_WIDGET(self->button);
+       GritsPluginTeapot *teapot = GRITS_PLUGIN_TEAPOT(_teapot);
+       return GTK_WIDGET(teapot->button);
 }
 
 
@@ -92,36 +90,36 @@ static GtkWidget *gis_plugin_teapot_get_config(GisPlugin *_self)
  * GObject code *
  ****************/
 /* Plugin init */
-static void gis_plugin_teapot_plugin_init(GisPluginInterface *iface);
-G_DEFINE_TYPE_WITH_CODE(GisPluginTeapot, gis_plugin_teapot, G_TYPE_OBJECT,
-               G_IMPLEMENT_INTERFACE(GIS_TYPE_PLUGIN,
-                       gis_plugin_teapot_plugin_init));
-static void gis_plugin_teapot_plugin_init(GisPluginInterface *iface)
+static void grits_plugin_teapot_plugin_init(GritsPluginInterface *iface);
+G_DEFINE_TYPE_WITH_CODE(GritsPluginTeapot, grits_plugin_teapot, G_TYPE_OBJECT,
+               G_IMPLEMENT_INTERFACE(GRITS_TYPE_PLUGIN,
+                       grits_plugin_teapot_plugin_init));
+static void grits_plugin_teapot_plugin_init(GritsPluginInterface *iface)
 {
-       g_debug("GisPluginTeapot: plugin_init");
+       g_debug("GritsPluginTeapot: plugin_init");
        /* Add methods to the interface */
-       iface->get_config = gis_plugin_teapot_get_config;
+       iface->get_config = grits_plugin_teapot_get_config;
 }
 /* Class/Object init */
-static void gis_plugin_teapot_init(GisPluginTeapot *self)
+static void grits_plugin_teapot_init(GritsPluginTeapot *teapot)
 {
-       g_debug("GisPluginTeapot: init");
+       g_debug("GritsPluginTeapot: 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)
+static void grits_plugin_teapot_dispose(GObject *gobject)
 {
-       g_debug("GisPluginTeapot: dispose");
-       GisPluginTeapot *self = GIS_PLUGIN_TEAPOT(gobject);
-       g_source_remove(self->rotate_id);
+       g_debug("GritsPluginTeapot: dispose");
+       GritsPluginTeapot *teapot = GRITS_PLUGIN_TEAPOT(gobject);
+       g_source_remove(teapot->rotate_id);
        /* Drop references */
-       G_OBJECT_CLASS(gis_plugin_teapot_parent_class)->dispose(gobject);
+       G_OBJECT_CLASS(grits_plugin_teapot_parent_class)->dispose(gobject);
 }
-static void gis_plugin_teapot_class_init(GisPluginTeapotClass *klass)
+static void grits_plugin_teapot_class_init(GritsPluginTeapotClass *klass)
 {
-       g_debug("GisPluginTeapot: class_init");
+       g_debug("GritsPluginTeapot: class_init");
        GObjectClass *gobject_class = (GObjectClass*)klass;
-       gobject_class->dispose  = gis_plugin_teapot_dispose;
+       gobject_class->dispose  = grits_plugin_teapot_dispose;
 }