(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_TO_BORDER);
+ //glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_BORDER);
g_debug("GisPluginSrtm: load_opengl %d", opengl);
return opengl;
/* Do necessasairy processing */
/* TODO: Lock this and move to thread, can remove self from _load then */
if (LOAD_BIL)
- gis_opengl_set_height_func(self->opengl, tile,
- _height_func, self, TRUE);
+ gis_opengl_set_height_func(self->opengl, tile, _height_func, self, TRUE);
/* Cleanup unneeded things */
if (!LOAD_BIL)
g_thread_create(_update_tiles, self, FALSE, NULL);
/* Connect signals */
- g_signal_connect(view, "location-changed", G_CALLBACK(_on_location_changed), self);
+ self->sigid = g_signal_connect(self->view, "location-changed",
+ G_CALLBACK(_on_location_changed), self);
return self;
}
self->tiles = gis_tile_new(NULL, NORTH, SOUTH, EAST, WEST);
self->wms = gis_wms_new(
"http://www.nasa.network.com/elev", "srtm30", "application/bil",
- "srtm", ".bil", TILE_WIDTH, TILE_HEIGHT);
+ "srtm/", "bil", TILE_WIDTH, TILE_HEIGHT);
}
static void gis_plugin_srtm_dispose(GObject *gobject)
{
g_debug("GisPluginSrtm: dispose");
GisPluginSrtm *self = GIS_PLUGIN_SRTM(gobject);
/* Drop references */
+ g_signal_handler_disconnect(self->view, self->sigid);
+ if (LOAD_BIL)
+ gis_opengl_clear_height_func(self->opengl);
G_OBJECT_CLASS(gis_plugin_srtm_parent_class)->dispose(gobject);
}
static void gis_plugin_srtm_finalize(GObject *gobject)