X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=src%2Fplugins%2Ftest.c;h=ae62a7d4b42ba9be98d5b690b70b20ad76e2f557;hb=ddec1ba9b0fe842aef5fd0039fd0f79f275c87f1;hp=b7435ab3f8b521bd6bc91594d914bb270287cdae;hpb=f54436e90fe38ef17e85dbdfea64a8916ceae872;p=grits

diff --git a/src/plugins/test.c b/src/plugins/test.c
index b7435ab..ae62a7d 100644
--- a/src/plugins/test.c
+++ b/src/plugins/test.c
@@ -1,5 +1,5 @@
 /*
- * 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
@@ -25,9 +25,6 @@
 
 #include <string.h>
 
-#include <GL/gl.h>
-#include <GL/glu.h>
-
 #include <gdk/gdkkeysyms.h>
 #include <grits.h>
 
@@ -106,7 +103,7 @@ void _load_marker(GritsPluginTest *test)
 	GRITS_OBJECT(test->marker)->center.lat  =  38.841847;
 	GRITS_OBJECT(test->marker)->center.lon  = -90.491982;
 	GRITS_OBJECT(test->marker)->center.elev =   0.0;
-	GRITS_OBJECT(test->marker)->lod         = EARTH_R;
+	GRITS_OBJECT(test->marker)->lod         = EARTH_R*3;
 	grits_viewer_add(test->viewer, GRITS_OBJECT(test->marker), GRITS_LEVEL_OVERLAY, FALSE);
 	/* These do not work on marker yet */
 	//g_signal_connect(test->marker, "enter",        G_CALLBACK(on_marker_enter),  NULL);
@@ -126,13 +123,28 @@ void _load_poly(GritsPluginTest *test)
 	test->poly->color[3]  = 0.2;
 	test->poly->border[3] = 1;
 	test->poly->width     = 6;
-	grits_viewer_add(test->viewer, GRITS_OBJECT(test->poly),  GRITS_LEVEL_OVERLAY, TRUE);
+	grits_viewer_add(test->viewer, GRITS_OBJECT(test->poly),  GRITS_LEVEL_OVERLAY, FALSE);
 	g_signal_connect(test->poly, "enter",        G_CALLBACK(on_poly_enter),  NULL);
 	g_signal_connect(test->poly, "leave",        G_CALLBACK(on_poly_leave),  NULL);
 	g_signal_connect(test->poly, "button-press", G_CALLBACK(on_poly_button), NULL);
 	g_signal_connect(test->poly, "key-press",    G_CALLBACK(on_poly_key),    NULL);
 }
 
+void _load_line(GritsPluginTest *test)
+{
+	test->line = grits_line_parse("30,-80 30,-120 50,-120 50,-80", "\t", " ", ",");
+	test->line->color[0]  = 1;
+	test->line->color[1]  = 0;
+	test->line->color[2]  = 0;
+	test->line->color[3]  = 1;
+	test->line->width     = 8;
+	grits_viewer_add(test->viewer, GRITS_OBJECT(test->line),  GRITS_LEVEL_OVERLAY, FALSE);
+	g_signal_connect(test->line, "enter",        G_CALLBACK(on_poly_enter),  NULL);
+	g_signal_connect(test->line, "leave",        G_CALLBACK(on_poly_leave),  NULL);
+	g_signal_connect(test->line, "button-press", G_CALLBACK(on_poly_button), NULL);
+	g_signal_connect(test->line, "key-press",    G_CALLBACK(on_poly_key),    NULL);
+}
+
 /**
  * grits_plugin_test_new:
  * @viewer: the #GritsViewer to use for drawing
@@ -148,6 +160,7 @@ GritsPluginTest *grits_plugin_test_new(GritsViewer *viewer)
 	test->viewer = g_object_ref(viewer);
 	_load_marker(test);
 	_load_poly(test);
+	_load_line(test);
 	return test;
 }
 
@@ -176,6 +189,8 @@ static void grits_plugin_test_dispose(GObject *_test)
 	GritsPluginTest *test = GRITS_PLUGIN_TEST(_test);
 	if (test->viewer) {
 		grits_viewer_remove(test->viewer, GRITS_OBJECT(test->marker));
+		grits_viewer_remove(test->viewer, GRITS_OBJECT(test->poly));
+		grits_viewer_remove(test->viewer, GRITS_OBJECT(test->line));
 		g_object_unref(test->viewer);
 		test->viewer = NULL;
 	}