* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+/**
+ * SECTION:map
+ * @short_description: Map plugin
+ *
+ * #GisPluginMap provides map overlays. Much of this data is obtained from the
+ * OpenStreetMap project.
+ */
+
#include <time.h>
+#include <stdlib.h>
#include <glib/gstdio.h>
#include <GL/gl.h>
#define TILE_WIDTH 1024
#define TILE_HEIGHT 512
-const guchar colormap[][2][4] = {
+static const guchar colormap[][2][4] = {
{{0x73, 0x91, 0xad}, {0x73, 0x91, 0xad, 0x20}}, // Oceans
{{0xf6, 0xee, 0xee}, {0xf6, 0xee, 0xee, 0x00}}, // Ground
{{0xff, 0xff, 0xff}, {0xff, 0xff, 0xff, 0xff}}, // Borders
GisTile *tile;
GdkPixbuf *pixbuf;
};
-#include <stdlib.h>
static gboolean _load_tile_cb(gpointer _data)
{
struct _LoadTileData *data = _data;
(alpha ? GL_RGBA : GL_RGB), GL_UNSIGNED_BYTE, pixels);
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_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);
glFlush();
tile->data = tex;
g_thread_create(_update_tiles, map, FALSE, NULL);
}
+static gpointer _threaded_init(GisPluginMap *map)
+{
+ _load_tile(map->tiles, map);
+ _update_tiles(map);
+ return NULL;
+}
+
/***********
* Methods *
***********/
+/**
+ * gis_plugin_map_new:
+ * @viewer: the #GisViewer to use for drawing
+ *
+ * Create a new instance of the map plugin.
+ *
+ * Returns: the new #GisPluginMap
+ */
GisPluginMap *gis_plugin_map_new(GisViewer *viewer)
{
g_debug("GisPluginMap: new");
map->viewer = g_object_ref(viewer);
/* Load initial tiles */
- _load_tile(map->tiles, map);
- g_thread_create(_update_tiles, map, FALSE, NULL);
+ g_thread_create((GThreadFunc)_threaded_init, map, FALSE, NULL);
/* Connect signals */
map->sigid = g_signal_connect(map->viewer, "location-changed",