libgis -> grits: Update everything

[aweather] / src / plugins / level2.c

diff --git a/src/plugins/level2.c b/src/plugins/level2.c
index f01f8031976a2103f9ad21eab57d3396f4ac2a47..88fae9d1c42c0895d9118ca0b0755336dc67849d 100644 (file)
--- a/src/plugins/level2.c
+++ b/src/plugins/level2.c
@@ -19,7 +19,7 @@
 #include <math.h>
 #include <GL/gl.h>
 #include <glib/gstdio.h>
-#include <gis.h>
+#include <grits.h>
 #include <rsl.h>
 
 #include "level2.h"
@@ -68,20 +68,29 @@ static void _bscan_sweep(Sweep *sweep, AWeatherColormap *colormap,
 }
 
 /* Load a sweep into an OpenGL texture */
-static void _load_sweep_gl(Sweep *sweep, AWeatherColormap *colormap, guint *tex)
+static void _load_sweep_gl(AWeatherLevel2 *self)
 {
        g_debug("AWeatherLevel2: _load_sweep_gl");
-       int height, width;
        guint8 *data;
-       _bscan_sweep(sweep, colormap, &data, &width, &height);
-       glGenTextures(1, tex);
-       glBindTexture(GL_TEXTURE_2D, *tex);
+       gint width, height;
+       _bscan_sweep(self->sweep, self->sweep_colors, &data, &width, &height);
+       gint tex_width  = pow(2, ceil(log(width )/log(2)));
+       gint tex_height = pow(2, ceil(log(height)/log(2)));
+       self->sweep_coords[0] = (double)width  / tex_width;
+       self->sweep_coords[1] = (double)height / tex_height;
+
+       if (!self->sweep_tex)
+                glGenTextures(1, &self->sweep_tex);
+       glBindTexture(GL_TEXTURE_2D, self->sweep_tex);
        glPixelStorei(GL_PACK_ALIGNMENT, 1);
        glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
+       glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, tex_width, tex_height, 0,
+                       GL_RGBA, GL_UNSIGNED_BYTE, NULL);
+       glTexSubImage2D(GL_TEXTURE_2D, 0, 0,0, width,height,
+                       GL_RGBA, GL_UNSIGNED_BYTE, data);
        glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
        glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-       glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, width, height, 0,
-                       GL_RGBA, GL_UNSIGNED_BYTE, data);
+
        g_free(data);
 }
 
@@ -121,7 +130,7 @@ static gboolean _decompress_radar(const gchar *file, const gchar *raw)
 /*********************
  * Drawing functions *
  *********************/
-static void _draw_radar(GisCallback *_self, gpointer _viewer)
+static void _draw_radar(GritsCallback *_self, gpointer _viewer)
 {
        AWeatherLevel2 *self = AWEATHER_LEVEL2(_self);
        if (!self->sweep || !self->sweep_tex)
@@ -133,7 +142,7 @@ static void _draw_radar(GisCallback *_self, gpointer _viewer)
        gdouble lat  = (double)h->latd + (double)h->latm/60 + (double)h->lats/(60*60);
        gdouble lon  = (double)h->lond + (double)h->lonm/60 + (double)h->lons/(60*60);
        gdouble elev = h->height;
-       gis_viewer_center_position(self->viewer, lat, lon, elev);
+       grits_viewer_center_position(self->viewer, lat, lon, elev);
 
        glDisable(GL_ALPHA_TEST);
        glDisable(GL_CULL_FACE);
@@ -144,8 +153,9 @@ static void _draw_radar(GisCallback *_self, gpointer _viewer)
        glColor4f(1,1,1,1);
 
        /* Draw the rays */
+       gdouble xscale = self->sweep_coords[0];
+       gdouble yscale = self->sweep_coords[1];
        glBindTexture(GL_TEXTURE_2D, self->sweep_tex);
-       g_message("Tex = %d", self->sweep_tex);
        glBegin(GL_TRIANGLE_STRIP);
        for (int ri = 0; ri <= sweep->h.nrays; ri++) {
                Ray  *ray = NULL;
@@ -167,13 +177,13 @@ static void _draw_radar(GisCallback *_self, gpointer _viewer)
 
                /* (find middle of bin) / scale for opengl */
                // near left
-               glTexCoord2f(0.0, (double)ri/sweep->h.nrays-0.01);
+               glTexCoord2f(0.0, ((double)ri/sweep->h.nrays)*yscale);
                glVertex3f(lx*near_dist, ly*near_dist, 2.0);
 
                // far  left
                // todo: correct range-height function
                double height = sin(deg2rad(ray->h.elev)) * far_dist;
-               glTexCoord2f(1.0, (double)ri/sweep->h.nrays-0.01);
+               glTexCoord2f(xscale, ((double)ri/sweep->h.nrays)*yscale);
                glVertex3f(lx*far_dist,  ly*far_dist, height);
        }
        glEnd();
@@ -196,9 +206,7 @@ static gboolean _set_sweep_cb(gpointer _self)
 {
        g_debug("AWeatherLevel2: _set_sweep_cb");
        AWeatherLevel2 *self = _self;
-       if (self->sweep_tex)
-               glDeleteTextures(1, &self->sweep_tex);
-       _load_sweep_gl(self->sweep, self->sweep_colors, &self->sweep_tex);
+       _load_sweep_gl(self);
        gtk_widget_queue_draw(GTK_WIDGET(self->viewer));
        g_object_unref(self);
        return FALSE;
@@ -226,7 +234,7 @@ void aweather_level2_set_sweep(AWeatherLevel2 *self,
        g_idle_add(_set_sweep_cb, self);
 }
 
-AWeatherLevel2 *aweather_level2_new(GisViewer *viewer,
+AWeatherLevel2 *aweather_level2_new(GritsViewer *viewer,
                AWeatherColormap *colormap, Radar *radar)
 {
        g_debug("AWeatherLevel2: new - %s", radar->h.radar_name);
@@ -238,7 +246,7 @@ AWeatherLevel2 *aweather_level2_new(GisViewer *viewer,
        return self;
 }
 
-AWeatherLevel2 *aweather_level2_new_from_file(GisViewer *viewer,
+AWeatherLevel2 *aweather_level2_new_from_file(GritsViewer *viewer,
                AWeatherColormap *colormap,
                const gchar *file, const gchar *site)
 {
@@ -260,7 +268,9 @@ AWeatherLevel2 *aweather_level2_new_from_file(GisViewer *viewer,
 
        /* Load the radar file */
        RSL_read_these_sweeps("all", NULL);
+       g_message("read start");
        Radar *radar = RSL_wsr88d_to_radar(raw, (gchar*)site);
+       g_message("read done");
        g_free(raw);
        if (!radar)
                return NULL;
@@ -357,11 +367,11 @@ GtkWidget *aweather_level2_get_config(AWeatherLevel2 *level2)
 /****************
  * GObject code *
  ****************/
-G_DEFINE_TYPE(AWeatherLevel2, aweather_level2, GIS_TYPE_CALLBACK);
+G_DEFINE_TYPE(AWeatherLevel2, aweather_level2, GRITS_TYPE_CALLBACK);
 static void aweather_level2_init(AWeatherLevel2 *self)
 {
-       GIS_CALLBACK(self)->callback  = _draw_radar;
-       GIS_CALLBACK(self)->user_data = self;
+       GRITS_CALLBACK(self)->callback  = _draw_radar;
+       GRITS_CALLBACK(self)->user_data = self;
 }
 static void aweather_level2_dispose(GObject *_self)
 {
@@ -370,7 +380,11 @@ static void aweather_level2_dispose(GObject *_self)
 }
 static void aweather_level2_finalize(GObject *_self)
 {
+       AWeatherLevel2 *self = AWEATHER_LEVEL2(_self);
        g_debug("AWeatherLevel2: finalize - %p", _self);
+       RSL_free_radar(self->radar);
+       if (self->sweep_tex)
+               glDeleteTextures(1, &self->sweep_tex);
        G_OBJECT_CLASS(aweather_level2_parent_class)->finalize(_self);
 }
 static void aweather_level2_class_init(AWeatherLevel2Class *klass)