Remove marching code (now in marching branch)

[aweather] / src / plugins / radar.h

diff --git a/src/plugins/radar.h b/src/plugins/radar.h
index 34a260752ab7e7b5c2d9bceef1e6a736bd6b8172..771b1d4ba449acc6d743cf7fe7b1271a3d56ee85 100644 (file)
--- a/src/plugins/radar.h
+++ b/src/plugins/radar.h
@@ -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
@@ -19,12 +19,9 @@
 #define __RADAR_H__
 
 #include <glib-object.h>
-#include <libsoup/soup.h>
 #include <rsl.h>
 
-#include <gis/gis.h>
-
-#include "marching.h"
+#include <gis.h>
 
 /* TODO: convert */
 typedef struct {
@@ -47,23 +44,22 @@ struct _GisPluginRadar {
        GObject parent_instance;
 
        /* instance members */
-       GisWorld    *world;
-       GisView     *view;
-       GisOpenGL   *opengl;
+       GisViewer   *viewer;
        GisPrefs    *prefs;
+       GisHttp     *http;
        GtkWidget   *config_body;
        GtkWidget   *progress_bar;
        GtkWidget   *progress_label;
-       SoupSession *soup;
        guint        time_changed_id;
+       guint        location_changed_id;
 
        /* Private data for loading radars */
+       char        *cur_site;
+       char        *cur_time;
        Radar       *cur_radar;
        Sweep       *cur_sweep;
        colormap_t  *cur_colormap;
        guint        cur_sweep_tex;
-       TRIANGLE    *cur_triangles;
-       guint        cur_num_triangles;
 };
 
 struct _GisPluginRadarClass {
@@ -73,7 +69,7 @@ struct _GisPluginRadarClass {
 GType gis_plugin_radar_get_type();
 
 /* Methods */
-GisPluginRadar *gis_plugin_radar_new(GisWorld *world, GisView *view, GisOpenGL *opengl, GisPrefs *prefs);
+GisPluginRadar *gis_plugin_radar_new(GisViewer *viewer, GisPrefs *prefs);
 
 /* Misc. RSL helpers */
 #define RSL_FOREACH_VOL(radar, volume, count, index) \