(no commit message)

diff --git a/TODO b/TODO
new file mode 100644 (file)
index 0000000..2fb9e79
--- /dev/null
+++ b/TODO
@@ -0,0 +1,3 @@
+Fix Z-Ordering
+
+- Need to draw objects from lowest to highest when using transparency

diff --git a/src/aweather.c b/src/aweather.c
index a1c1afbe4e59cb7b1fec987162e3eee3ab789257..cd5498e1478b4da35a588a8593eb182d219ff9fb 100644 (file)
--- a/src/aweather.c
+++ b/src/aweather.c
@@ -78,8 +78,8 @@ int main(int argc, char *argv[])
 
        /* Load plugins */
        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));
+       ridge_init  (GTK_DRAWING_AREA(drawing), GTK_NOTEBOOK(tab_area));
        example_init(GTK_DRAWING_AREA(drawing), GTK_NOTEBOOK(tab_area));
 
        gtk_widget_show_all(window);

diff --git a/src/opengl.c b/src/opengl.c
index c943c796b00a17b52d5beba7fc0b88462352cbf2..43fd022864f98d7de882d36048f18f886898fb9b 100644 (file)
--- a/src/opengl.c
+++ b/src/opengl.c
@@ -53,7 +53,6 @@ static gboolean configure_start(GtkWidget *da, GdkEventConfigure *event, gpointe
        glEnable(GL_BLEND);
        glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
        glClearColor(0.8f, 0.8f, 1.0f, 0.0f);
-       glColorMaterial(GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE);
 
        /* Depth test */
        glClearDepth(1.0);
@@ -65,7 +64,7 @@ static gboolean configure_start(GtkWidget *da, GdkEventConfigure *event, gpointe
        glLoadIdentity();
        double rad = atan(height/2*1000.0/dist); // 1px = 1000 meters
        double deg = (rad*180)/M_PI;
-       gluPerspective(deg*2, width/height, 0.1f, 1000000000.0f);
+       gluPerspective(deg*2, width/height, dist-20, dist+20);
 
        /* Camera position? */
        glMatrixMode(GL_MODELVIEW);

diff --git a/src/radar.c b/src/radar.c
index f39726304c9454dcb999600ce115522c92039525..1b611ecc5fd738a354ba95fa16cf5402767860e3 100644 (file)
--- a/src/radar.c
+++ b/src/radar.c
@@ -115,6 +115,7 @@ static gboolean expose(GtkWidget *da, GdkEventExpose *event, gpointer user_data)
 
        /* Draw the rays */
 
+       glMatrixMode(GL_MODELVIEW);
        glPushMatrix();
        glBindTexture(GL_TEXTURE_2D, sweep_tex);
        glEnable(GL_TEXTURE_2D);
@@ -137,11 +138,11 @@ static gboolean expose(GtkWidget *da, GdkEventExpose *event, gpointer user_data)
                /* (find middle of bin) / scale for opengl */
                // near left
                glTexCoord2f(0.0, (double)ri/sweep->h.nrays);
-               glVertex3f(lx*near_dist, ly*near_dist, 1.0);
+               glVertex3f(lx*near_dist, ly*near_dist, 2.0);
 
                // far  left
                glTexCoord2f(1.0, (double)ri/sweep->h.nrays);
-               glVertex3f(lx*far_dist,  ly*far_dist,  1.0);
+               glVertex3f(lx*far_dist,  ly*far_dist,  2.0);
        }
        //g_print("ri=%d, nr=%d, bw=%f\n", _ri, sweep->h.nrays, sweep->h.beam_width);
        glEnd();
@@ -156,21 +157,21 @@ static gboolean expose(GtkWidget *da, GdkEventExpose *event, gpointer user_data)
        //glEnd();
 
        /* Print the color table */
-       glDisable(GL_TEXTURE_2D);
-       glMatrixMode(GL_MODELVIEW ); glPushMatrix(); glLoadIdentity();
-       glMatrixMode(GL_PROJECTION); glPushMatrix(); glLoadIdentity();
-       glBegin(GL_QUADS);
-       int i;
-       for (i = 0; i < nred; i++) {
-               glColor4ub(red[i], green[i], blue[i], get_alpha(i));
-               glVertex3f(-1.0, (float)((i  ) - nred/2)/(nred/2), 0.0); // bot left
-               glVertex3f(-1.0, (float)((i+1) - nred/2)/(nred/2), 0.0); // top left
-               glVertex3f(-0.9, (float)((i+1) - nred/2)/(nred/2), 0.0); // top right
-               glVertex3f(-0.9, (float)((i  ) - nred/2)/(nred/2), 0.0); // bot right
-       }
-       glEnd();
-        glMatrixMode(GL_PROJECTION); glPopMatrix(); 
-       glMatrixMode(GL_MODELVIEW ); glPopMatrix();
+       //glDisable(GL_TEXTURE_2D);
+       //glMatrixMode(GL_MODELVIEW ); glPushMatrix(); glLoadIdentity();
+       //glMatrixMode(GL_PROJECTION); glPushMatrix(); glLoadIdentity();
+       //glBegin(GL_QUADS);
+       //int i;
+       //for (i = 0; i < nred; i++) {
+       //      glColor4ub(red[i], green[i], blue[i], get_alpha(i));
+       //      glVertex3f(-1.0, (float)((i  ) - nred/2)/(nred/2), 0.0); // bot left
+       //      glVertex3f(-1.0, (float)((i+1) - nred/2)/(nred/2), 0.0); // top left
+       //      glVertex3f(-0.9, (float)((i+1) - nred/2)/(nred/2), 0.0); // top right
+       //      glVertex3f(-0.9, (float)((i  ) - nred/2)/(nred/2), 0.0); // bot right
+       //}
+       //glEnd();
+        //glMatrixMode(GL_PROJECTION); glPopMatrix(); 
+       //glMatrixMode(GL_MODELVIEW ); glPopMatrix();
 
        return FALSE;
 }

diff --git a/src/ridge.c b/src/ridge.c
index 3e08d00eac0f7ce750698255a6c430de2bfeb60e..f6dd5582d23a2103cb973cafd3a92aa9db8b0f5e 100644 (file)
--- a/src/ridge.c
+++ b/src/ridge.c
@@ -104,10 +104,10 @@ static gboolean expose(GtkWidget *da, GdkEventExpose *event, gpointer user_data)
                glBindTexture(GL_TEXTURE_2D, layers[i].tex);
 
                glBegin(GL_POLYGON);
-               glTexCoord2f(0.0, 0.0); glVertex3f(500*1000*-1.0, 500*1000* 1.0, layers[i].z);
+               glTexCoord2f(0.0, 0.0); glVertex3f(500*1000*-1.0, 500*1000* 0.0, layers[i].z);
                glTexCoord2f(0.0, 1.0); glVertex3f(500*1000*-1.0, 500*1000*-1.0, layers[i].z);
                glTexCoord2f(1.0, 1.0); glVertex3f(500*1000* 1.0, 500*1000*-1.0, layers[i].z);
-               glTexCoord2f(1.0, 0.0); glVertex3f(500*1000* 1.0, 500*1000* 1.0, layers[i].z);
+               glTexCoord2f(1.0, 0.0); glVertex3f(500*1000* 1.0, 500*1000* 0.0, layers[i].z);
                glEnd();
        }