got levels working, plus faster

[aweather] / src / cube.c

diff --git a/src/cube.c b/src/cube.c
index 9465938602c6cf1fb05e3f4602fa45925f24b958..18bdb4c2f84118f3d0b9299914b748ec64891ebb 100644 (file)
--- a/src/cube.c
+++ b/src/cube.c
@@ -5,6 +5,11 @@
 #include <GL/gl.h>
 #include <math.h>
 
+static gboolean expose(GtkWidget *da, GdkEventExpose *event, gpointer user_data);
+static gboolean rotate(gpointer user_data);
+
+static GtkWidget *rotate_button;
+
 float boxv[][3] = {
        { -0.5, -0.5, -0.5 },
        {  0.5, -0.5, -0.5 },
@@ -19,20 +24,12 @@ float boxv[][3] = {
 
 static float ang = 30.;
 
-gboolean expose (GtkWidget *da, GdkEventExpose *event, gpointer user_data)
+static gboolean expose(GtkWidget *da, GdkEventExpose *event, gpointer user_data)
 {
        GdkGLContext *glcontext = gtk_widget_get_gl_context (da);
        GdkGLDrawable *gldrawable = gtk_widget_get_gl_drawable (da);
 
-       // g_print (" :: expose\n");
-
-       if (!gdk_gl_drawable_gl_begin (gldrawable, glcontext))
-       {
-               g_assert_not_reached ();
-       }
-
        /* draw in here */
-       glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
        glPushMatrix();
        
        glRotatef (ang, 1, 0, 1);
@@ -98,48 +95,32 @@ gboolean expose (GtkWidget *da, GdkEventExpose *event, gpointer user_data)
 
        glPopMatrix ();
 
-       if (gdk_gl_drawable_is_double_buffered (gldrawable))
-               gdk_gl_drawable_swap_buffers (gldrawable);
-
-       else
-               glFlush ();
-
-       gdk_gl_drawable_gl_end (gldrawable);
-
-       return TRUE;
+       return FALSE;
 }
 
-gboolean configure(GtkWidget *da, GdkEventConfigure *event, gpointer user_data)
+static gboolean rotate(gpointer user_data)
 {
-       GdkGLContext *glcontext = gtk_widget_get_gl_context (da);
-       GdkGLDrawable *gldrawable = gtk_widget_get_gl_drawable (da);
+       if (!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(rotate_button)))
+               return TRUE;
 
-       if (!gdk_gl_drawable_gl_begin (gldrawable, glcontext))
-       {
-               g_assert_not_reached ();
-       }
+       GtkWidget *da = GTK_WIDGET (user_data);
 
-       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);
+       ang++;
 
-       glScalef (10., 10., 10.);
-       
-       gdk_gl_drawable_gl_end (gldrawable);
+       gdk_window_invalidate_rect(da->window, &da->allocation, FALSE);
+       gdk_window_process_updates(da->window, FALSE);
 
        return TRUE;
 }
 
-gboolean rotate (gpointer user_data)
+gboolean cube_init(GtkDrawingArea *drawing, GtkNotebook *config)
 {
-       GtkWidget *da = GTK_WIDGET (user_data);
-
-       ang++;
-
-       gdk_window_invalidate_rect (da->window, &da->allocation, FALSE);
-       gdk_window_process_updates (da->window, FALSE);
-
-       return TRUE;
+       /* Add configuration tab */
+       GtkWidget *label = gtk_label_new("Cube");
+       rotate_button = gtk_toggle_button_new_with_label("Rotate");
+       gtk_notebook_append_page(GTK_NOTEBOOK(config), rotate_button, label);
+
+       /* Set up OpenGL Stuff */
+       g_signal_connect(drawing, "expose-event", G_CALLBACK(expose), NULL);
+       g_timeout_add(1000/60, rotate, drawing);
 }