Move low level tile loading to GritsTile

[grits] / src / plugins / sat.c

diff --git a/src/plugins/sat.c b/src/plugins/sat.c
index 8fe6e091ab27a3de2bd2807b8ceeab12cf6e9c81..b43e4faf1ccbfd13c7d99615478206b79de223d1 100644 (file)
--- a/src/plugins/sat.c
+++ b/src/plugins/sat.c
@@ -24,6 +24,7 @@
  */
 
 #include <time.h>
+#include <string.h>
 #include <glib/gstdio.h>
 
 #include <grits.h>
@@ -34,44 +35,6 @@
 #define TILE_WIDTH     1024
 #define TILE_HEIGHT    512
 
-struct _LoadTileData {
-       GritsPluginSat *sat;
-       GritsTile      *tile;
-       guint8         *pixels;
-       gboolean        alpha;
-       gint            width;
-       gint            height;
-};
-static gboolean _load_tile_cb(gpointer _data)
-{
-       struct _LoadTileData *data = _data;
-       g_debug("GritsPluginSat: _load_tile_cb start");
-       if (data->sat->aborted) {
-               g_debug("GritsPluginSat: _load_tile - aborted");
-               return FALSE;
-       }
-
-       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, data->width, data->height, 0,
-                       (data->alpha ? GL_RGBA : GL_RGB), GL_UNSIGNED_BYTE, data->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_TO_EDGE);
-       glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-       glFlush();
-
-       data->tile->data = tex;
-       gtk_widget_queue_draw(GTK_WIDGET(data->sat->viewer));
-       g_free(data->pixels);
-       g_free(data);
-       return FALSE;
-}
-
 static void _load_tile(GritsTile *tile, gpointer _sat)
 {
        GritsPluginSat *sat = _sat;
@@ -95,48 +58,28 @@ static void _load_tile(GritsTile *tile, gpointer _sat)
        }
        g_free(path);
 
-       /* Copy pixbuf data for callback */
-       struct _LoadTileData *data = g_new0(struct _LoadTileData, 1);
-       data->sat    = sat;
-       data->tile   = tile;
-       data->pixels = gdk_pixbuf_get_pixels(pixbuf);
-       data->alpha  = gdk_pixbuf_get_has_alpha(pixbuf);
-       data->width  = gdk_pixbuf_get_width(pixbuf);
-       data->height = gdk_pixbuf_get_height(pixbuf);
-       data->pixels = g_memdup(data->pixels,
-                       data->width * data->height * (data->alpha ? 4 : 3));
-       g_object_unref(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);
-       //}
+#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 */
-       g_idle_add_full(G_PRIORITY_LOW, _load_tile_cb, data, NULL);
+       grits_tile_load_pixbuf(tile, pixbuf);
        g_debug("GritsPluginSat: _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(GritsTile *tile, gpointer _sat)
-{
-       g_debug("GritsPluginSat: _free_tile: %p", tile->data);
-       if (tile->data)
-               g_idle_add_full(G_PRIORITY_LOW, _free_tile_cb, tile->data, NULL);
-}
-
 static void _update_tiles(gpointer _, gpointer _sat)
 {
        g_debug("GritsPluginSat: _update_tiles");
@@ -146,8 +89,7 @@ static void _update_tiles(gpointer _, gpointer _sat)
        grits_tile_update(sat->tiles, &eye,
                        MAX_RESOLUTION, TILE_WIDTH, TILE_WIDTH,
                        _load_tile, sat);
-       grits_tile_gc(sat->tiles, time(NULL)-10,
-                       _free_tile, sat);
+       grits_tile_gc(sat->tiles, time(NULL)-10, NULL, sat);
 }
 
 /*************
@@ -229,8 +171,6 @@ static void grits_plugin_sat_dispose(GObject *gobject)
                g_object_unref(sat->tiles);
                soup_session_abort(sat->wms->http->soup);
                g_thread_pool_free(sat->threads, TRUE, TRUE);
-               while (gtk_events_pending())
-                       gtk_main_iteration();
                g_object_unref(viewer);
        }
        G_OBJECT_CLASS(grits_plugin_sat_parent_class)->dispose(gobject);
@@ -241,7 +181,7 @@ static void grits_plugin_sat_finalize(GObject *gobject)
        GritsPluginSat *sat = GRITS_PLUGIN_SAT(gobject);
        /* Free data */
        grits_wms_free(sat->wms);
-       grits_tile_free(sat->tiles, _free_tile, sat);
+       grits_tile_free(sat->tiles, NULL, sat);
        G_OBJECT_CLASS(grits_plugin_sat_parent_class)->finalize(gobject);
 
 }