#include <stdio.h>
#include "aweather-gui.h"
+#include "plugin-ridge.h"
#include "data.h"
+/****************
+ * GObject code *
+ ****************/
+static void aweather_ridge_plugin_init(AWeatherPluginInterface *iface);
+static void aweather_ridge_expose(AWeatherPlugin *_ridge);
+G_DEFINE_TYPE_WITH_CODE(AWeatherRidge, aweather_ridge, G_TYPE_OBJECT,
+ G_IMPLEMENT_INTERFACE(AWEATHER_TYPE_PLUGIN,
+ aweather_ridge_plugin_init));
+static void aweather_ridge_class_init(AWeatherRidgeClass *klass)
+{
+ GObjectClass *object_class = (GObjectClass*)klass;
+}
+static void aweather_ridge_plugin_init(AWeatherPluginInterface *iface)
+{
+ /* Add methods to the interface */
+ iface->expose = aweather_ridge_expose;
+}
+static void aweather_ridge_init(AWeatherRidge *ridge)
+{
+ /* Set defaults */
+ ridge->gui = NULL;
+}
+
+
+/***********
+ * Helpers *
+ ***********/
enum {
LAYER_TOPO,
LAYER_COUNTY,
[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", TRUE, 5, 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},
};
-static AWeatherGui *gui = NULL;
+/* TODO: Remove this */
+AWeatherGui *old_gui = NULL;
/**
* Load an image into an OpenGL texture
* \param filename Path to the image file
* \return The OpenGL identifier for the texture
*/
-void load_texture(gchar *filename, gpointer _layer)
+void load_texture(gchar *filename, gboolean updated, gpointer _layer)
{
layer_t *layer = _layer;
- aweather_gui_gl_begin(gui);
+ aweather_gui_gl_begin(old_gui);
/* Load image */
GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file(filename, NULL);
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)
base);
g_free(base);
- aweather_gui_gl_end(gui);
+ aweather_gui_gl_end(old_gui);
+
+ g_object_unref(pixbuf);
/* Redraw */
- gtk_widget_queue_draw(aweather_gui_get_widget(gui, "drawing"));
+ aweather_gui_gl_redraw(old_gui);
}
-static void set_site(AWeatherView *view, gchar *site, gpointer user_data)
+static void set_site(AWeatherView *view, gchar *site, AWeatherRidge *ridge)
{
- g_message("location changed to %s", site);
+ g_message("site changed to %s", site);
for (int i = 0; i < LAYER_COUNT; i++) {
gchar *base = "http://radar.weather.gov/ridge/";
gchar *path = g_strdup_printf(layers[i].fmt, site);
- cache_file(base, path, load_texture, &layers[i]);
+ cache_file(base, path, AWEATHER_NEVER, load_texture, &layers[i]);
g_free(path);
}
}
-static gboolean expose(GtkWidget *da, GdkEventExpose *event, gpointer user_data)
-{
- g_message("ridge:expose");
- glPushMatrix();
- 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(250*1000*-1.0, 250*1000* 1.0, layers[i].z);
- glTexCoord2f(0.0, 1.0); glVertex3f(250*1000*-1.0, 250*1000*-1.0, layers[i].z);
- glTexCoord2f(1.0, 1.0); glVertex3f(250*1000* 1.0, 250*1000*-1.0, layers[i].z);
- glTexCoord2f(1.0, 0.0); glVertex3f(250*1000* 1.0, 250*1000* 1.0, layers[i].z);
- glEnd();
- }
-
- glPopMatrix();
- return FALSE;
-}
-
void toggle_layer(GtkToggleButton *check, gpointer _layer)
{
layer_t *layer = _layer;
layer->enabled = gtk_toggle_button_get_active(check);
- gtk_widget_queue_draw(aweather_gui_get_widget(gui, "drawing"));
+ aweather_gui_gl_redraw(old_gui);
}
-gboolean ridge_init(AWeatherGui *_gui)
+/***********
+ * Methods *
+ ***********/
+AWeatherRidge *aweather_ridge_new(AWeatherGui *gui)
{
- gui = _gui;
+ AWeatherRidge *ridge = g_object_new(AWEATHER_TYPE_RIDGE, NULL);
+ ridge->gui = old_gui = gui;
+
AWeatherView *view = aweather_gui_get_view(gui);
GtkWidget *drawing = aweather_gui_get_widget(gui, "drawing");
GtkWidget *config = aweather_gui_get_widget(gui, "tabs");
gtk_container_add(GTK_CONTAINER(body), hbox);
gtk_notebook_append_page(GTK_NOTEBOOK(config), body, tab);
- /* Set up OpenGL Stuff */
- g_signal_connect(drawing, "expose-event", G_CALLBACK(expose), NULL);
- g_signal_connect(view, "location-changed", G_CALLBACK(set_site), NULL);
+ g_signal_connect(view, "site-changed", G_CALLBACK(set_site), ridge);
+
+ return ridge;
+}
+
+static void aweather_ridge_expose(AWeatherPlugin *_ridge)
+{
+ AWeatherRidge *ridge = AWEATHER_RIDGE(_ridge);
+
+ g_message("ridge:expose");
+ glPushMatrix();
+ 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();
+ }
- return TRUE;
+ glPopMatrix();
}
projects / grits / blobdiff