]> Pileus Git - aweather/commitdiff
perspective + ridge
authorAndy Spencer <andy753421@gmail.com>
Wed, 6 May 2009 02:07:43 +0000 (02:07 +0000)
committerAndy Spencer <andy753421@gmail.com>
Wed, 6 May 2009 02:07:43 +0000 (02:07 +0000)
configure.ac
src/Makefile.am
src/example.c
src/opengl.c
src/radar.c
src/ridge.c

index 016b33ddd9055b34b7cc1265a79a1159b8676a5e..9dbac1efe1614c1476f58f421ef99e6970ed2bd8 100644 (file)
@@ -8,7 +8,12 @@ AC_PROG_CC
 PKG_PROG_PKG_CONFIG
 
 # Check for required packages
-PKG_CHECK_MODULES(GTK, gtk+-2.0 gtkglext-1.0)
+PKG_CHECK_MODULES(GTK,  gtk+-2.0 gtkglext-1.0)
+PKG_CHECK_MODULES(CURL, libcurl)
+
+# Define odd RSL install location
+AC_SUBST(RSL_CFLAGS, "-I/usr/local/trmm/GVBOX/include/")
+AC_SUBST(RSL_LIBS,   "-L/usr/local/trmm/GVBOX/lib/ -lrsl")
 
 # Output 
 AC_CONFIG_FILES([
index 46a3cda65f2d9648753c80cbb6e838dad5415e07..c969493d750816406a4201c5a6d5800f1c29b0a6 100644 (file)
@@ -1,10 +1,10 @@
-AM_CPPFLAGS  = $(GTK_CFLAGS) -I/usr/local/trmm/GVBOX/include/
+AM_CPPFLAGS  = $(RSL_CFLAGS) $(GTK_CFLAGS) $(CURL_CFLAGS)
 AM_CFLAGS    = -O3 -Wall -Werror --std=gnu99
 
 bin_PROGRAMS = aweather
 
 aweather_SOURCES  = aweather.c opengl.c radar.c ridge.c example.c 
-aweather_LDADD    = $(GTK_LIBS) -L/usr/local/trmm/GVBOX/lib/ -lrsl
+aweather_LDADD    = $(RSL_LIBS) $(GTK_LIBS) $(CURL_LIBS)
 
 test: all
        LD_LIBRARY_PATH=/usr/local/trmm/GVBOX/lib/ \
index a53d62efb8b8c3b40e511ae30f1ec59aefef89f4..ffadee5e5a5f195e85e9564e422f3c588776da24 100644 (file)
@@ -1,9 +1,7 @@
 #include <config.h>
 #include <gtk/gtk.h>
 #include <gtk/gtkgl.h>
-#include <gdk/gdkkeysyms.h>
 #include <GL/gl.h>
-#include <math.h>
 
 static GtkWidget *rotate_button;
 
@@ -13,7 +11,7 @@ static gboolean expose(GtkWidget *da, GdkEventExpose *event, gpointer user_data)
 {
        glPushMatrix();
        glLoadIdentity();
-       glTranslatef(0.5, -0.5, 0);
+       glTranslatef(0.5, -0.5, -2);
 
        float light_ambient[]  = {0.1f, 0.1f, 0.0f};
        float light_diffuse[]  = {0.9f, 0.9f, 0.9f};
@@ -28,7 +26,8 @@ static gboolean expose(GtkWidget *da, GdkEventExpose *event, gpointer user_data)
 
        glRotatef(ang, 1, 0, 1);
        glColor3f(0.9, 0.9, 0.7);
-       gdk_gl_draw_teapot(TRUE, 0.25);
+       //gdk_gl_draw_teapot(TRUE, 0.25);
+       gdk_gl_draw_cube(TRUE, 0.25);
        glColor3f(1.0, 1.0, 1.0);
 
        glDisable(GL_LIGHT0);
index 9a369eca3afb096bb7c0a08bc8a0faedfacf44a6..94d1cd18a840151469aef70efb31f02fec8407b7 100644 (file)
@@ -2,9 +2,11 @@
 #include <gtk/gtk.h>
 #include <gtk/gtkgl.h>
 #include <GL/gl.h>
+#include <GL/glu.h>
 
 static gboolean expose_start(GtkWidget *da, GdkEventExpose *event, gpointer user_data)
 {
+       g_message("opengl:expose_start");
        GdkGLContext *glcontext = gtk_widget_get_gl_context(da);
        GdkGLDrawable *gldrawable = gtk_widget_get_gl_drawable(da);
 
@@ -19,6 +21,8 @@ static gboolean expose_start(GtkWidget *da, GdkEventExpose *event, gpointer user
 /* Plugins run stuff here */
 static gboolean expose_end(GtkWidget *da, GdkEventExpose *event, gpointer user_data)
 {
+       g_message("opengl:expose_end");
+
        GdkGLDrawable *gldrawable = gtk_widget_get_gl_drawable(da);
 
        if (gdk_gl_drawable_is_double_buffered(gldrawable))
@@ -38,14 +42,23 @@ static gboolean configure_start(GtkWidget *da, GdkEventConfigure *event, gpointe
        if (!gdk_gl_drawable_gl_begin(gldrawable, glcontext))
                g_assert_not_reached();
 
-       glLoadIdentity();
        glViewport(0, 0, da->allocation.width, da->allocation.height);
+
        glEnable(GL_BLEND);
        glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-       //glEnable(GL_ALPHA_TEST);
-       //glAlphaFunc(GL_EQUAL, 0);
+
+       glMatrixMode(GL_PROJECTION);
+       glLoadIdentity();
+       //glRotatef(0, 0, 2, 45);
+       gluPerspective(45.0f, 1, 0.1f, 10000000.0f);
+       //glFrustum(-1, 1, -1, 1, -1, 1);
+
+       glMatrixMode(GL_MODELVIEW);
+       glLoadIdentity();
        double scale = 500*1000; // 500 km
-       glOrtho(-scale,scale,-scale,scale,0,10000);
+       //glOrtho(-scale,scale,-scale,scale,-10000,10000);
+       glTranslatef(0.0, 0.0, -2.5*scale);
+       glRotatef(-45, 1, 0, 0);
 
        return FALSE;
 }
index e7575155f15a23da48be54498716bcbc5c91f05f..8881662aefb5fdd4e0ac74c4319432cbf2faa521 100644 (file)
@@ -1,7 +1,5 @@
 #include <config.h>
 #include <gtk/gtk.h>
-#include <gtk/gtkgl.h>
-#include <gdk/gdkkeysyms.h>
 #include <GL/gl.h>
 #include <math.h>
 
@@ -111,6 +109,10 @@ static gboolean configure(GtkWidget *da, GdkEventConfigure *event, gpointer user
 
 static gboolean expose(GtkWidget *da, GdkEventExpose *event, gpointer user_data)
 {
+       glPushMatrix();
+       glMatrixMode(GL_MODELVIEW);
+       glTranslatef(0, 0, 100000);
+
        //g_message("radar:expose");
        Sweep *sweep = cur_sweep;
 
@@ -138,14 +140,15 @@ 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, 0.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,  0.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();
+       glPushMatrix();
 
        /* Texture debug */
        //glBegin(GL_QUADS);
@@ -163,10 +166,10 @@ static gboolean expose(GtkWidget *da, GdkEventExpose *event, gpointer user_data)
        int i;
        for (i = 0; i < nred; i++) {
                glColor4ub(red[i], green[i], blue[i], get_alpha(i));
-               glVertex3f(-1., (float)((i  ) - nred/2)/(nred/2), 0.); // bot left
-               glVertex3f(-1., (float)((i+1) - nred/2)/(nred/2), 0.); // top left
-               glVertex3f(-.9, (float)((i+1) - nred/2)/(nred/2), 0.); // top right
-               glVertex3f(-.9, (float)((i  ) - nred/2)/(nred/2), 0.); // bot right
+               glVertex3f(-1., (float)((i  ) - nred/2)/(nred/2), 2.); // bot left
+               glVertex3f(-1., (float)((i+1) - nred/2)/(nred/2), 2.); // top left
+               glVertex3f(-.9, (float)((i+1) - nred/2)/(nred/2), 2.); // top right
+               glVertex3f(-.9, (float)((i  ) - nred/2)/(nred/2), 2.); // bot right
        }
        glEnd();
        glPopMatrix();
index fc1756ecf0945671d0c7313185b562cb176afd9a..002970b8fd4baa017f242c5a043915b70c94ddf0 100644 (file)
@@ -1,12 +1,72 @@
 #include <config.h>
 #include <gtk/gtk.h>
-#include <gtk/gtkgl.h>
-#include <gdk/gdkkeysyms.h>
+#include <curl/curl.h>
 #include <GL/gl.h>
-#include <math.h>
 
-static guint topo_tex;
+#include <stdio.h>
 
+enum {
+       LAYER_TOPO,
+       LAYER_COUNTY,
+       LAYER_RIVERS,
+       LAYER_HIGHWAYS,
+       LAYER_CITY,
+       LAYER_COUNT
+};
+
+static struct {
+       char *fmt;
+       float z;
+       guint tex;
+} layers[] = {
+       [LAYER_TOPO]     = { "Overlays/" "Topo/"     "Short/" "%s_Topo_Short.jpg",     1.0, 0 },
+       [LAYER_COUNTY]   = { "Overlays/" "County/"   "Short/" "%s_County_Short.gif",   3.0, 0 },
+       [LAYER_RIVERS]   = { "Overlays/" "Rivers/"   "Short/" "%s_Rivers_Short.gif",   4.0, 0 },
+       [LAYER_HIGHWAYS] = { "Overlays/" "Highways/" "Short/" "%s_Highways_Short.gif", 5.0, 0 },
+       [LAYER_CITY]     = { "Overlays/" "Cities/"   "Short/" "%s_City_Short.gif",     6.0, 0 },
+};
+
+static CURL *curl_handle;
+
+
+/**
+ * Cache a image from Ridge to the local disk
+ * \param  path  Path to the Ridge file, starting after /ridge/
+ * \return The local path to the cached image
+ */
+char *cache_image(char *path)
+{
+       gchar base[] = "http://radar.weather.gov/ridge/";
+       gchar *url   = g_strconcat(base, path, NULL);
+       gchar *local = g_build_filename(g_get_user_cache_dir(), PACKAGE, path, NULL);
+       if (!g_file_test(local, G_FILE_TEST_EXISTS)) {
+               if (!g_file_test(g_path_get_dirname(local), G_FILE_TEST_IS_DIR)) {
+                       //g_printerr("Making directory %s\n", g_path_get_dirname(local));
+                       g_mkdir_with_parents(g_path_get_dirname(local), 0755);
+               }
+               //g_printerr("Fetching image %s -> %s\n", url, local);
+               long http_code;
+               FILE *cached_image = fopen(local, "w+");
+               curl_easy_setopt(curl_handle, CURLOPT_URL, url);
+               curl_easy_setopt(curl_handle, CURLOPT_WRITEDATA, cached_image);
+               curl_easy_setopt(curl_handle, CURLOPT_WRITEFUNCTION, NULL);
+               curl_easy_perform(curl_handle);
+               curl_easy_getinfo(curl_handle, CURLINFO_RESPONSE_CODE, &http_code);
+               fflush(cached_image);
+               if (http_code != 200) {
+                       g_message("http %ld while fetching %s", http_code, url);
+                       remove(local);
+                       return NULL;
+               }
+       }
+       return local;
+}
+
+/**
+ * Load an image into an OpenGL texture
+ * \param  filename  Path to the image file
+ * \return The OpenGL identifier for the texture
+ */
 guint load_texture(char *filename)
 {
        /* Load image */
@@ -14,6 +74,7 @@ guint load_texture(char *filename)
        guchar    *pixels = gdk_pixbuf_get_pixels(pixbuf);
        int        width  = gdk_pixbuf_get_width(pixbuf);
        int        height = gdk_pixbuf_get_height(pixbuf);
+       int        format = gdk_pixbuf_get_has_alpha(pixbuf) ? GL_RGBA : GL_RGB;
 
        /* Create Texture */
        guint id;
@@ -21,30 +82,35 @@ guint load_texture(char *filename)
        glBindTexture(GL_TEXTURE_2D, id);   // 2d texture (x and y size)
 
        glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
-       glTexImage2D(GL_TEXTURE_2D, 0, 3, width, height, 0,
-                       GL_RGB, GL_UNSIGNED_BYTE, pixels);
+       glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, width, height, 0,
+                       format, GL_UNSIGNED_BYTE, pixels);
        glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
        glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
 
-       g_message("loaded %s: w=%d h=%d", filename, width, height);
+       g_message("loaded image:  w=%-3d  h=%-3d  fmt=%x  px=(%02x,%02x,%02x,%02x)  img=%s",
+               width, height, format, pixels[0], pixels[1], pixels[2], pixels[3],
+               g_path_get_basename(filename));
        return id;
 }
 
 static gboolean expose(GtkWidget *da, GdkEventExpose *event, gpointer user_data)
 {
-       //g_message("ridge:expose");
+       g_message("ridge:expose");
        glPushMatrix();
-       glScaled(500*1000, 500*1000, 0);
+       //glScaled(500*1000, 500*1000, 0);
+       //glTranslatef(0,50000,5000);
 
-       glBindTexture(GL_TEXTURE_2D, topo_tex);
-       glEnable(GL_TEXTURE_2D);
+       for (int i = 0; i < LAYER_COUNT; i++) {
+               glBindTexture(GL_TEXTURE_2D, layers[i].tex);
+               glEnable(GL_TEXTURE_2D);
 
-       glBegin(GL_POLYGON);
-       glTexCoord2f(0.0, 0.0); glVertex3f(-1.0,  1.0, 0.1);
-       glTexCoord2f(0.0, 1.0); glVertex3f(-1.0, -1.0, 0.1);
-       glTexCoord2f(1.0, 1.0); glVertex3f( 1.0, -1.0, 0.1);
-       glTexCoord2f(1.0, 0.0); glVertex3f( 1.0,  1.0, 0.1);
-       glEnd();
+               glBegin(GL_POLYGON);
+               glTexCoord2f(0.0, 0.0); glVertex3f(500*1000*-1.0, 500*1000* 1.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);
+               glEnd();
+       }
 
        glPopMatrix();
        return FALSE;
@@ -52,7 +118,15 @@ static gboolean expose(GtkWidget *da, GdkEventExpose *event, gpointer user_data)
 
 static gboolean configure(GtkWidget *da, GdkEventConfigure *event, gpointer user_data)
 {
-       topo_tex = load_texture("../data/topo.jpg");
+       for (int i = 0; i < LAYER_COUNT; i++) {
+               if (layers[i].tex != 0)
+                       continue;
+               char *path  = g_strdup_printf(layers[i].fmt, "IND");
+               char *local = cache_image(path);
+               layers[i].tex = load_texture(local);
+               g_free(local);
+               g_free(path);
+       }
        return FALSE;
 }
 
@@ -61,5 +135,9 @@ gboolean ridge_init(GtkDrawingArea *drawing, GtkNotebook *config)
        /* Set up OpenGL Stuff */
        g_signal_connect(drawing, "expose-event",    G_CALLBACK(expose),    NULL);
        g_signal_connect(drawing, "configure-event", G_CALLBACK(configure), NULL);
+
+       curl_global_init(CURL_GLOBAL_ALL);
+       curl_handle = curl_easy_init();
+
        return TRUE;
 }