X-Git-Url: http://pileus.org/git/?p=grits;a=blobdiff_plain;f=src%2Fplugins%2Fsat.c;h=5389ddb3c82e7f22d5904fba8a8dc142047e3455;hp=edbe652834ae855349e3873bf4bcd6cd0cfb3c77;hb=c07abad157dd10d3f8cc229b2f616c3a33f6c900;hpb=78550a3dc871c42dbc3e124abce78b902f978afd diff --git a/src/plugins/sat.c b/src/plugins/sat.c index edbe652..5389ddb 100644 --- a/src/plugins/sat.c +++ b/src/plugins/sat.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2010 Andy Spencer + * Copyright (C) 2009-2011 Andy Spencer * * 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,16 +19,15 @@ * SECTION:sat * @short_description: Satellite plugin * - * #GisPluginSat provides overlays using satellite imagery. This is mostly + * #GritsPluginSat provides overlays using satellite imagery. This is mostly * provided by NASA's Blue Marble Next Generation. */ #include #include #include -#include -#include +#include #include "sat.h" @@ -36,144 +35,102 @@ #define TILE_WIDTH 1024 #define TILE_HEIGHT 512 -struct _LoadTileData { - GisPluginSat *sat; - GisTile *tile; - GdkPixbuf *pixbuf; -}; -static gboolean _load_tile_cb(gpointer _data) +static void _load_tile_thread(gpointer _tile, gpointer _sat) { - struct _LoadTileData *data = _data; - GisPluginSat *sat = data->sat; - GisTile *tile = data->tile; - GdkPixbuf *pixbuf = data->pixbuf; - g_free(data); - - /* Create Texture */ - g_debug("GisPluginSat: _load_tile_cb start"); - guchar *pixels = gdk_pixbuf_get_pixels(pixbuf); - gboolean alpha = gdk_pixbuf_get_has_alpha(pixbuf); - gint width = gdk_pixbuf_get_width(pixbuf); - gint height = gdk_pixbuf_get_height(pixbuf); + GritsTile *tile = _tile; + GritsPluginSat *sat = _sat; + + g_debug("GritsPluginSat: _load_tile_thread start %p - tile=%p", + g_thread_self(), tile); + if (sat->aborted) { + g_debug("GritsPluginSat: _load_tile_thread - aborted"); + return; + } - /* Draw a border */ - //gint border = 10; - //gint stride = gdk_pixbuf_get_rowstride(pixbuf); - //for (int i = 0; i < border; i++) { - // memset(&pixels[( i)*stride], 0xff, stride); - // memset(&pixels[(height-i)*stride], 0xff, stride); - //} - //for (int i = 0; i < height; i++) { - // memset(&pixels[(i*stride)], 0xff, border*4); - // memset(&pixels[(i*stride)+((width-border)*4)], 0xff, border*4); - //} - - guint *tex = g_new0(guint, 1); - glGenTextures(1, tex); - glBindTexture(GL_TEXTURE_2D, *tex); - - glPixelStorei(GL_UNPACK_ALIGNMENT, 1); - glPixelStorei(GL_PACK_ALIGNMENT, 1); - glTexImage2D(GL_TEXTURE_2D, 0, 4, width, height, 0, - (alpha ? GL_RGBA : GL_RGB), GL_UNSIGNED_BYTE, pixels); - glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); - glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP); - glFlush(); - - tile->data = tex; - gtk_widget_queue_draw(GTK_WIDGET(sat->viewer)); - g_object_unref(pixbuf); - return FALSE; -} + /* Download tile */ + gchar *path = grits_wms_fetch(sat->wms, tile, GRITS_ONCE, NULL, NULL); + if (!path) return; // Canceled/error -static void _load_tile(GisTile *tile, gpointer _sat) -{ - GisPluginSat *sat = _sat; - g_debug("GisPluginSat: _load_tile start %p", g_thread_self()); - char *path = gis_wms_fetch(sat->wms, tile, GIS_ONCE, NULL, NULL); - struct _LoadTileData *data = g_new0(struct _LoadTileData, 1); - data->sat = sat; - data->tile = tile; - data->pixbuf = gdk_pixbuf_new_from_file(path, NULL); - if (data->pixbuf) { - g_idle_add_full(G_PRIORITY_LOW, _load_tile_cb, data, NULL); - } else { - g_warning("GisPluginSat: _load_tile - Error loading pixbuf %s", path); - g_free(data); + /* Load pixbuf */ + GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file(path, NULL); + if (!pixbuf) { + g_warning("GritsPluginSat: _load_tile_thread - Error loading pixbuf %s", path); g_remove(path); + g_free(path); + return; } g_free(path); - g_debug("GisPluginSat: _load_tile end %p", g_thread_self()); -} -static gboolean _free_tile_cb(gpointer data) -{ - glDeleteTextures(1, data); - g_free(data); - return FALSE; -} -static void _free_tile(GisTile *tile, gpointer _sat) -{ - GisPluginSat *sat = _sat; - g_debug("GisPluginSat: _free_tile: %p=%d", tile->data, *(guint*)tile->data); - g_idle_add_full(G_PRIORITY_LOW, _free_tile_cb, tile->data, NULL); + /* Draw a border */ +#ifdef DRAW_TILE_BORDER + gint border = 10; + gint width = gdk_pixbuf_get_width(pixbuf); + gint height = gdk_pixbuf_get_height(pixbuf); + gint stride = gdk_pixbuf_get_rowstride(pixbuf); + guchar *pixels = gdk_pixbuf_get_pixels(pixbuf); + for (int i = 0; i < border; i++) { + memset(&pixels[( i)*stride], 0xff, stride); + memset(&pixels[(height-1-i)*stride], 0xff, stride); + } + for (int i = 0; i < height; i++) { + memset(&pixels[(i*stride) ], 0xff, border*4); + memset(&pixels[(i*stride)+((width-border)*4)], 0xff, border*4); + } +#endif + + /* Load the GL texture from the main thread */ + grits_tile_load_pixbuf(tile, pixbuf); + g_debug("GritsPluginSat: _load_tile_thread end %p", g_thread_self()); } -static gpointer _update_tiles(gpointer _sat) +static void _load_tile_func(GritsTile *tile, gpointer _sat) { - g_debug("GisPluginSat: _update_tiles"); - GisPluginSat *sat = _sat; - g_mutex_lock(sat->mutex); - gdouble lat, lon, elev; - gis_viewer_get_location(sat->viewer, &lat, &lon, &elev); - gis_tile_update(sat->tiles, - MAX_RESOLUTION, TILE_WIDTH, TILE_WIDTH, - lat, lon, elev, - _load_tile, sat); - gis_tile_gc(sat->tiles, time(NULL)-10, - _free_tile, sat); - g_mutex_unlock(sat->mutex); - return NULL; + g_debug("GritsPluginSat: __load_tile_func - tile=%p", tile); + GritsPluginSat *sat = _sat; + g_thread_pool_push(sat->threads, tile, NULL); } /************* * Callbacks * *************/ -static void _on_location_changed(GisViewer *viewer, - gdouble lat, gdouble lon, gdouble elev, GisPluginSat *sat) +static void _on_location_changed(GritsViewer *viewer, + gdouble lat, gdouble lon, gdouble elev, GritsPluginSat *sat) { - g_thread_create(_update_tiles, sat, FALSE, NULL); + GritsPoint eye = {lat, lon, elev}; + grits_tile_update(sat->tiles, &eye, + MAX_RESOLUTION, TILE_WIDTH, TILE_WIDTH, + _load_tile_func, sat); + grits_tile_gc(sat->tiles, time(NULL)-10, NULL, sat); } /*********** * Methods * ***********/ /** - * gis_plugin_sat_new: - * @viewer: the #GisViewer to use for drawing + * grits_plugin_sat_new: + * @viewer: the #GritsViewer to use for drawing * * Create a new instance of the satellite plugin. * - * Returns: the new #GisPluginSat + * Returns: the new #GritsPluginSat */ -GisPluginSat *gis_plugin_sat_new(GisViewer *viewer) +GritsPluginSat *grits_plugin_sat_new(GritsViewer *viewer) { - g_debug("GisPluginSat: new"); - GisPluginSat *sat = g_object_new(GIS_TYPE_PLUGIN_SAT, NULL); + g_debug("GritsPluginSat: new"); + GritsPluginSat *sat = g_object_new(GRITS_TYPE_PLUGIN_SAT, NULL); sat->viewer = g_object_ref(viewer); /* Load initial tiles */ - _load_tile(sat->tiles, sat); - g_thread_create(_update_tiles, sat, FALSE, NULL); + gdouble lat, lon, elev; + grits_viewer_get_location(viewer, &lat, &lon, &elev); + _on_location_changed(viewer, lat, lon, elev, sat); /* Connect signals */ sat->sigid = g_signal_connect(sat->viewer, "location-changed", G_CALLBACK(_on_location_changed), sat); /* Add renderers */ - gis_viewer_add(viewer, GIS_OBJECT(sat->tiles), GIS_LEVEL_WORLD, 0); + grits_viewer_add(viewer, GRITS_OBJECT(sat->tiles), GRITS_LEVEL_WORLD, FALSE); return sat; } @@ -183,53 +140,59 @@ GisPluginSat *gis_plugin_sat_new(GisViewer *viewer) * GObject code * ****************/ /* Plugin init */ -static void gis_plugin_sat_plugin_init(GisPluginInterface *iface); -G_DEFINE_TYPE_WITH_CODE(GisPluginSat, gis_plugin_sat, G_TYPE_OBJECT, - G_IMPLEMENT_INTERFACE(GIS_TYPE_PLUGIN, - gis_plugin_sat_plugin_init)); -static void gis_plugin_sat_plugin_init(GisPluginInterface *iface) +static void grits_plugin_sat_plugin_init(GritsPluginInterface *iface); +G_DEFINE_TYPE_WITH_CODE(GritsPluginSat, grits_plugin_sat, G_TYPE_OBJECT, + G_IMPLEMENT_INTERFACE(GRITS_TYPE_PLUGIN, + grits_plugin_sat_plugin_init)); +static void grits_plugin_sat_plugin_init(GritsPluginInterface *iface) { - g_debug("GisPluginSat: plugin_init"); + g_debug("GritsPluginSat: plugin_init"); /* Add methods to the interface */ } /* Class/Object init */ -static void gis_plugin_sat_init(GisPluginSat *sat) +static void grits_plugin_sat_init(GritsPluginSat *sat) { - g_debug("GisPluginSat: init"); + g_debug("GritsPluginSat: init"); /* Set defaults */ - sat->mutex = g_mutex_new(); - sat->tiles = gis_tile_new(NULL, NORTH, SOUTH, EAST, WEST); - sat->wms = gis_wms_new( + sat->threads = g_thread_pool_new(_load_tile_thread, sat, 1, FALSE, NULL); + sat->tiles = grits_tile_new(NULL, NORTH, SOUTH, EAST, WEST); + sat->wms = grits_wms_new( "http://www.nasa.network.com/wms", "bmng200406", "image/jpeg", "bmng/", "jpg", TILE_WIDTH, TILE_HEIGHT); + g_object_ref(sat->tiles); } -static void gis_plugin_sat_dispose(GObject *gobject) +static void grits_plugin_sat_dispose(GObject *gobject) { - g_debug("GisPluginSat: dispose"); - GisPluginSat *sat = GIS_PLUGIN_SAT(gobject); + g_debug("GritsPluginSat: dispose"); + GritsPluginSat *sat = GRITS_PLUGIN_SAT(gobject); + sat->aborted = TRUE; /* Drop references */ if (sat->viewer) { - g_signal_handler_disconnect(sat->viewer, sat->sigid); - g_object_unref(sat->viewer); + GritsViewer *viewer = sat->viewer; + g_signal_handler_disconnect(viewer, sat->sigid); + soup_session_abort(sat->wms->http->soup); + g_thread_pool_free(sat->threads, TRUE, TRUE); sat->viewer = NULL; + grits_viewer_remove(viewer, GRITS_OBJECT(sat->tiles)); + g_object_unref(sat->tiles); + g_object_unref(viewer); } - G_OBJECT_CLASS(gis_plugin_sat_parent_class)->dispose(gobject); + G_OBJECT_CLASS(grits_plugin_sat_parent_class)->dispose(gobject); } -static void gis_plugin_sat_finalize(GObject *gobject) +static void grits_plugin_sat_finalize(GObject *gobject) { - g_debug("GisPluginSat: finalize"); - GisPluginSat *sat = GIS_PLUGIN_SAT(gobject); + g_debug("GritsPluginSat: finalize"); + GritsPluginSat *sat = GRITS_PLUGIN_SAT(gobject); /* Free data */ - gis_tile_free(sat->tiles, _free_tile, sat); - gis_wms_free(sat->wms); - g_mutex_free(sat->mutex); - G_OBJECT_CLASS(gis_plugin_sat_parent_class)->finalize(gobject); + grits_wms_free(sat->wms); + grits_tile_free(sat->tiles, NULL, sat); + G_OBJECT_CLASS(grits_plugin_sat_parent_class)->finalize(gobject); } -static void gis_plugin_sat_class_init(GisPluginSatClass *klass) +static void grits_plugin_sat_class_init(GritsPluginSatClass *klass) { - g_debug("GisPluginSat: class_init"); + g_debug("GritsPluginSat: class_init"); GObjectClass *gobject_class = (GObjectClass*)klass; - gobject_class->dispose = gis_plugin_sat_dispose; - gobject_class->finalize = gis_plugin_sat_finalize; + gobject_class->dispose = grits_plugin_sat_dispose; + gobject_class->finalize = grits_plugin_sat_finalize; }