Markers as individual textures

[grits] / src / gis_test.c

diff --git a/src/gis_test.c b/src/gis_test.c
index 32bed7b3990639e804c5bfa9d19a0c19e22fa770..746c058a197cd7b39ba6036633dafcf68557e6d2 100644 (file)
--- a/src/gis_test.c
+++ b/src/gis_test.c
@@ -47,30 +47,27 @@ int main(int argc, char **argv)
 
        GisPrefs   *prefs   = gis_prefs_new(NULL, NULL);
        GisPlugins *plugins = gis_plugins_new(NULL);
-       GisWorld   *world   = gis_world_new();
-       GisView    *view    = gis_view_new();
-       GisOpenGL  *opengl  = gis_opengl_new(world, view, plugins);
+       GisViewer  *viewer  = gis_opengl_new(plugins);
 
        gdk_threads_enter();
        GtkWidget  *window  = gtk_window_new(GTK_WINDOW_TOPLEVEL);
        g_signal_connect(window,  "destroy",         G_CALLBACK(gtk_main_quit), NULL);
        g_signal_connect(window,  "key-press-event", G_CALLBACK(on_key_press),  NULL);
-       gtk_container_add(GTK_CONTAINER(window), GTK_WIDGET(opengl));
+       gtk_container_add(GTK_CONTAINER(window), GTK_WIDGET(viewer));
        gtk_widget_show_all(window);
        gdk_threads_leave();
 
-       gis_plugins_load(plugins, "bmng", world, view, opengl, prefs);
-       //gis_plugins_load(plugins, "srtm", world, view, opengl, prefs);
+       gis_plugins_load(plugins, "bmng", viewer, prefs);
+       //gis_plugins_load(plugins, "srtm", viewer, prefs);
+       gis_plugins_load(plugins, "test", viewer, prefs);
 
-       gis_view_set_site(view, "KLSX");
+       gis_viewer_set_site(viewer, "KLSX");
 
        gdk_threads_enter();
        gtk_main();
 
        g_object_unref(prefs);
-       g_object_unref(world);
-       g_object_unref(view);
-       g_object_unref(opengl);
+       g_object_unref(viewer);
        gis_plugins_free(plugins);
        gdk_threads_leave();
        return 0;