/*
- * Copyright (C) 2009-2010 Andy Spencer <andy753421@gmail.com>
+ * Copyright (C) 2009-2011 Andy Spencer <andy753421@gmail.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* greyscale elevation overlay on the planets surface.
*/
-#include <gtk/gtkgl.h>
#include <glib/gstdio.h>
-#include <GL/gl.h>
#include <grits.h>
#include "elev.h"
-#define MAX_RESOLUTION 500
+#define MAX_RESOLUTION 50
#define TILE_WIDTH 1024
#define TILE_HEIGHT 512
#define TILE_SIZE (TILE_WIDTH*TILE_HEIGHT*sizeof(guint16))
g_file_get_contents(path, &data, &len, NULL);
g_debug("GritsPluginElev: load_bil %p", data);
if (len != TILE_SIZE) {
- g_warning("GritsPluginElev: _load_bil - unexpected tile size %d, != %d",
- len, TILE_SIZE);
+ g_warning("GritsPluginElev: _load_bil - unexpected tile size %ld, != %ld",
+ (glong)len, (glong)TILE_SIZE);
g_free(data);
return NULL;
}
(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);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
g_debug("GritsPluginElev: load_opengl %d", opengl);
return opengl;
struct _LoadTileData *load = g_new0(struct _LoadTileData, 1);
load->path = grits_wms_fetch(elev->wms, tile, GRITS_ONCE, NULL, NULL);
+ if (!load->path) return; // Canceled/error
g_debug("GritsPluginElev: _load_tile: %s", load->path);
load->elev = elev;
load->tile = tile;
static gpointer _update_tiles(gpointer _elev)
{
GritsPluginElev *elev = _elev;
- if (!g_mutex_trylock(elev->mutex))
+ if (!g_mutex_trylock(&elev->mutex))
return NULL;
GritsPoint eye;
grits_viewer_get_location(elev->viewer, &eye.lat, &eye.lon, &eye.elev);
_load_tile, elev);
grits_tile_gc(elev->tiles, time(NULL)-10,
_free_tile, elev);
- g_mutex_unlock(elev->mutex);
+ g_mutex_unlock(&elev->mutex);
return NULL;
}
static void _on_location_changed(GritsViewer *viewer,
gdouble lat, gdouble lon, gdouble elevation, GritsPluginElev *elev)
{
- g_thread_create(_update_tiles, elev, FALSE, NULL);
+ g_thread_new("update-tiles-thread", _update_tiles, elev);
}
static gpointer _threaded_init(GritsPluginElev *elev)
elev->viewer = g_object_ref(viewer);
/* Load initial tiles */
- g_thread_create((GThreadFunc)_threaded_init, elev, FALSE, NULL);
+ g_thread_new("init-thread", (GThreadFunc)_threaded_init, elev);
/* Connect signals */
elev->sigid = g_signal_connect(elev->viewer, "location-changed",
/* Add renderers */
if (LOAD_OPENGL)
- grits_viewer_add(viewer, GRITS_OBJECT(elev->tiles), GRITS_LEVEL_WORLD, 0);
+ grits_viewer_add(viewer, GRITS_OBJECT(elev->tiles), GRITS_LEVEL_WORLD, FALSE);
return elev;
}
{
g_debug("GritsPluginElev: init");
/* Set defaults */
- elev->mutex = g_mutex_new();
+ g_mutex_init(&elev->mutex);
elev->tiles = grits_tile_new(NULL, NORTH, SOUTH, EAST, WEST);
elev->wms = grits_wms_new(
- "http://www.nasa.network.com/elev", "srtm30", "application/bil",
+ "http://www.nasa.network.com/elev", "mergedSrtm", "application/bil",
"srtm/", "bil", TILE_WIDTH, TILE_HEIGHT);
}
static void grits_plugin_elev_dispose(GObject *gobject)
if (LOAD_BIL)
grits_viewer_clear_height_func(elev->viewer);
if (LOAD_OPENGL)
- grits_viewer_remove(elev->viewer, elev->tiles);
+ grits_viewer_remove(elev->viewer, GRITS_OBJECT(elev->tiles));
g_signal_handler_disconnect(elev->viewer, elev->sigid);
g_object_unref(elev->viewer);
elev->viewer = NULL;
/* Free data */
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_mutex_lock(&elev->mutex);
+ g_mutex_unlock(&elev->mutex);
+ g_mutex_clear(&elev->mutex);
G_OBJECT_CLASS(grits_plugin_elev_parent_class)->finalize(gobject);
}