Removing ridge plugin and moving exmaple plugin
authorAndy Spencer <andy753421@gmail.com>
Wed, 2 Sep 2009 14:42:02 +0000 (14:42 +0000)
committerAndy Spencer <andy753421@gmail.com>
Wed, 2 Sep 2009 14:42:02 +0000 (14:42 +0000)
Ridge plugin is deprecated due to libGIS. The example plugin has been
moved out of the autoconf source tree into the stand-alone examples
folder. Wms, Roam, and GPQueue headers now included in the install.

17 files changed:
opt/.gitignore
src/.gitignore
src/examples/plugin/mkfile [new file with mode: 0644]
src/examples/plugin/teapot.c [moved from src/plugins/example.c with 56% similarity]
src/examples/plugin/teapot.h [new file with mode: 0644]
src/examples/tex/mkfile [moved from src/examples/mkfile with 100% similarity]
src/examples/tex/tex.c [moved from src/examples/tex.c with 97% similarity]
src/examples/tex/tex.png [moved from src/examples/tex_png/tex.png with 100% similarity]
src/examples/tex/texl.png [moved from src/examples/tex_png/texl.png with 100% similarity]
src/examples/tex/texls.png [moved from src/examples/tex_png/texls.png with 100% similarity]
src/examples/tex/texr.png [moved from src/examples/tex_png/texr.png with 100% similarity]
src/examples/tex/texrs.png [moved from src/examples/tex_png/texrs.png with 100% similarity]
src/gis/Makefile.am
src/plugins/Makefile.am
src/plugins/example.h [deleted file]
src/plugins/ridge.c [deleted file]
src/plugins/ridge.h [deleted file]

index 0bf5e60..e69de29 100644 (file)
@@ -1,3 +0,0 @@
-rsl-v1.*
-rsl-git
-rsl-win32
index 3e9b416..9a7efac 100644 (file)
@@ -1,6 +1,7 @@
 *.la
 *.lo
 *.o
+*.so
 .deps
 .libs
 aweather
diff --git a/src/examples/plugin/mkfile b/src/examples/plugin/mkfile
new file mode 100644 (file)
index 0000000..2c63d6d
--- /dev/null
@@ -0,0 +1,14 @@
+CFLAGS=`{pkg-config --cflags libgis}
+LDFLAGS=`{pkg-config --libs libgis}
+LIB=teapot.so
+default:V: $LIB
+%.so: %.o
+       gcc $CFLAGS -fPIC -shared -o $target $prereq $LDFLAGS
+%.o: %.c
+       gcc $CFLAGS -fPIC -c -o $target $prereq
+clean:V:
+       rm -f *.o *.so
+install:V:
+       cp $LIB /usr/lib/gis/
+uninstall:V:
+       rm /usr/lib/gis/$LIB
similarity index 56%
rename from src/plugins/example.c
rename to src/examples/plugin/teapot.c
index 3d6a668..fd551cc 100644 (file)
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <config.h>
-#include <gtk/gtk.h>
 #include <gtk/gtkgl.h>
 #include <GL/gl.h>
 
-#include <gis/gis.h>
+#include <gis.h>
 
-#include "example.h"
+#include "teapot.h"
 
 /***********
  * Helpers *
  ***********/
 static gboolean rotate(gpointer _self)
 {
-       GisPluginExample *self = _self;
+       GisPluginTeapot *self = _self;
        if (gtk_toggle_button_get_active(self->button)) {
                self->rotation += 1.0;
                gis_opengl_redraw(self->opengl);
@@ -41,25 +39,25 @@ static gboolean rotate(gpointer _self)
 /***********
  * Methods *
  ***********/
-GisPluginExample *gis_plugin_example_new(GisWorld *world, GisView *view, GisOpenGL *opengl)
+GisPluginTeapot *gis_plugin_teapot_new(GisWorld *world, GisView *view, GisOpenGL *opengl)
 {
-       g_debug("GisPluginExample: new");
-       GisPluginExample *self = g_object_new(GIS_TYPE_PLUGIN_EXAMPLE, NULL);
+       g_debug("GisPluginTeapot: new");
+       GisPluginTeapot *self = g_object_new(GIS_TYPE_PLUGIN_TEAPOT, NULL);
        self->opengl = opengl;
 
        return self;
 }
 
-static GtkWidget *gis_plugin_example_get_config(GisPlugin *_self)
+static GtkWidget *gis_plugin_teapot_get_config(GisPlugin *_self)
 {
-       GisPluginExample *self = GIS_PLUGIN_EXAMPLE(_self);
+       GisPluginTeapot *self = GIS_PLUGIN_TEAPOT(_self);
        return GTK_WIDGET(self->button);
 }
 
-static void gis_plugin_example_expose(GisPlugin *_self)
+static void gis_plugin_teapot_expose(GisPlugin *_self)
 {
-       GisPluginExample *self = GIS_PLUGIN_EXAMPLE(_self);
-       g_debug("GisPluginExample: expose");
+       GisPluginTeapot *self = GIS_PLUGIN_TEAPOT(_self);
+       g_debug("GisPluginTeapot: expose");
 
        glMatrixMode(GL_PROJECTION);
        glLoadIdentity();
@@ -88,47 +86,47 @@ static void gis_plugin_example_expose(GisPlugin *_self)
  * GObject code *
  ****************/
 /* Plugin init */
-static void gis_plugin_example_plugin_init(GisPluginInterface *iface);
-G_DEFINE_TYPE_WITH_CODE(GisPluginExample, gis_plugin_example, G_TYPE_OBJECT,
+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_example_plugin_init));
-static void gis_plugin_example_plugin_init(GisPluginInterface *iface)
+                       gis_plugin_teapot_plugin_init));
+static void gis_plugin_teapot_plugin_init(GisPluginInterface *iface)
 {
-       g_debug("GisPluginExample: plugin_init");
+       g_debug("GisPluginTeapot: plugin_init");
        /* Add methods to the interface */
-       iface->expose     = gis_plugin_example_expose;
-       iface->get_config = gis_plugin_example_get_config;
+       iface->expose     = gis_plugin_teapot_expose;
+       iface->get_config = gis_plugin_teapot_get_config;
 }
 /* Class/Object init */
-static void gis_plugin_example_init(GisPluginExample *self)
+static void gis_plugin_teapot_init(GisPluginTeapot *self)
 {
-       g_debug("GisPluginExample: init");
+       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;
        self->opengl    = NULL;
 }
-static void gis_plugin_example_dispose(GObject *gobject)
+static void gis_plugin_teapot_dispose(GObject *gobject)
 {
-       g_debug("GisPluginExample: dispose");
-       GisPluginExample *self = GIS_PLUGIN_EXAMPLE(gobject);
+       g_debug("GisPluginTeapot: dispose");
+       GisPluginTeapot *self = GIS_PLUGIN_TEAPOT(gobject);
        g_source_remove(self->rotate_id);
        /* Drop references */
-       G_OBJECT_CLASS(gis_plugin_example_parent_class)->dispose(gobject);
+       G_OBJECT_CLASS(gis_plugin_teapot_parent_class)->dispose(gobject);
 }
-static void gis_plugin_example_finalize(GObject *gobject)
+static void gis_plugin_teapot_finalize(GObject *gobject)
 {
-       g_debug("GisPluginExample: finalize");
-       GisPluginExample *self = GIS_PLUGIN_EXAMPLE(gobject);
+       g_debug("GisPluginTeapot: finalize");
+       GisPluginTeapot *self = GIS_PLUGIN_TEAPOT(gobject);
        /* Free data */
-       G_OBJECT_CLASS(gis_plugin_example_parent_class)->finalize(gobject);
+       G_OBJECT_CLASS(gis_plugin_teapot_parent_class)->finalize(gobject);
 
 }
-static void gis_plugin_example_class_init(GisPluginExampleClass *klass)
+static void gis_plugin_teapot_class_init(GisPluginTeapotClass *klass)
 {
-       g_debug("GisPluginExample: class_init");
+       g_debug("GisPluginTeapot: class_init");
        GObjectClass *gobject_class = (GObjectClass*)klass;
-       gobject_class->dispose  = gis_plugin_example_dispose;
-       gobject_class->finalize = gis_plugin_example_finalize;
+       gobject_class->dispose  = gis_plugin_teapot_dispose;
+       gobject_class->finalize = gis_plugin_teapot_finalize;
 }
diff --git a/src/examples/plugin/teapot.h b/src/examples/plugin/teapot.h
new file mode 100644 (file)
index 0000000..5008e04
--- /dev/null
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2009 Andy Spencer <spenceal@rose-hulman.edu>
+ * 
+ * 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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __TEAPOT_H__
+#define __TEAPOT_H__
+
+#include <glib-object.h>
+
+#define GIS_TYPE_PLUGIN_TEAPOT            (gis_plugin_teapot_get_type ())
+#define GIS_PLUGIN_TEAPOT(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj),   GIS_TYPE_PLUGIN_TEAPOT, GisPluginTeapot))
+#define GIS_IS_PLUGIN_TEAPOT(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj),   GIS_TYPE_PLUGIN_TEAPOT))
+#define GIS_PLUGIN_TEAPOT_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST   ((klass), GIS_TYPE_PLUGIN_TEAPOT, GisPluginTeapotClass))
+#define GIS_IS_PLUGIN_TEAPOT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE   ((klass), GIS_TYPE_PLUGIN_TEAPOT))
+#define GIS_PLUGIN_TEAPOT_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),   GIS_TYPE_PLUGIN_TEAPOT, GisPluginTeapotClass))
+
+typedef struct _GisPluginTeapot      GisPluginTeapot;
+typedef struct _GisPluginTeapotClass GisPluginTeapotClass;
+
+struct _GisPluginTeapot {
+       GObject parent_instance;
+
+       /* instance members */
+       GtkToggleButton *button;
+       guint            rotate_id;
+       float            rotation;
+       GisOpenGL       *opengl;
+};
+
+struct _GisPluginTeapotClass {
+       GObjectClass parent_class;
+};
+
+GType gis_plugin_teapot_get_type();
+
+/* Methods */
+GisPluginTeapot *gis_plugin_teapot_new(GisWorld *world, GisView *view, GisOpenGL *opengl);
+
+#endif
similarity index 100%
rename from src/examples/mkfile
rename to src/examples/tex/mkfile
similarity index 97%
rename from src/examples/tex.c
rename to src/examples/tex/tex.c
index 267c1c1..76bfb2c 100644 (file)
@@ -133,9 +133,9 @@ int main(int argc, char **argv)
        gdk_gl_drawable_gl_begin(gldrawable, glcontext);
 
        /* Load texture */
-       texl = load_tex("tex_png/texls.png");
-       texr = load_tex("tex_png/texrs.png");
-       tex  = load_tex("tex_png/tex.png");
+       texl = load_tex("texls.png");
+       texr = load_tex("texrs.png");
+       tex  = load_tex("tex.png");
 
        gtk_main();
 
index 3a5b740..9b52348 100644 (file)
@@ -13,7 +13,10 @@ gis_include_HEADERS = \
        gis-prefs.h   \
        gis-opengl.h  \
        gis-plugin.h  \
-       gis-data.h
+       gis-data.h    \
+       gpqueue.h     \
+       roam.h        \
+       wms.h
 libgis_la_SOURCES = \
        gis-world.c   gis-world.h   \
        gis-view.c    gis-view.h    \
index c7c60b2..a3520ee 100644 (file)
@@ -5,13 +5,7 @@ AM_LDFLAGS  = -module -avoid-version
 plugindir = $(libdir)/gis
 
 plugin_LTLIBRARIES = \
-       example.la \
-       radar.la   \
-       ridge.la
-
-example_la_SOURCES = example.c example.h
-
-ridge_la_SOURCES   = ridge.c   ridge.h
+       radar.la
 
 radar_la_SOURCES   = radar.c   radar.h \
        marching.c marching.h \
diff --git a/src/plugins/example.h b/src/plugins/example.h
deleted file mode 100644 (file)
index 039d3bb..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2009 Andy Spencer <spenceal@rose-hulman.edu>
- * 
- * 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
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef __EXAMPLE_H__
-#define __EXAMPLE_H__
-
-#include <glib-object.h>
-
-#define GIS_TYPE_PLUGIN_EXAMPLE            (gis_plugin_example_get_type ())
-#define GIS_PLUGIN_EXAMPLE(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj),   GIS_TYPE_PLUGIN_EXAMPLE, GisPluginExample))
-#define GIS_IS_PLUGIN_EXAMPLE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj),   GIS_TYPE_PLUGIN_EXAMPLE))
-#define GIS_PLUGIN_EXAMPLE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST   ((klass), GIS_TYPE_PLUGIN_EXAMPLE, GisPluginExampleClass))
-#define GIS_IS_PLUGIN_EXAMPLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE   ((klass), GIS_TYPE_PLUGIN_EXAMPLE))
-#define GIS_PLUGIN_EXAMPLE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),   GIS_TYPE_PLUGIN_EXAMPLE, GisPluginExampleClass))
-
-typedef struct _GisPluginExample        GisPluginExample;
-typedef struct _GisPluginExampleClass   GisPluginExampleClass;
-
-struct _GisPluginExample {
-       GObject parent_instance;
-
-       /* instance members */
-       GtkToggleButton *button;
-       guint            rotate_id;
-       float            rotation;
-       GisOpenGL       *opengl;
-};
-
-struct _GisPluginExampleClass {
-       GObjectClass parent_class;
-};
-
-GType gis_plugin_example_get_type();
-
-/* Methods */
-GisPluginExample *gis_plugin_example_new(GisWorld *world, GisView *view, GisOpenGL *opengl);
-
-#endif
diff --git a/src/plugins/ridge.c b/src/plugins/ridge.c
deleted file mode 100644 (file)
index 1d79f78..0000000
+++ /dev/null
@@ -1,248 +0,0 @@
-/*
- * Copyright (C) 2009 Andy Spencer <spenceal@rose-hulman.edu>
- * 
- * 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
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <config.h>
-#include <stdio.h>
-#include <gtk/gtk.h>
-#include <curl/curl.h>
-#include <GL/gl.h>
-
-#include <gis/gis.h>
-
-#include "ridge.h"
-
-
-/*********************
- * Overlay constants *
- *********************/
-enum {
-       LAYER_TOPO,
-       LAYER_COUNTY,
-       LAYER_RIVERS,
-       LAYER_HIGHWAYS,
-       LAYER_CITY,
-       LAYER_COUNT
-};
-
-typedef struct {
-       gchar *name;
-       gchar *fmt;
-       gboolean enabled;
-       float z;
-       guint tex;
-} layer_t;
-
-static layer_t layers[] = {
-       [LAYER_TOPO]     = {"Topo",     "Overlays/Topo/Short/%s_Topo_Short.jpg",         TRUE,  1, 0},
-       [LAYER_COUNTY]   = {"Counties", "Overlays/County/Short/%s_County_Short.gif",     TRUE,  3, 0},
-       [LAYER_RIVERS]   = {"Rivers",   "Overlays/Rivers/Short/%s_Rivers_Short.gif",     FALSE, 4, 0},
-       [LAYER_HIGHWAYS] = {"Highways", "Overlays/Highways/Short/%s_Highways_Short.gif", FALSE, 5, 0},
-       [LAYER_CITY]     = {"Cities",   "Overlays/Cities/Short/%s_City_Short.gif",       TRUE,  6, 0},
-};
-
-
-/***********
- * Helpers *
- ***********/
-/*
- * Load an image into an OpenGL texture
- * \param  filename  Path to the image file
- * \return The OpenGL identifier for the texture
- */
-void load_texture(GisPluginRidge *self, layer_t *layer, gchar *filename)
-{
-       gis_opengl_begin(self->opengl);
-
-       /* Load image */
-       GError *error = NULL;
-       GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file(filename, &error);
-       if (!pixbuf || error) {
-               g_warning("Failed to load texture: %s", filename);
-               return;
-       }
-       guchar    *pixels = gdk_pixbuf_get_pixels(pixbuf);
-       int        width  = gdk_pixbuf_get_width(pixbuf);
-       int        height = gdk_pixbuf_get_height(pixbuf);
-       int        format = gdk_pixbuf_get_has_alpha(pixbuf) ? GL_RGBA : GL_RGB;
-
-       /* Create Texture */
-       glDeleteTextures(1, &layer->tex);
-       glGenTextures(1, &layer->tex);
-       glBindTexture(GL_TEXTURE_2D, layer->tex); // 2d texture (x and y size)
-
-       glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
-       glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, width, height, 0,
-                       format, GL_UNSIGNED_BYTE, pixels);
-       glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-       glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-
-       char *base = g_path_get_basename(filename);
-       g_debug("GisPluginRidge: load_texture - "
-               "w=%-3d  h=%-3d  fmt=%x  px=(%02x,%02x,%02x,%02x)  img=%s",
-               width, height, format, pixels[0], pixels[1], pixels[2], pixels[3],
-               base);
-       g_free(base);
-
-       gis_opengl_end(self->opengl);
-
-       g_object_unref(pixbuf);
-
-       /* Redraw */
-       gis_opengl_redraw(self->opengl);
-}
-
-
-/*****************
- * ASync helpers *
- *****************/
-typedef struct {
-       GisPluginRidge *self;
-       layer_t *layer;
-} cached_t;
-void cached_cb(gchar *filename, gboolean updated, gpointer _udata)
-{
-       cached_t *udata = _udata;
-       load_texture(udata->self, udata->layer, filename);
-       g_free(udata);
-}
-
-
-/*************
- * callbacks *
- *************/
-static void on_site_changed(GisView *view, gchar *site, GisPluginRidge *self)
-{
-       g_debug("GisPluginRidge: on_site_changed - site=%s", site);
-       if (site == NULL || site[0] == '\0')
-               return;
-       for (int i = 0; i < LAYER_COUNT; i++) {
-               gchar *base = "http://radar.weather.gov/ridge/";
-               gchar *path  = g_strdup_printf(layers[i].fmt, site+1);
-               cached_t *udata = g_malloc(sizeof(cached_t));
-               udata->self  = self;
-               udata->layer = &layers[i];
-               cache_file(base, path, GIS_ONCE, NULL, cached_cb, udata);
-               g_free(path);
-       }
-}
-
-void toggle_layer(GtkToggleButton *check, GisPluginRidge *self)
-{
-       layer_t *layer = g_object_get_data(G_OBJECT(check), "layer");
-       layer->enabled = gtk_toggle_button_get_active(check);
-       gis_opengl_redraw(self->opengl);
-}
-
-
-/***********
- * Methods *
- ***********/
-GisPluginRidge *gis_plugin_ridge_new(GisWorld *world, GisView *view, GisOpenGL *opengl)
-{
-       GisPluginRidge *self = g_object_new(GIS_TYPE_PLUGIN_RIDGE, NULL);
-       self->world  = world;
-       self->view   = view;
-       self->opengl = opengl;
-
-       g_signal_connect(view, "site-changed", G_CALLBACK(on_site_changed), self);
-       on_site_changed(view, gis_view_get_site(view), self);
-
-       return self;
-}
-
-static GtkWidget *gis_plugin_ridge_get_config(GisPlugin *_self)
-{
-       GisPluginRidge *self = GIS_PLUGIN_RIDGE(_self);
-       GtkWidget *body = gtk_alignment_new(0.5, 0, 0, 0);
-       GtkWidget *hbox = gtk_hbox_new(FALSE, 10);
-       for (int i = 0; i < LAYER_COUNT; i++) {
-               GtkWidget *check = gtk_check_button_new_with_label(layers[i].name);
-               gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check), layers[i].enabled);
-               gtk_box_pack_start(GTK_BOX(hbox), check, FALSE, TRUE, 0);
-               g_object_set_data(G_OBJECT(check), "layer", &layers[i]);
-               g_signal_connect(check, "toggled", G_CALLBACK(toggle_layer), self);
-       }
-       gtk_container_add(GTK_CONTAINER(body), hbox);
-       return body;
-}
-
-static void gis_plugin_ridge_expose(GisPlugin *_self)
-{
-       GisPluginRidge *self = GIS_PLUGIN_RIDGE(_self);
-
-       g_debug("GisPluginRidge: expose");
-       glEnable(GL_TEXTURE_2D);
-       glColor4f(1,1,1,1);
-
-       for (int i = 0; i < LAYER_COUNT; i++) {
-               if (!layers[i].enabled)
-                       continue;
-               glBindTexture(GL_TEXTURE_2D, layers[i].tex);
-               glBegin(GL_POLYGON);
-               glTexCoord2f(0.0, 0.0); glVertex3f(240*1000*-1.0, 282*1000* 1.0, layers[i].z);
-               glTexCoord2f(0.0, 1.0); glVertex3f(240*1000*-1.0, 282*1000*-1.0, layers[i].z);
-               glTexCoord2f(1.0, 1.0); glVertex3f(240*1000* 1.0, 282*1000*-1.0, layers[i].z);
-               glTexCoord2f(1.0, 0.0); glVertex3f(240*1000* 1.0, 282*1000* 1.0, layers[i].z);
-               glEnd();
-       }
-}
-
-
-/****************
- * GObject code *
- ****************/
-/* Plugin init */
-static void gis_plugin_ridge_plugin_init(GisPluginInterface *iface);
-G_DEFINE_TYPE_WITH_CODE(GisPluginRidge, gis_plugin_ridge, G_TYPE_OBJECT,
-               G_IMPLEMENT_INTERFACE(GIS_TYPE_PLUGIN,
-                       gis_plugin_ridge_plugin_init));
-static void gis_plugin_ridge_plugin_init(GisPluginInterface *iface)
-{
-       g_debug("GisPluginRidge: plugin_init");
-       /* Add methods to the interface */
-       iface->expose     = gis_plugin_ridge_expose;
-       iface->get_config = gis_plugin_ridge_get_config;
-}
-/* Class/Object init */
-static void gis_plugin_ridge_init(GisPluginRidge *self)
-{
-       g_debug("GisPluginRidge: init");
-       /* Set defaults */
-}
-static void gis_plugin_ridge_dispose(GObject *gobject)
-{
-       g_debug("GisPluginRidge: dispose");
-       GisPluginRidge *self = GIS_PLUGIN_RIDGE(gobject);
-       /* Drop references */
-       G_OBJECT_CLASS(gis_plugin_ridge_parent_class)->dispose(gobject);
-}
-static void gis_plugin_ridge_finalize(GObject *gobject)
-{
-       g_debug("GisPluginRidge: finalize");
-       GisPluginRidge *self = GIS_PLUGIN_RIDGE(gobject);
-       /* Free data */
-       G_OBJECT_CLASS(gis_plugin_ridge_parent_class)->finalize(gobject);
-
-}
-static void gis_plugin_ridge_class_init(GisPluginRidgeClass *klass)
-{
-       g_debug("GisPluginRidge: class_init");
-       GObjectClass *gobject_class = (GObjectClass*)klass;
-       gobject_class->dispose  = gis_plugin_ridge_dispose;
-       gobject_class->finalize = gis_plugin_ridge_finalize;
-}
-
diff --git a/src/plugins/ridge.h b/src/plugins/ridge.h
deleted file mode 100644 (file)
index 72f460a..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (C) 2009 Andy Spencer <spenceal@rose-hulman.edu>
- * 
- * 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
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef __RIDGE_H__
-#define __RIDGE_H__
-
-#include <glib-object.h>
-
-#include <gis/gis.h>
-
-#define GIS_TYPE_PLUGIN_RIDGE            (gis_plugin_ridge_get_type ())
-#define GIS_PLUGIN_RIDGE(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj),   GIS_TYPE_PLUGIN_RIDGE, GisPluginRidge))
-#define GIS_IS_PLUGIN_RIDGE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj),   GIS_TYPE_PLUGIN_RIDGE))
-#define GIS_PLUGIN_RIDGE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST   ((klass), GIS_TYPE_PLUGIN_RIDGE, GisPluginRidgeClass))
-#define GIS_IS_PLUGIN_RIDGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE   ((klass), GIS_TYPE_PLUGIN_RIDGE))
-#define GIS_PLUGIN_RIDGE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),   GIS_TYPE_PLUGIN_RIDGE, GisPluginRidgeClass))
-
-typedef struct _GisPluginRidge      GisPluginRidge;
-typedef struct _GisPluginRidgeClass GisPluginRidgeClass;
-
-struct _GisPluginRidge {
-       GObject parent_instance;
-
-       /* instance members */
-       GisWorld    *world;
-       GisView     *view;
-       GisOpenGL   *opengl;
-};
-
-struct _GisPluginRidgeClass {
-       GObjectClass parent_class;
-};
-
-GType gis_plugin_ridge_get_type();
-
-/* Methods */
-GisPluginRidge *gis_plugin_ridge_new(GisWorld *world, GisView *view, GisOpenGL *opengl);
-
-#endif