#define TILE_WIDTH 1024
#define TILE_HEIGHT 512
-static void _load_tile(GisTile *tile, gpointer _self)
+struct _LoadTileData {
+ GisPluginBmng *self;
+ GisTile *tile;
+ GdkPixbuf *pixbuf;
+};
+static gboolean _load_tile_cb(gpointer _data)
{
- GisPluginBmng *self = _self;
- g_debug("GisPluginBmng: _load_tile start");
-
- char *path = gis_wms_make_local(self->wms, tile);
- GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file(path, NULL);
- g_free(path);
+ struct _LoadTileData *data = _data;
+ GisPluginBmng *self = data->self;
+ GisTile *tile = data->tile;
+ GdkPixbuf *pixbuf = data->pixbuf;
+ g_free(data);
+ /* Create Texture */
+ g_debug("GisPluginBmng: _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);
guint *tex = g_new0(guint, 1);
- gis_opengl_begin(self->opengl);
+ gis_viewer_begin(self->viewer);
glGenTextures(1, tex);
glBindTexture(GL_TEXTURE_2D, *tex);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_BORDER);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_BORDER);
glFlush();
- gis_opengl_end(self->opengl);
+ gis_viewer_end(self->viewer);
tile->data = tex;
- gis_opengl_redraw(self->opengl);
+ gtk_widget_queue_draw(GTK_WIDGET(self->viewer));
g_object_unref(pixbuf);
+ return FALSE;
}
-static void _free_tile(GisTile *tile, gpointer _self)
+static void _load_tile(GisTile *tile, gpointer _self)
{
GisPluginBmng *self = _self;
- g_debug("GisPluginBmng: _free_tile: %p=%d", tile->data, *(guint*)tile->data);
- guint *data = tile->data;
+ g_debug("GisPluginBmng: _load_tile start %p", g_thread_self());
+ char *path = gis_wms_make_local(self->wms, tile);
+ struct _LoadTileData *data = g_new0(struct _LoadTileData, 1);
+ data->self = self;
+ data->tile = tile;
+ data->pixbuf = gdk_pixbuf_new_from_file(path, NULL);
+ if (!data->pixbuf)
+ g_warning("GisPluginBmng: _load_tile - Error loading pixbuf %s", path);
+ g_free(path);
+ g_idle_add_full(G_PRIORITY_LOW, _load_tile_cb, data, NULL);
+ g_debug("GisPluginBmng: _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 _self)
+{
+ GisPluginBmng *self = _self;
+ g_debug("GisPluginBmng: _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)
{
g_debug("GisPluginBmng: _update_tiles");
GisPluginBmng *self = _self;
+ g_mutex_lock(self->mutex);
gdouble lat, lon, elev;
- gis_view_get_location(self->view, &lat, &lon, &elev);
+ gis_viewer_get_location(self->viewer, &lat, &lon, &elev);
gis_tile_update(self->tiles,
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);
return NULL;
}
/*************
* Callbacks *
*************/
-static void _on_location_changed(GisView *view, gdouble lat, gdouble lon, gdouble elev,
- GisPluginBmng *self)
+static void _on_location_changed(GisViewer *viewer,
+ gdouble lat, gdouble lon, gdouble elev, GisPluginBmng *self)
{
- _update_tiles(self);
+ g_thread_create(_update_tiles, self, FALSE, NULL);
}
/***********
* Methods *
***********/
-GisPluginBmng *gis_plugin_bmng_new(GisWorld *world, GisView *view, GisOpenGL *opengl)
+GisPluginBmng *gis_plugin_bmng_new(GisViewer *viewer)
{
g_debug("GisPluginBmng: new");
GisPluginBmng *self = g_object_new(GIS_TYPE_PLUGIN_BMNG, NULL);
- self->view = view;
- self->opengl = opengl;
+ self->viewer = viewer;
/* Load initial tiles */
_load_tile(self->tiles, self);
- _update_tiles(self);
+ g_thread_create(_update_tiles, self, FALSE, NULL);
/* Connect signals */
- g_signal_connect(self->view, "location-changed", G_CALLBACK(_on_location_changed), self);
+ self->sigid = g_signal_connect(self->viewer, "location-changed",
+ G_CALLBACK(_on_location_changed), self);
return self;
}
static void gis_plugin_bmng_expose(GisPlugin *_self)
{
GisPluginBmng *self = GIS_PLUGIN_BMNG(_self);
- g_debug("GisPluginBmng: expose");
- gis_opengl_render_tiles(self->opengl, self->tiles);
+ g_debug("GisPluginBmng: expose viewer=%p tiles=%p,%p",
+ self->viewer, self->tiles, self->tiles->data);
+ gis_viewer_render_tiles(self->viewer, self->tiles);
}
{
g_debug("GisPluginBmng: init");
/* Set defaults */
+ self->mutex = g_mutex_new();
self->tiles = gis_tile_new(NULL, NORTH, SOUTH, EAST, WEST);
self->wms = gis_wms_new(
"http://www.nasa.network.com/wms", "bmng200406", "image/jpeg",
- "bmng", ".jpg", TILE_WIDTH, TILE_HEIGHT);
+ "bmng/", "jpg", TILE_WIDTH, TILE_HEIGHT);
}
static void gis_plugin_bmng_dispose(GObject *gobject)
{
g_debug("GisPluginBmng: dispose");
GisPluginBmng *self = GIS_PLUGIN_BMNG(gobject);
/* Drop references */
+ g_signal_handler_disconnect(self->viewer, self->sigid);
G_OBJECT_CLASS(gis_plugin_bmng_parent_class)->dispose(gobject);
}
static void gis_plugin_bmng_finalize(GObject *gobject)
/* Free data */
gis_tile_free(self->tiles, _free_tile, self);
gis_wms_free(self->wms);
+ g_mutex_free(self->mutex);
G_OBJECT_CLASS(gis_plugin_bmng_parent_class)->finalize(gobject);
}