X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Fplugins%2Felev.c;h=57813abdb63980cd8a253279d4cdbdc70bd39c25;hb=07448c519e963bae1cfde4f1ff353478dd28136c;hp=0783811a98216743b00c20e4187e3bc70bd98128;hpb=fc67f407d6493f57b5ab0ed32c4902cbf304e96b;p=grits

diff --git a/src/plugins/elev.c b/src/plugins/elev.c
index 0783811..57813ab 100644
--- a/src/plugins/elev.c
+++ b/src/plugins/elev.c
@@ -15,11 +15,20 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <gtk/gtkgl.h>
+/**
+ * SECTION:elev
+ * @short_description: Elevation plugin
+ *
+ * #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 <glib/gstdio.h>
 #include <GL/gl.h>
 
-#include <gis.h>
+#include <grits.h>
 
 #include "elev.h"
 
@@ -29,17 +38,17 @@
 #define TILE_SIZE      (TILE_WIDTH*TILE_HEIGHT*sizeof(guint16))
 
 struct _TileData {
-	/* OpenGL has to be first to make gis_opengl_render_tiles happy */
+	/* OpenGL has to be first to make grits_opengl_render_tiles happy */
 	guint      opengl;
 	guint16   *bil;
 };
 
-static gdouble _height_func(gdouble lat, gdouble lon, gpointer _self)
+static gdouble _height_func(gdouble lat, gdouble lon, gpointer _elev)
 {
-	GisPluginElev *self = _self;
-	if (!self) return 0;
+	GritsPluginElev *elev = _elev;
+	if (!elev) return 0;
 
-	GisTile *tile = gis_tile_find(self->tiles, lat, lon);
+	GritsTile *tile = grits_tile_find(elev->tiles, lat, lon);
 	if (!tile) return 0;
 
 	struct _TileData *data = tile->data;
@@ -79,12 +88,10 @@ static gdouble _height_func(gdouble lat, gdouble lon, gpointer _self)
 	gint16 px01 = bil[MIN((y_flr+1),h-1)*w + MIN((x_flr  ),w-1)];
 	gint16 px11 = bil[MIN((y_flr+1),h-1)*w + MIN((x_flr+1),w-1)];
 
-	gdouble elev =
-		px00 * (1-x_rem) * (1-y_rem) +
-		px10 * (  x_rem) * (1-y_rem) +
-		px01 * (1-x_rem) * (  y_rem) +
-		px11 * (  x_rem) * (  y_rem);
-	return elev;
+	return px00 * (1-x_rem) * (1-y_rem) +
+	       px10 * (  x_rem) * (1-y_rem) +
+	       px01 * (1-x_rem) * (  y_rem) +
+	       px11 * (  x_rem) * (  y_rem);
 }
 
 /**********************
@@ -93,9 +100,9 @@ static gdouble _height_func(gdouble lat, gdouble lon, gpointer _self)
 #define LOAD_BIL    TRUE
 #define LOAD_OPENGL FALSE
 struct _LoadTileData {
-	GisPluginElev    *self;
+	GritsPluginElev    *elev;
 	gchar            *path;
-	GisTile          *tile;
+	GritsTile          *tile;
 	GdkPixbuf        *pixbuf;
 	struct _TileData *data;
 };
@@ -104,9 +111,9 @@ 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",
+		g_warning("GritsPluginElev: _load_bil - unexpected tile size %d, != %d",
 				len, TILE_SIZE);
 		g_free(data);
 		return NULL;
@@ -132,7 +139,7 @@ static GdkPixbuf *_load_pixbuf(guint16 *bil)
 				pixels[r*stride + c*nchan + 3] = 128;
 		}
 	}
-	g_debug("GisPluginElev: load_pixbuf %p", pixbuf);
+	g_debug("GritsPluginElev: load_pixbuf %p", pixbuf);
 	return pixbuf;
 }
 static guint _load_opengl(GdkPixbuf *pixbuf)
@@ -155,18 +162,18 @@ static guint _load_opengl(GdkPixbuf *pixbuf)
 			(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);
+	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);
+	g_debug("GritsPluginElev: 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    *self   = load->self;
-	GisTile          *tile   = load->tile;
+	g_debug("GritsPluginElev: _load_tile_cb: %s", load->path);
+	GritsPluginElev    *elev   = load->elev;
+	GritsTile          *tile   = load->tile;
 	GdkPixbuf        *pixbuf = load->pixbuf;
 	struct _TileData *data   = load->data;
 	g_free(load->path);
@@ -178,9 +185,10 @@ static gboolean _load_tile_cb(gpointer _load)
 	tile->data = data;
 
 	/* Do necessasairy processing */
-	/* TODO: Lock this and move to thread, can remove self from _load then */
+	/* TODO: Lock this and move to thread, can remove elev from _load then */
 	if (LOAD_BIL)
-		gis_viewer_set_height_func(self->viewer, tile, _height_func, self, TRUE);
+		grits_viewer_set_height_func(elev->viewer, &tile->edge,
+				_height_func, elev, TRUE);
 
 	/* Cleanup unneeded things */
 	if (!LOAD_BIL)
@@ -190,14 +198,14 @@ static gboolean _load_tile_cb(gpointer _load)
 
 	return FALSE;
 }
-static void _load_tile(GisTile *tile, gpointer _self)
+static void _load_tile(GritsTile *tile, gpointer _elev)
 {
-	GisPluginElev *self = _self;
+	GritsPluginElev *elev = _elev;
 
 	struct _LoadTileData *load = g_new0(struct _LoadTileData, 1);
-	load->path = gis_wms_fetch(self->wms, tile, GIS_ONCE, NULL, NULL);
-	g_debug("GisPluginElev: _load_tile: %s", load->path);
-	load->self = self;
+	load->path = grits_wms_fetch(elev->wms, tile, GRITS_ONCE, NULL, NULL);
+	g_debug("GritsPluginElev: _load_tile: %s", load->path);
+	load->elev = elev;
 	load->tile = tile;
 	load->data = g_new0(struct _TileData, 1);
 	if (LOAD_BIL || LOAD_OPENGL) {
@@ -227,60 +235,74 @@ static gboolean _free_tile_cb(gpointer _data)
 	g_free(data);
 	return FALSE;
 }
-static void _free_tile(GisTile *tile, gpointer _self)
+static void _free_tile(GritsTile *tile, gpointer _elev)
 {
-	GisPluginElev *self = _self;
-	g_debug("GisPluginElev: _free_tile: %p", tile->data);
-	g_idle_add_full(G_PRIORITY_LOW, _free_tile_cb, tile->data, NULL);
+	g_debug("GritsPluginElev: _free_tile: %p", tile->data);
+	if (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 _elev)
 {
-	GisPluginElev *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,
+	GritsPluginElev *elev = _elev;
+	if (!g_mutex_trylock(elev->mutex))
+		return NULL;
+	GritsPoint eye;
+	grits_viewer_get_location(elev->viewer, &eye.lat, &eye.lon, &eye.elev);
+	grits_tile_update(elev->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, elev);
+	grits_tile_gc(elev->tiles, time(NULL)-10,
+			_free_tile, elev);
+	g_mutex_unlock(elev->mutex);
 	return NULL;
 }
 
 /*************
  * Callbacks *
  *************/
-static void _on_location_changed(GisViewer *viewer,
-		gdouble lat, gdouble lon, gdouble elev, GisPluginElev *self)
+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(GritsPluginElev *elev)
 {
-	g_thread_create(_update_tiles, self, FALSE, NULL);
+	_load_tile(elev->tiles, elev);
+	_update_tiles(elev);
+	return NULL;
 }
 
 /***********
  * Methods *
  ***********/
-GisPluginElev *gis_plugin_elev_new(GisViewer *viewer)
+/**
+ * grits_plugin_elev_new:
+ * @viewer: the #GritsViewer to use for drawing
+ *
+ * Create a new instance of the elevation plugin.
+ *
+ * Returns: the new #GritsPluginElev
+ */
+GritsPluginElev *grits_plugin_elev_new(GritsViewer *viewer)
 {
-	g_debug("GisPluginElev: new");
-	GisPluginElev *self = g_object_new(GIS_TYPE_PLUGIN_ELEV, NULL);
-	self->viewer = g_object_ref(viewer);
+	g_debug("GritsPluginElev: new");
+	GritsPluginElev *elev = g_object_new(GRITS_TYPE_PLUGIN_ELEV, NULL);
+	elev->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, elev, FALSE, NULL);
 
 	/* Connect signals */
-	self->sigid = g_signal_connect(self->viewer, "location-changed",
-			G_CALLBACK(_on_location_changed), self);
+	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(self->tiles), GIS_LEVEL_WORLD, 0);
+		grits_viewer_add(viewer, GRITS_OBJECT(elev->tiles), GRITS_LEVEL_WORLD, 0);
 
-	return self;
+	return elev;
 }
 
 
@@ -288,55 +310,59 @@ 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 *self)
+static void grits_plugin_elev_init(GritsPluginElev *elev)
 {
-	g_debug("GisPluginElev: init");
+	g_debug("GritsPluginElev: 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/srtm", "srtm30", "application/bil",
+	elev->mutex = g_mutex_new();
+	elev->tiles = grits_tile_new(NULL, NORTH, SOUTH, EAST, WEST);
+	elev->wms   = grits_wms_new(
+		"http://www.nasa.network.com/elev", "srtm30", "application/bil",
 		"srtm/", "bil", TILE_WIDTH, TILE_HEIGHT);
 }
-static void gis_plugin_elev_dispose(GObject *gobject)
+static void grits_plugin_elev_dispose(GObject *gobject)
 {
-	g_debug("GisPluginElev: dispose");
-	GisPluginElev *self = GIS_PLUGIN_ELEV(gobject);
+	g_debug("GritsPluginElev: dispose");
+	GritsPluginElev *elev = GRITS_PLUGIN_ELEV(gobject);
 	/* Drop references */
-	if (LOAD_BIL)
-		gis_viewer_clear_height_func(self->viewer);
-	if (self->viewer) {
-		g_signal_handler_disconnect(self->viewer, self->sigid);
-		g_object_unref(self->viewer);
-		self->viewer = NULL;
+	if (elev->viewer) {
+		if (LOAD_BIL)
+			grits_viewer_clear_height_func(elev->viewer);
+		if (LOAD_OPENGL)
+			grits_viewer_remove(elev->viewer, elev->tiles);
+		g_signal_handler_disconnect(elev->viewer, elev->sigid);
+		g_object_unref(elev->viewer);
+		elev->viewer = NULL;
 	}
-	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 *self = GIS_PLUGIN_ELEV(gobject);
+	g_debug("GritsPluginElev: finalize");
+	GritsPluginElev *elev = GRITS_PLUGIN_ELEV(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_elev_parent_class)->finalize(gobject);
+	grits_tile_free(elev->tiles, _free_tile, elev);
+	grits_wms_free(elev->wms);
+	g_mutex_lock(elev->mutex);
+	g_mutex_unlock(elev->mutex);
+	g_mutex_free(elev->mutex);
+	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;
 }