#include <glib/gstdio.h>
#include <GL/gl.h>
-#include <gis.h>
+#include <grits.h>
#include "elev.h"
(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);
return opengl;
/* Do necessasairy processing */
/* TODO: Lock this and move to thread, can remove elev from _load then */
if (LOAD_BIL)
- gis_viewer_set_height_func(elev->viewer, tile, _height_func, elev, TRUE);
+ gis_viewer_set_height_func(elev->viewer, &tile->edge, _height_func, elev, TRUE);
/* Cleanup unneeded things */
if (!LOAD_BIL)
}
static void _free_tile(GisTile *tile, gpointer _elev)
{
- GisPluginElev *elev = _elev;
g_debug("GisPluginElev: _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 _elev)
{
GisPluginElev *elev = _elev;
- g_mutex_lock(elev->mutex);
- gdouble lat, lon, elevation;
- gis_viewer_get_location(elev->viewer, &lat, &lon, &elevation);
- gis_tile_update(elev->tiles,
+ if (!g_mutex_trylock(elev->mutex))
+ return NULL;
+ GisPoint eye;
+ gis_viewer_get_location(elev->viewer, &eye.lat, &eye.lon, &eye.elev);
+ gis_tile_update(elev->tiles, &eye,
MAX_RESOLUTION, TILE_WIDTH, TILE_WIDTH,
- lat, lon, elevation,
_load_tile, elev);
gis_tile_gc(elev->tiles, time(NULL)-10,
_free_tile, elev);
g_thread_create(_update_tiles, elev, FALSE, NULL);
}
+static gpointer _threaded_init(GisPluginElev *elev)
+{
+ _load_tile(elev->tiles, elev);
+ _update_tiles(elev);
+ return NULL;
+}
+
/***********
* Methods *
***********/
elev->viewer = g_object_ref(viewer);
/* Load initial tiles */
- _load_tile(elev->tiles, elev);
- g_thread_create(_update_tiles, elev, FALSE, NULL);
+ g_thread_create((GThreadFunc)_threaded_init, elev, FALSE, NULL);
/* Connect signals */
elev->sigid = g_signal_connect(elev->viewer, "location-changed",