X-Git-Url: http://pileus.org/git/?p=grits;a=blobdiff_plain;f=src%2Fplugins%2Felev.c;h=3634df61f640929d800ab566a92a4483a370fc42;hp=a6589ff0b6aff8af717ea2055611a46d10abeca3;hb=fde5359a826dadb68cfe3f62f0f3c9e0c25f3438;hpb=4d9d0eb76317c97b94f44a745ffecde29de0454d diff --git a/src/plugins/elev.c b/src/plugins/elev.c index a6589ff..3634df6 100644 --- a/src/plugins/elev.c +++ b/src/plugins/elev.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,43 +19,39 @@ * SECTION:elev * @short_description: Elevation plugin * - * #GisPluginElev provides access to ground elevation. It does this in two ways: + * #GritsPluginElev provides access to ground elevation. It does this in two ways: * First, it provides a height function used by the viewer when drawing the * world. Second, it can load the elevation data into an image and draw a * greyscale elevation overlay on the planets surface. */ -#include +#include #include -#include -#include +#include #include "elev.h" -#define MAX_RESOLUTION 500 +/* Configuration */ +#define LOAD_BIL TRUE +#define LOAD_TEX FALSE + +/* Tile size constnats */ +#define MAX_RESOLUTION 50 #define TILE_WIDTH 1024 #define TILE_HEIGHT 512 +#define TILE_CHANNELS 4 #define TILE_SIZE (TILE_WIDTH*TILE_HEIGHT*sizeof(guint16)) -struct _TileData { - /* OpenGL has to be first to make gis_opengl_render_tiles happy */ - guint opengl; - guint16 *bil; -}; - static gdouble _height_func(gdouble lat, gdouble lon, gpointer _elev) { - GisPluginElev *elev = _elev; + GritsPluginElev *elev = _elev; if (!elev) return 0; - GisTile *tile = gis_tile_find(elev->tiles, lat, lon); + GritsTile *tile = grits_tile_find(elev->tiles, lat, lon); if (!tile) return 0; - struct _TileData *data = tile->data; - if (!data) return 0; - - guint16 *bil = data->bil; + guint16 *bil = tile->data; if (!bil) return 0; gint w = TILE_WIDTH; @@ -98,209 +94,139 @@ static gdouble _height_func(gdouble lat, gdouble lon, gpointer _elev) /********************** * Loader and Freeers * **********************/ -#define LOAD_BIL TRUE -#define LOAD_OPENGL FALSE -struct _LoadTileData { - GisPluginElev *elev; - gchar *path; - GisTile *tile; - GdkPixbuf *pixbuf; - struct _TileData *data; -}; + static guint16 *_load_bil(gchar *path) { gsize len; gchar *data = NULL; g_file_get_contents(path, &data, &len, NULL); - g_debug("GisPluginElev: load_bil %p", data); + g_debug("GritsPluginElev: load_bil %p", data); if (len != TILE_SIZE) { - g_warning("GisPluginElev: _load_bil - unexpected tile size %d, != %d", - len, TILE_SIZE); + g_warning("GritsPluginElev: _load_bil - unexpected tile size %ld, != %ld", + (glong)len, (glong)TILE_SIZE); g_free(data); return NULL; } return (guint16*)data; } -static GdkPixbuf *_load_pixbuf(guint16 *bil) + +static guchar *_load_pixels(guint16 *bil) { - GdkPixbuf *pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, FALSE, 8, TILE_WIDTH, TILE_HEIGHT); - guchar *pixels = gdk_pixbuf_get_pixels(pixbuf); - gint stride = gdk_pixbuf_get_rowstride(pixbuf); - gint nchan = gdk_pixbuf_get_n_channels(pixbuf); + g_assert(TILE_CHANNELS == 4); + + guchar (*pixels)[TILE_WIDTH][TILE_CHANNELS] + = g_malloc0(TILE_HEIGHT * TILE_WIDTH * TILE_CHANNELS); for (int r = 0; r < TILE_HEIGHT; r++) { for (int c = 0; c < TILE_WIDTH; c++) { gint16 value = bil[r*TILE_WIDTH + c]; - //guchar color = (float)(MAX(value,0))/8848 * 255; guchar color = (float)value/8848 * 255; - pixels[r*stride + c*nchan + 0] = color; - pixels[r*stride + c*nchan + 1] = color; - pixels[r*stride + c*nchan + 2] = color; - if (nchan == 4) - pixels[r*stride + c*nchan + 3] = 128; + //guchar color = (float)(MAX(value,0))/8848 * 255; + pixels[r][c][0] = color; + pixels[r][c][1] = color; + pixels[r][c][2] = color; + pixels[r][c][3] = 0xff; } } - g_debug("GisPluginElev: load_pixbuf %p", pixbuf); - return pixbuf; -} -static guint _load_opengl(GdkPixbuf *pixbuf) -{ - /* Load image */ - guchar *pixels = gdk_pixbuf_get_pixels(pixbuf); - gint alpha = gdk_pixbuf_get_has_alpha(pixbuf); - gint nchan = 4; // gdk_pixbuf_get_n_channels(pixbuf); - gint width = gdk_pixbuf_get_width(pixbuf); - gint height = gdk_pixbuf_get_height(pixbuf); - - /* Create Texture */ - guint opengl; - glGenTextures(1, &opengl); - glBindTexture(GL_TEXTURE_2D, opengl); - - glPixelStorei(GL_UNPACK_ALIGNMENT, 1); - glPixelStorei(GL_PACK_ALIGNMENT, 1); - glTexImage2D(GL_TEXTURE_2D, 0, nchan, width, height, 0, - (alpha ? GL_RGBA : GL_RGB), GL_UNSIGNED_BYTE, pixels); - glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); - glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP); - - g_debug("GisPluginElev: load_opengl %d", opengl); - return opengl; -} -static gboolean _load_tile_cb(gpointer _load) -{ - struct _LoadTileData *load = _load; - g_debug("GisPluginElev: _load_tile_cb: %s", load->path); - GisPluginElev *elev = load->elev; - GisTile *tile = load->tile; - GdkPixbuf *pixbuf = load->pixbuf; - struct _TileData *data = load->data; - g_free(load->path); - g_free(load); - - if (LOAD_OPENGL) - data->opengl = _load_opengl(pixbuf); - - tile->data = data; - - /* Do necessasairy processing */ - /* TODO: Lock this and move to thread, can remove elev from _load then */ - if (LOAD_BIL) - gis_viewer_set_height_func(elev->viewer, tile, _height_func, elev, TRUE); - - /* Cleanup unneeded things */ - if (!LOAD_BIL) - g_free(data->bil); - if (LOAD_OPENGL) - g_object_unref(pixbuf); - return FALSE; + g_debug("GritsPluginElev: load_pixels %p", pixels); + return (guchar*)pixels; } -static void _load_tile(GisTile *tile, gpointer _elev) + +static void _load_tile_thread(gpointer _tile, gpointer _elev) { - GisPluginElev *elev = _elev; - - struct _LoadTileData *load = g_new0(struct _LoadTileData, 1); - load->path = gis_wms_fetch(elev->wms, tile, GIS_ONCE, NULL, NULL); - g_debug("GisPluginElev: _load_tile: %s", load->path); - load->elev = elev; - load->tile = tile; - load->data = g_new0(struct _TileData, 1); - if (LOAD_BIL || LOAD_OPENGL) { - load->data->bil = _load_bil(load->path); - if (!load->data->bil) { - g_remove(load->path); - g_free(load->data); - g_free(load->path); - g_free(load); - return; - } + GritsTile *tile = _tile; + GritsPluginElev *elev = _elev; + + g_debug("GritsPluginElev: _load_tile_thread start %p - tile=%p", + g_thread_self(), tile); + if (elev->aborted) { + g_debug("GritsPluginElev: _load_tile_thread - aborted"); + return; } - if (LOAD_OPENGL) { - load->pixbuf = _load_pixbuf(load->data->bil); + + /* Download tile */ + gchar *path = grits_wms_fetch(elev->wms, tile, GRITS_ONCE, NULL, NULL); + if (!path) + return; + + /* Load bil */ + guint16 *bil = _load_bil(path); + g_free(path); + if (!bil) + return; + + /* Set hight function (TODO: from main thread?) */ + if (LOAD_BIL) { + tile->data = bil; + grits_viewer_set_height_func(elev->viewer, &tile->edge, + _height_func, elev, TRUE); } - g_idle_add_full(G_PRIORITY_LOW, _load_tile_cb, load, NULL); -} + /* Load pixels for grayscale height textures */ + if (LOAD_TEX) { + guchar *pixels = _load_pixels(bil); + grits_tile_load_pixels(tile, pixels, + TILE_WIDTH, TILE_HEIGHT, TILE_CHANNELS==4); + } -static gboolean _free_tile_cb(gpointer _data) -{ - struct _TileData *data = _data; - if (LOAD_BIL) - g_free(data->bil); - if (LOAD_OPENGL) - glDeleteTextures(1, &data->opengl); - g_free(data); - return FALSE; -} -static void _free_tile(GisTile *tile, gpointer _elev) -{ - g_debug("GisPluginElev: _free_tile: %p", tile->data); - if (tile->data) - g_idle_add_full(G_PRIORITY_LOW, _free_tile_cb, tile->data, NULL); + /* Free bill if we're not interested in a hight function */ + if (!LOAD_BIL) + g_free(bil); + + /* Load the GL texture from the main thread */ + g_debug("GritsPluginElev: _load_tile_thread end %p", g_thread_self()); } -static gpointer _update_tiles(gpointer _elev) +static void _load_tile_func(GritsTile *tile, gpointer _elev) { - GisPluginElev *elev = _elev; - if (!g_mutex_trylock(elev->mutex)) - return NULL; - GisPoint eye; - gis_viewer_get_location(elev->viewer, &eye.lat, &eye.lon, &eye.elev); - gis_tile_update(elev->tiles, &eye, - MAX_RESOLUTION, TILE_WIDTH, TILE_WIDTH, - _load_tile, elev); - gis_tile_gc(elev->tiles, time(NULL)-10, - _free_tile, elev); - g_mutex_unlock(elev->mutex); - return NULL; + g_debug("GritsPluginElev: _load_tile_func - tile=%p", tile); + GritsPluginElev *elev = _elev; + g_thread_pool_push(elev->threads, tile, NULL); } /************* * Callbacks * *************/ -static void _on_location_changed(GisViewer *viewer, - gdouble lat, gdouble lon, gdouble elevation, GisPluginElev *elev) +static void _on_location_changed(GritsViewer *viewer, + gdouble lat, gdouble lon, gdouble elevation, GritsPluginElev *elev) { - g_thread_create(_update_tiles, elev, FALSE, NULL); -} - -static gpointer _threaded_init(GisPluginElev *elev) -{ - _load_tile(elev->tiles, elev); - _update_tiles(elev); - return NULL; + GritsPoint eye = {lat, lon, elevation}; + grits_tile_update(elev->tiles, &eye, + MAX_RESOLUTION, TILE_WIDTH, TILE_WIDTH, + _load_tile_func, elev); + grits_tile_gc(elev->tiles, time(NULL)-10, NULL, elev); } /*********** * Methods * ***********/ /** - * gis_plugin_elev_new: - * @viewer: the #GisViewer to use for drawing + * grits_plugin_elev_new: + * @viewer: the #GritsViewer to use for drawing * * Create a new instance of the elevation plugin. * - * Returns: the new #GisPluginElev + * Returns: the new #GritsPluginElev */ -GisPluginElev *gis_plugin_elev_new(GisViewer *viewer) +GritsPluginElev *grits_plugin_elev_new(GritsViewer *viewer) { - g_debug("GisPluginElev: new"); - GisPluginElev *elev = g_object_new(GIS_TYPE_PLUGIN_ELEV, NULL); + g_debug("GritsPluginElev: new"); + GritsPluginElev *elev = g_object_new(GRITS_TYPE_PLUGIN_ELEV, NULL); elev->viewer = g_object_ref(viewer); /* Load initial tiles */ - g_thread_create((GThreadFunc)_threaded_init, elev, FALSE, NULL); + gdouble lat, lon, elevation; + grits_viewer_get_location(viewer, &lat, &lon, &elevation); + _on_location_changed(viewer, lat, lon, elevation, elev); /* Connect signals */ elev->sigid = g_signal_connect(elev->viewer, "location-changed", G_CALLBACK(_on_location_changed), elev); /* Add renderers */ - if (LOAD_OPENGL) - gis_viewer_add(viewer, GIS_OBJECT(elev->tiles), GIS_LEVEL_WORLD, 0); + if (LOAD_TEX) + grits_viewer_add(viewer, GRITS_OBJECT(elev->tiles), GRITS_LEVEL_WORLD, FALSE); return elev; } @@ -310,55 +236,62 @@ GisPluginElev *gis_plugin_elev_new(GisViewer *viewer) * GObject code * ****************/ /* Plugin init */ -static void gis_plugin_elev_plugin_init(GisPluginInterface *iface); -G_DEFINE_TYPE_WITH_CODE(GisPluginElev, gis_plugin_elev, G_TYPE_OBJECT, - G_IMPLEMENT_INTERFACE(GIS_TYPE_PLUGIN, - gis_plugin_elev_plugin_init)); -static void gis_plugin_elev_plugin_init(GisPluginInterface *iface) +static void grits_plugin_elev_plugin_init(GritsPluginInterface *iface); +G_DEFINE_TYPE_WITH_CODE(GritsPluginElev, grits_plugin_elev, G_TYPE_OBJECT, + G_IMPLEMENT_INTERFACE(GRITS_TYPE_PLUGIN, + grits_plugin_elev_plugin_init)); +static void grits_plugin_elev_plugin_init(GritsPluginInterface *iface) { - g_debug("GisPluginElev: plugin_init"); + g_debug("GritsPluginElev: plugin_init"); /* Add methods to the interface */ } /* Class/Object init */ -static void gis_plugin_elev_init(GisPluginElev *elev) +static void grits_plugin_elev_init(GritsPluginElev *elev) { - g_debug("GisPluginElev: init"); + g_debug("GritsPluginElev: init"); /* Set defaults */ - elev->mutex = g_mutex_new(); - elev->tiles = gis_tile_new(NULL, NORTH, SOUTH, EAST, WEST); - elev->wms = gis_wms_new( - "http://www.nasa.network.com/elev", "srtm30", "application/bil", + elev->threads = g_thread_pool_new(_load_tile_thread, elev, 1, FALSE, NULL); + elev->tiles = grits_tile_new(NULL, NORTH, SOUTH, EAST, WEST); + elev->wms = grits_wms_new( + "http://www.nasa.network.com/elev", "mergedSrtm", "application/bil", "srtm/", "bil", TILE_WIDTH, TILE_HEIGHT); + g_object_ref(elev->tiles); } -static void gis_plugin_elev_dispose(GObject *gobject) +static void grits_plugin_elev_dispose(GObject *gobject) { - g_debug("GisPluginElev: dispose"); - GisPluginElev *elev = GIS_PLUGIN_ELEV(gobject); + g_debug("GritsPluginElev: dispose"); + GritsPluginElev *elev = GRITS_PLUGIN_ELEV(gobject); + elev->aborted = TRUE; /* Drop references */ - if (LOAD_BIL) - gis_viewer_clear_height_func(elev->viewer); if (elev->viewer) { - g_signal_handler_disconnect(elev->viewer, elev->sigid); - g_object_unref(elev->viewer); + GritsViewer *viewer = elev->viewer; + g_signal_handler_disconnect(viewer, elev->sigid); + grits_http_abort(elev->wms->http); + g_thread_pool_free(elev->threads, TRUE, TRUE); elev->viewer = NULL; + if (LOAD_BIL) + grits_viewer_clear_height_func(viewer); + if (LOAD_TEX) + grits_viewer_remove(viewer, GRITS_OBJECT(elev->tiles)); + g_object_unref(elev->tiles); + g_object_unref(viewer); } - G_OBJECT_CLASS(gis_plugin_elev_parent_class)->dispose(gobject); + G_OBJECT_CLASS(grits_plugin_elev_parent_class)->dispose(gobject); } -static void gis_plugin_elev_finalize(GObject *gobject) +static void grits_plugin_elev_finalize(GObject *gobject) { - g_debug("GisPluginElev: finalize"); - GisPluginElev *elev = GIS_PLUGIN_ELEV(gobject); + g_debug("GritsPluginElev: finalize"); + GritsPluginElev *elev = GRITS_PLUGIN_ELEV(gobject); /* Free data */ - gis_tile_free(elev->tiles, _free_tile, elev); - gis_wms_free(elev->wms); - g_mutex_free(elev->mutex); - G_OBJECT_CLASS(gis_plugin_elev_parent_class)->finalize(gobject); + grits_wms_free(elev->wms); + grits_tile_free(elev->tiles, NULL, elev); + G_OBJECT_CLASS(grits_plugin_elev_parent_class)->finalize(gobject); } -static void gis_plugin_elev_class_init(GisPluginElevClass *klass) +static void grits_plugin_elev_class_init(GritsPluginElevClass *klass) { - g_debug("GisPluginElev: class_init"); + g_debug("GritsPluginElev: class_init"); GObjectClass *gobject_class = (GObjectClass*)klass; - gobject_class->dispose = gis_plugin_elev_dispose; - gobject_class->finalize = gis_plugin_elev_finalize; + gobject_class->dispose = grits_plugin_elev_dispose; + gobject_class->finalize = grits_plugin_elev_finalize; }