X-Git-Url: http://pileus.org/git/?p=grits;a=blobdiff_plain;f=src%2Faweather.c;h=a1c1afbe4e59cb7b1fec987162e3eee3ab789257;hp=35eede0f9805ff1b1260c51b186ebc78d8961e68;hb=ca92bbbff0d43736c8480bd3f2ce82d538f83764;hpb=1398794a7901ac38c29856d6d08b5f9fac15ff1a

diff --git a/src/aweather.c b/src/aweather.c
index 35eede0..a1c1afb 100644
--- a/src/aweather.c
+++ b/src/aweather.c
@@ -5,7 +5,8 @@
 
 #include "opengl.h"
 #include "radar.h"
-#include "cube.h"
+#include "ridge.h"
+#include "example.h"
 
 static void destroy(GtkWidget *widget, gpointer data)
 {
@@ -58,9 +59,14 @@ int main(int argc, char *argv[])
 	GtkWidget *drawing = gtk_drawing_area_new();
 	gtk_paned_pack1(GTK_PANED(paned), drawing, TRUE, FALSE);
 	//gtk_box_pack_end(GTK_BOX(vbox), drawing, TRUE, TRUE, 0);
-	GdkGLConfig *glconfig = gdk_gl_config_new_by_mode(GDK_GL_MODE_RGB | GDK_GL_MODE_DEPTH | GDK_GL_MODE_DOUBLE);
-	if (!glconfig) g_assert_not_reached();
-	if (!gtk_widget_set_gl_capability(drawing, glconfig, NULL, TRUE, GDK_GL_RGBA_TYPE)) g_assert_not_reached();
+	GdkGLConfig *glconfig = gdk_gl_config_new_by_mode(
+			GDK_GL_MODE_RGBA |
+			GDK_GL_MODE_DEPTH |
+			GDK_GL_MODE_DOUBLE);
+	if (!glconfig)
+		g_assert_not_reached();
+	if (!gtk_widget_set_gl_capability(drawing, glconfig, NULL, TRUE, GDK_GL_RGBA_TYPE))
+		g_assert_not_reached();
 
 	/* Set up tab area */
 	GtkWidget *tab_area = gtk_notebook_new();
@@ -71,9 +77,10 @@ int main(int argc, char *argv[])
 	//gtk_notebook_append_page(GTK_NOTEBOOK(tab_area), contents, label);
 
 	/* Load plugins */
-	opengl_init(GTK_DRAWING_AREA(drawing), GTK_NOTEBOOK(tab_area));
-	radar_init (GTK_DRAWING_AREA(drawing), GTK_NOTEBOOK(tab_area));
-	cube_init  (GTK_DRAWING_AREA(drawing), GTK_NOTEBOOK(tab_area));
+	opengl_init (GTK_DRAWING_AREA(drawing), GTK_NOTEBOOK(tab_area));
+	ridge_init  (GTK_DRAWING_AREA(drawing), GTK_NOTEBOOK(tab_area));
+	radar_init  (GTK_DRAWING_AREA(drawing), GTK_NOTEBOOK(tab_area));
+	example_init(GTK_DRAWING_AREA(drawing), GTK_NOTEBOOK(tab_area));
 
 	gtk_widget_show_all(window);
 	gtk_main();