From ca92bbbff0d43736c8480bd3f2ce82d538f83764 Mon Sep 17 00:00:00 2001
From: Andy Spencer <andy753421@gmail.com>
Date: Wed, 6 May 2009 08:30:28 +0000
Subject: [PATCH] pushing more things

---
 src/aweather.c |  2 +-
 src/example.c  |  7 ++++---
 src/radar.c    | 17 ++++++++---------
 src/ridge.c    |  2 +-
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/aweather.c b/src/aweather.c
index 380db65..a1c1afb 100644
--- a/src/aweather.c
+++ b/src/aweather.c
@@ -80,7 +80,7 @@ int main(int argc, char *argv[])
 	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));
+	example_init(GTK_DRAWING_AREA(drawing), GTK_NOTEBOOK(tab_area));
 
 	gtk_widget_show_all(window);
 	gtk_main();
diff --git a/src/example.c b/src/example.c
index 22b90ff..bab69c4 100644
--- a/src/example.c
+++ b/src/example.c
@@ -10,6 +10,7 @@ static float ang = 30.;
 static gboolean expose(GtkWidget *da, GdkEventExpose *event, gpointer user_data)
 {
 	glPushMatrix();
+	glDisable(GL_TEXTURE_2D);
 	glLoadIdentity();
 	glTranslatef(0.5, -0.5, -2);
 
@@ -24,10 +25,10 @@ static gboolean expose(GtkWidget *da, GdkEventExpose *event, gpointer user_data)
 	glEnable(GL_COLOR_MATERIAL);
 
 	glRotatef(ang, 1, 0, 1);
-	glColor3f(0.9, 0.9, 0.7);
-	//gdk_gl_draw_teapot(TRUE, 0.25);
+	glColor4f(0.9, 0.9, 0.7, 1.0);
+	gdk_gl_draw_teapot(TRUE, 0.25);
 	gdk_gl_draw_cube(TRUE, 0.25);
-	glColor3f(1.0, 1.0, 1.0);
+	glColor4f(1.0, 1.0, 1.0, 1.0);
 
 	glDisable(GL_LIGHT0);
 	glDisable(GL_LIGHTING);
diff --git a/src/radar.c b/src/radar.c
index 5eda980..f397263 100644
--- a/src/radar.c
+++ b/src/radar.c
@@ -96,6 +96,7 @@ static void load_sweep(Sweep *sweep)
 	glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, data);
 	g_free(data);
 	gdk_window_invalidate_rect(drawing->window, &drawing->allocation, FALSE);
+	gdk_window_process_updates(drawing->window, FALSE);
 }
 
 /* Load the default sweep */
@@ -117,13 +118,11 @@ static gboolean expose(GtkWidget *da, GdkEventExpose *event, gpointer user_data)
 	glPushMatrix();
 	glBindTexture(GL_TEXTURE_2D, sweep_tex);
 	glEnable(GL_TEXTURE_2D);
-	glColor3f(1,1,1);
+	glColor4f(1,1,1,1);
 	glBegin(GL_QUAD_STRIP);
-	int _ri; // not really used, creates strange fragments..
-	for (_ri = 0; _ri < sweep->h.nrays; _ri++) {
+	for (int ri = 0; ri <= sweep->h.nrays+1; ri++) {
 		/* Do the first sweep twice to complete the last Quad */
-		int ri = _ri % sweep->h.nrays;
-		Ray *ray = sweep->ray[ri];
+		Ray *ray = sweep->ray[ri % sweep->h.nrays];
 
 		/* right and left looking out from radar */
 		double left  = ((ray->h.azimuth - ((double)ray->h.beam_width/2.))*M_PI)/180.0; 
@@ -157,10 +156,9 @@ static gboolean expose(GtkWidget *da, GdkEventExpose *event, gpointer user_data)
 	//glEnd();
 
 	/* Print the color table */
-	glPushMatrix();
 	glDisable(GL_TEXTURE_2D);
-	glMatrixMode(GL_MODELVIEW ); glLoadIdentity();
-	glMatrixMode(GL_PROJECTION); glLoadIdentity();
+	glMatrixMode(GL_MODELVIEW ); glPushMatrix(); glLoadIdentity();
+	glMatrixMode(GL_PROJECTION); glPushMatrix(); glLoadIdentity();
 	glBegin(GL_QUADS);
 	int i;
 	for (i = 0; i < nred; i++) {
@@ -171,7 +169,8 @@ static gboolean expose(GtkWidget *da, GdkEventExpose *event, gpointer user_data)
 		glVertex3f(-0.9, (float)((i  ) - nred/2)/(nred/2), 0.0); // bot right
 	}
 	glEnd();
-	glPopMatrix();
+        glMatrixMode(GL_PROJECTION); glPopMatrix(); 
+	glMatrixMode(GL_MODELVIEW ); glPopMatrix();
 
 	return FALSE;
 }
diff --git a/src/ridge.c b/src/ridge.c
index d7c204a..3e08d00 100644
--- a/src/ridge.c
+++ b/src/ridge.c
@@ -98,7 +98,7 @@ static gboolean expose(GtkWidget *da, GdkEventExpose *event, gpointer user_data)
 	g_message("ridge:expose");
 	glPushMatrix();
 	glEnable(GL_TEXTURE_2D);
-	glColor3f(1,1,1);
+	glColor4f(1,1,1,1);
 
 	for (int i = 0; i < LAYER_COUNT; i++) {
 		glBindTexture(GL_TEXTURE_2D, layers[i].tex);
-- 
2.43.2