Finally getting stuff to work again, NEXRAD Level II data needs to be

[aweather] / src / opengl.c

diff --git a/src/opengl.c b/src/opengl.c
index 3561869cf85d6cf4d06ebd40a575f95a499af1bf..f348d71a0d05e5d9f3f6077421c49c561ad36f85 100644 (file)
--- a/src/opengl.c
+++ b/src/opengl.c
@@ -5,50 +5,50 @@
 
 static gboolean expose_start(GtkWidget *da, GdkEventExpose *event, gpointer user_data)
 {
-       GdkGLContext *glcontext = gtk_widget_get_gl_context (da);
-       GdkGLDrawable *gldrawable = gtk_widget_get_gl_drawable (da);
+       GdkGLContext *glcontext = gtk_widget_get_gl_context(da);
+       GdkGLDrawable *gldrawable = gtk_widget_get_gl_drawable(da);
 
-       if (!gdk_gl_drawable_gl_begin (gldrawable, glcontext)) {
-               g_assert_not_reached ();
+       if (!gdk_gl_drawable_gl_begin(gldrawable, glcontext)) {
+               g_assert_not_reached();
        }
 
        /* draw in here */
        glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+       return FALSE;
 }
 /* Plugins run stuff here */
 static gboolean expose_end(GtkWidget *da, GdkEventExpose *event, gpointer user_data)
 {
-       GdkGLContext *glcontext = gtk_widget_get_gl_context (da);
-       GdkGLDrawable *gldrawable = gtk_widget_get_gl_drawable (da);
+       GdkGLDrawable *gldrawable = gtk_widget_get_gl_drawable(da);
 
-       if (gdk_gl_drawable_is_double_buffered (gldrawable))
-               gdk_gl_drawable_swap_buffers (gldrawable);
+       if (gdk_gl_drawable_is_double_buffered(gldrawable))
+               gdk_gl_drawable_swap_buffers(gldrawable);
        else
-               glFlush ();
+               glFlush();
 
-       gdk_gl_drawable_gl_end (gldrawable);
+       gdk_gl_drawable_gl_end(gldrawable);
 
        return FALSE;
 }
 static gboolean configure(GtkWidget *da, GdkEventConfigure *event, gpointer user_data)
 {
-       GdkGLContext *glcontext = gtk_widget_get_gl_context (da);
-       GdkGLDrawable *gldrawable = gtk_widget_get_gl_drawable (da);
+       GdkGLContext *glcontext = gtk_widget_get_gl_context(da);
+       GdkGLDrawable *gldrawable = gtk_widget_get_gl_drawable(da);
 
-       if (!gdk_gl_drawable_gl_begin (gldrawable, glcontext))
-               g_assert_not_reached ();
+       if (!gdk_gl_drawable_gl_begin(gldrawable, glcontext))
+               g_assert_not_reached();
 
        glLoadIdentity();
-       glViewport (0, 0, da->allocation.width, da->allocation.height);
-       glOrtho (-10,10,-10,10,-20050,10000);
-       glEnable (GL_BLEND);
-       glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+       glViewport(0, 0, da->allocation.width, da->allocation.height);
+       glOrtho(-10,10,-10,10,-20050,10000);
+       glEnable(GL_BLEND);
+       glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 
-       glScalef (10., 10., 10.);
+       glScalef(10., 10., 10.);
        
-       gdk_gl_drawable_gl_end (gldrawable);
+       gdk_gl_drawable_gl_end(gldrawable);
 
-       return TRUE;
+       return FALSE;
 }
 
 gboolean opengl_init(GtkDrawingArea *drawing, GtkNotebook *config)
@@ -59,4 +59,5 @@ gboolean opengl_init(GtkDrawingArea *drawing, GtkNotebook *config)
        //g_signal_connect(drawing, "expose-event", G_CALLBACK(expose), NULL);
        g_signal_connect      (drawing, "expose-event", G_CALLBACK(expose_start), NULL);
        g_signal_connect_after(drawing, "expose-event", G_CALLBACK(expose_end),   NULL);
+       return TRUE;
 }