X-Git-Url: http://pileus.org/git/?p=grits;a=blobdiff_plain;f=src%2Fplugins%2Fsat.c;h=9e1af30e6a5eca5a561c19aac13be5814b4426a9;hp=4856ae65b81acb07b420b55bbccf61f19d463082;hb=14c34a746fc94a9e5477d081275f04bd1c8b5d6d;hpb=bd716715f1d13a8df514fcfa53fd82aebdfda770

diff --git a/src/plugins/sat.c b/src/plugins/sat.c
index 4856ae6..9e1af30 100644
--- a/src/plugins/sat.c
+++ b/src/plugins/sat.c
@@ -15,7 +15,16 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+/**
+ * SECTION:sat
+ * @short_description: Satellite plugin
+ *
+ * #GisPluginSat provides overlays using satellite imagery. This is mostly
+ * provided by NASA's Blue Marble Next Generation.
+ */
+
 #include <time.h>
+#include <string.h>
 #include <glib/gstdio.h>
 #include <GL/gl.h>
 
@@ -47,6 +56,18 @@ 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);
 	glGenTextures(1, tex);
 	glBindTexture(GL_TEXTURE_2D, *tex);
@@ -55,10 +76,10 @@ 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();
 
 	tile->data = tex;
@@ -104,12 +125,12 @@ static gpointer _update_tiles(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,
+	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, sat);
 	gis_tile_gc(sat->tiles, time(NULL)-10,
 			_free_tile, sat);
@@ -126,9 +147,24 @@ static void _on_location_changed(GisViewer *viewer,
 	g_thread_create(_update_tiles, sat, FALSE, NULL);
 }
 
+static gpointer _threaded_init(GisPluginSat *sat)
+{
+	_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");
@@ -136,15 +172,14 @@ GisPluginSat *gis_plugin_sat_new(GisViewer *viewer)
 	sat->viewer = g_object_ref(viewer);
 
 	/* Load initial tiles */
-	_load_tile(sat->tiles, sat);
-	g_thread_create(_update_tiles, sat, FALSE, NULL);
+	g_thread_create((GThreadFunc)_threaded_init, sat, FALSE, NULL);
 
 	/* 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);
+	gis_viewer_add(viewer, GIS_OBJECT(sat->tiles), GIS_LEVEL_WORLD, FALSE);
 
 	return sat;
 }