X-Git-Url: http://pileus.org/git/?p=grits;a=blobdiff_plain;f=src%2Fplugins%2Fsat.c;h=9e1af30e6a5eca5a561c19aac13be5814b4426a9;hp=155b30c322522dbee51b465d53bc5cb1751f70f3;hb=14c34a746fc94a9e5477d081275f04bd1c8b5d6d;hpb=6facff8b5777c6a561b9146736072d1de73bda1b
diff --git a/src/plugins/sat.c b/src/plugins/sat.c
index 155b30c..9e1af30 100644
--- a/src/plugins/sat.c
+++ b/src/plugins/sat.c
@@ -15,7 +15,16 @@
* along with this program. If not, see .
*/
+/**
+ * SECTION:sat
+ * @short_description: Satellite plugin
+ *
+ * #GisPluginSat provides overlays using satellite imagery. This is mostly
+ * provided by NASA's Blue Marble Next Generation.
+ */
+
#include
+#include
#include
#include
@@ -28,14 +37,14 @@
#define TILE_HEIGHT 512
struct _LoadTileData {
- GisPluginSat *self;
+ GisPluginSat *sat;
GisTile *tile;
GdkPixbuf *pixbuf;
};
static gboolean _load_tile_cb(gpointer _data)
{
struct _LoadTileData *data = _data;
- GisPluginSat *self = data->self;
+ GisPluginSat *sat = data->sat;
GisTile *tile = data->tile;
GdkPixbuf *pixbuf = data->pixbuf;
g_free(data);
@@ -47,8 +56,19 @@ static gboolean _load_tile_cb(gpointer _data)
gint width = gdk_pixbuf_get_width(pixbuf);
gint height = gdk_pixbuf_get_height(pixbuf);
+ /* 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);
- gis_viewer_begin(self->viewer);
glGenTextures(1, tex);
glBindTexture(GL_TEXTURE_2D, *tex);
@@ -56,32 +76,32 @@ static gboolean _load_tile_cb(gpointer _data)
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_NEAREST);
- glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_BORDER);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_BORDER);
+ 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();
- gis_viewer_end(self->viewer);
tile->data = tex;
- gtk_widget_queue_draw(GTK_WIDGET(self->viewer));
+ gtk_widget_queue_draw(GTK_WIDGET(sat->viewer));
g_object_unref(pixbuf);
return FALSE;
}
-static void _load_tile(GisTile *tile, gpointer _self)
+static void _load_tile(GisTile *tile, gpointer _sat)
{
- GisPluginSat *self = _self;
+ GisPluginSat *sat = _sat;
g_debug("GisPluginSat: _load_tile start %p", g_thread_self());
- char *path = gis_wms_make_local(self->wms, tile);
+ char *path = gis_wms_fetch(sat->wms, tile, GIS_ONCE, NULL, NULL);
struct _LoadTileData *data = g_new0(struct _LoadTileData, 1);
- data->self = self;
+ 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);
g_remove(path);
}
g_free(path);
@@ -94,27 +114,27 @@ static gboolean _free_tile_cb(gpointer data)
g_free(data);
return FALSE;
}
-static void _free_tile(GisTile *tile, gpointer _self)
+static void _free_tile(GisTile *tile, gpointer _sat)
{
- GisPluginSat *self = _self;
+ 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);
}
-static gpointer _update_tiles(gpointer _self)
+static gpointer _update_tiles(gpointer _sat)
{
g_debug("GisPluginSat: _update_tiles");
- GisPluginSat *self = _self;
- g_mutex_lock(self->mutex);
- gdouble lat, lon, elev;
- gis_viewer_get_location(self->viewer, &lat, &lon, &elev);
- gis_tile_update(self->tiles,
+ GisPluginSat *sat = _sat;
+ if (!g_mutex_trylock(sat->mutex))
+ return NULL;
+ GisPoint eye;
+ gis_viewer_get_location(sat->viewer, &eye.lat, &eye.lon, &eye.elev);
+ gis_tile_update(sat->tiles, &eye,
MAX_RESOLUTION, TILE_WIDTH, TILE_WIDTH,
- lat, lon, elev,
- _load_tile, self);
- gis_tile_gc(self->tiles, time(NULL)-10,
- _free_tile, self);
- g_mutex_unlock(self->mutex);
+ _load_tile, sat);
+ gis_tile_gc(sat->tiles, time(NULL)-10,
+ _free_tile, sat);
+ g_mutex_unlock(sat->mutex);
return NULL;
}
@@ -122,42 +142,46 @@ static gpointer _update_tiles(gpointer _self)
* Callbacks *
*************/
static void _on_location_changed(GisViewer *viewer,
- gdouble lat, gdouble lon, gdouble elev, GisPluginSat *self)
+ gdouble lat, gdouble lon, gdouble elev, GisPluginSat *sat)
{
- g_thread_create(_update_tiles, self, FALSE, NULL);
+ g_thread_create(_update_tiles, sat, FALSE, NULL);
}
-static gpointer _expose(GisCallback *callback, gpointer _self)
+static gpointer _threaded_init(GisPluginSat *sat)
{
- GisPluginSat *self = GIS_PLUGIN_SAT(_self);
- g_debug("GisPluginSat: expose viewer=%p tiles=%p,%p",
- self->viewer, self->tiles, self->tiles->data);
- gis_viewer_render_tiles(self->viewer, self->tiles);
+ _load_tile(sat->tiles, sat);
+ _update_tiles(sat);
return NULL;
}
/***********
* Methods *
***********/
+/**
+ * gis_plugin_sat_new:
+ * @viewer: the #GisViewer to use for drawing
+ *
+ * Create a new instance of the satellite plugin.
+ *
+ * Returns: the new #GisPluginSat
+ */
GisPluginSat *gis_plugin_sat_new(GisViewer *viewer)
{
g_debug("GisPluginSat: new");
- GisPluginSat *self = g_object_new(GIS_TYPE_PLUGIN_SAT, NULL);
- self->viewer = g_object_ref(viewer);
+ GisPluginSat *sat = g_object_new(GIS_TYPE_PLUGIN_SAT, NULL);
+ sat->viewer = g_object_ref(viewer);
/* Load initial tiles */
- _load_tile(self->tiles, self);
- g_thread_create(_update_tiles, self, FALSE, NULL);
+ g_thread_create((GThreadFunc)_threaded_init, sat, FALSE, NULL);
/* Connect signals */
- self->sigid = g_signal_connect(self->viewer, "location-changed",
- G_CALLBACK(_on_location_changed), self);
+ sat->sigid = g_signal_connect(sat->viewer, "location-changed",
+ G_CALLBACK(_on_location_changed), sat);
/* Add renderers */
- GisCallback *callback = gis_callback_new(_expose, self);
- gis_viewer_add(viewer, GIS_OBJECT(callback), GIS_LEVEL_WORLD, 0);
+ gis_viewer_add(viewer, GIS_OBJECT(sat->tiles), GIS_LEVEL_WORLD, FALSE);
- return self;
+ return sat;
}
@@ -175,36 +199,36 @@ static void gis_plugin_sat_plugin_init(GisPluginInterface *iface)
/* Add methods to the interface */
}
/* Class/Object init */
-static void gis_plugin_sat_init(GisPluginSat *self)
+static void gis_plugin_sat_init(GisPluginSat *sat)
{
g_debug("GisPluginSat: init");
/* Set defaults */
- self->mutex = g_mutex_new();
- self->tiles = gis_tile_new(NULL, NORTH, SOUTH, EAST, WEST);
- self->wms = gis_wms_new(
+ sat->mutex = g_mutex_new();
+ sat->tiles = gis_tile_new(NULL, NORTH, SOUTH, EAST, WEST);
+ sat->wms = gis_wms_new(
"http://www.nasa.network.com/wms", "bmng200406", "image/jpeg",
"bmng/", "jpg", TILE_WIDTH, TILE_HEIGHT);
}
static void gis_plugin_sat_dispose(GObject *gobject)
{
g_debug("GisPluginSat: dispose");
- GisPluginSat *self = GIS_PLUGIN_SAT(gobject);
+ GisPluginSat *sat = GIS_PLUGIN_SAT(gobject);
/* Drop references */
- if (self->viewer) {
- g_signal_handler_disconnect(self->viewer, self->sigid);
- g_object_unref(self->viewer);
- self->viewer = NULL;
+ if (sat->viewer) {
+ g_signal_handler_disconnect(sat->viewer, sat->sigid);
+ g_object_unref(sat->viewer);
+ sat->viewer = NULL;
}
G_OBJECT_CLASS(gis_plugin_sat_parent_class)->dispose(gobject);
}
static void gis_plugin_sat_finalize(GObject *gobject)
{
g_debug("GisPluginSat: finalize");
- GisPluginSat *self = GIS_PLUGIN_SAT(gobject);
+ GisPluginSat *sat = GIS_PLUGIN_SAT(gobject);
/* Free data */
- gis_tile_free(self->tiles, _free_tile, self);
- gis_wms_free(self->wms);
- g_mutex_free(self->mutex);
+ 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);
}