Switch from GtkGLExt to internal OpenGL handling

[grits] / src / plugins / test.c

diff --git a/src/plugins/test.c b/src/plugins/test.c
index 9c3a96340bd2a104d3c0843863966ee3e444b4f0..c051806a0b392dc79616ca39c96666b4eb8243b9 100644 (file)
--- a/src/plugins/test.c
+++ b/src/plugins/test.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
@@ -15,28 +15,48 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <gtk/gtkgl.h>
+/**
+ * SECTION:test
+ * @short_description: Testing plugin
+ *
+ * #GritsPluginTest is a testing plugin used during development and as an example
+ * for how to create a plugin.
+ */
+
 #include <GL/gl.h>
 #include <GL/glu.h>
 
-#include <gis.h>
+#include <grits.h>
 
 #include "test.h"
 
 /***********
  * Methods *
  ***********/
-GisPluginTest *gis_plugin_test_new(GisViewer *viewer)
+gboolean _load_marker(gpointer _test)
 {
-       g_debug("GisPluginTest: new");
-       GisPluginTest *self = g_object_new(GIS_TYPE_PLUGIN_TEST, NULL);
-       self->viewer = viewer;
-
-       GisMarker *marker = gis_marker_new("St. Charles");
-       gis_point_set_lle(gis_object_center(marker), 38.841847, -90.491982, 0);
-       gis_viewer_add_object(self->viewer, GIS_OBJECT(marker));
-
-       return self;
+       GritsPluginTest *test = _test;
+       GritsMarker *marker = grits_marker_new("St. Charles");
+       grits_point_set_lle(grits_object_center(marker), 38.841847, -90.491982, 0);
+       GRITS_OBJECT(marker)->lod = EARTH_R;
+       test->marker = grits_viewer_add(test->viewer, GRITS_OBJECT(marker), GRITS_LEVEL_OVERLAY, 0);
+       return FALSE;
+}
+/**
+ * grits_plugin_test_new:
+ * @viewer: the #GritsViewer to use for drawing
+ *
+ * Create a new instance of the testing plugin.
+ *
+ * Returns: the new #GritsPluginTest
+ */
+GritsPluginTest *grits_plugin_test_new(GritsViewer *viewer)
+{
+       g_debug("GritsPluginTest: new");
+       GritsPluginTest *test = g_object_new(GRITS_TYPE_PLUGIN_TEST, NULL);
+       test->viewer = g_object_ref(viewer);
+       _load_marker(test);
+       return test;
 }
 
 
@@ -44,21 +64,34 @@ GisPluginTest *gis_plugin_test_new(GisViewer *viewer)
  * GObject code *
  ****************/
 /* Plugin init */
-static void gis_plugin_test_plugin_init(GisPluginInterface *iface);
-G_DEFINE_TYPE_WITH_CODE(GisPluginTest, gis_plugin_test, G_TYPE_OBJECT,
-               G_IMPLEMENT_INTERFACE(GIS_TYPE_PLUGIN,
-                       gis_plugin_test_plugin_init));
-static void gis_plugin_test_plugin_init(GisPluginInterface *iface)
+static void grits_plugin_test_plugin_init(GritsPluginInterface *iface);
+G_DEFINE_TYPE_WITH_CODE(GritsPluginTest, grits_plugin_test, G_TYPE_OBJECT,
+               G_IMPLEMENT_INTERFACE(GRITS_TYPE_PLUGIN,
+                       grits_plugin_test_plugin_init));
+static void grits_plugin_test_plugin_init(GritsPluginInterface *iface)
 {
-       g_debug("GisPluginTest: plugin_init");
+       g_debug("GritsPluginTest: plugin_init");
        /* Add methods to the interface */
 }
 /* Class/Object init */
-static void gis_plugin_test_init(GisPluginTest *self)
+static void grits_plugin_test_init(GritsPluginTest *test)
+{
+       g_debug("GritsPluginTest: init");
+}
+static void grits_plugin_test_dispose(GObject *_test)
 {
-       g_debug("GisPluginTest: init");
+       g_debug("GritsPluginTest: dispose");
+       GritsPluginTest *test = GRITS_PLUGIN_TEST(_test);
+       if (test->viewer) {
+               grits_viewer_remove(test->viewer, test->marker);
+               g_object_unref(test->viewer);
+               test->viewer = NULL;
+       }
+       G_OBJECT_CLASS(grits_plugin_test_parent_class)->dispose(_test);
 }
-static void gis_plugin_test_class_init(GisPluginTestClass *klass)
+static void grits_plugin_test_class_init(GritsPluginTestClass *klass)
 {
-       g_debug("GisPluginTest: class_init");
+       g_debug("GritsPluginTest: class_init");
+       GObjectClass *gobject_class = G_OBJECT_CLASS(klass);
+       gobject_class->dispose = grits_plugin_test_dispose;
 }