]> Pileus Git - aweather/blobdiff - src/plugins/level2.c
Remove gnulib, it's a huge pain
[aweather] / src / plugins / level2.c
index e8e63a5566db3f53d1fa6322389af544026ef428..aabe345ea73ace66064986e0bdbdb1cadb245246 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009-2010 Andy Spencer <andy753421@gmail.com>
+ * Copyright (C) 2009-2011 Andy Spencer <andy753421@gmail.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -211,7 +211,7 @@ void aweather_level2_draw(GritsObject *_level2, GritsOpenGL *opengl)
 
        /* Draw wsr88d */
        Sweep *sweep = level2->sweep;
-       glDisable(GL_ALPHA_TEST);
+       //glDisable(GL_ALPHA_TEST);
        glDisable(GL_CULL_FACE);
        glDisable(GL_LIGHTING);
        glEnable(GL_TEXTURE_2D);
@@ -324,7 +324,7 @@ void aweather_level2_set_iso(AWeatherLevel2 *level2, gfloat level)
                vol->disp = GRITS_VOLUME_SURFACE;
                GRITS_OBJECT(vol)->center = GRITS_OBJECT(level2)->center;
                grits_viewer_add(GRITS_OBJECT(level2)->viewer,
-                               GRITS_OBJECT(vol), GRITS_LEVEL_WORLD, TRUE);
+                               GRITS_OBJECT(vol), GRITS_LEVEL_WORLD+1, FALSE);
                level2->volume = vol;
        }
        if (ISO_MIN < level && level < ISO_MAX) {
@@ -516,7 +516,8 @@ static void aweather_level2_dispose(GObject *_level2)
        AWeatherLevel2 *level2 = AWEATHER_LEVEL2(_level2);
        g_debug("AWeatherLevel2: dispose - %p", _level2);
        if (level2->volume) {
-               grits_viewer_remove(GRITS_OBJECT(level2)->viewer, level2->volume);
+               grits_viewer_remove(GRITS_OBJECT(level2->volume)->viewer,
+                               GRITS_OBJECT(level2->volume));
                level2->volume = NULL;
        }
        G_OBJECT_CLASS(aweather_level2_parent_class)->dispose(_level2);