/*********************
* Drawing functions *
*********************/
-static gpointer _draw_radar(GisCallback *_self, gpointer _viewer)
+static void _draw_radar(GisCallback *_self, gpointer _viewer)
{
AWeatherLevel2 *self = AWEATHER_LEVEL2(_self);
if (!self->sweep || !self->sweep_tex)
- return NULL;
+ return;
/* Draw wsr88d */
Sweep *sweep = self->sweep;
//glTexCoord2d( 1., 1.); glVertex3f( 0., 500., 3.); // top right
//glTexCoord2d( 1., 0.); glVertex3f( 0., 0., 3.); // bot right
//glEnd();
-
- return NULL;
}
#include "aweather-colormap.h"
/* Level2 */
-#define AWEATHER_TYPE_LEVEL2 (aweather_level2_get_type())
+#define AWEATHER_TYPE_LEVEL2 (aweather_level2_get_type())
+#define AWEATHER_LEVEL2(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), AWEATHER_TYPE_LEVEL2, AWeatherLevel2))
+#define AWEATHER_IS_LEVEL2(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), AWEATHER_TYPE_LEVEL2))
+#define AWEATHER_LEVEL2_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), AWEATHER_TYPE_LEVEL2, AWeatherLevel2Class))
+#define AWEATHER_IS_LEVEL2_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), AWEATHER_TYPE_LEVEL2))
+#define AWEATHER_LEVEL2_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), AWEATHER_TYPE_LEVEL2, AWeatherLevel2Class))
-GOBJECT_HEAD(
- AWEATHER, LEVEL2,
- AWeather, Level2,
- aweather, level2);
+typedef struct _AWeatherLevel2 AWeatherLevel2;
+typedef struct _AWeatherLevel2Class AWeatherLevel2Class;
struct _AWeatherLevel2 {
GisCallback parent;
GisCallbackClass parent_class;
};
+GType aweather_level2_get_type(void);
+
AWeatherLevel2 *aweather_level2_new(GisViewer *viewer,
AWeatherColormap *colormap, Radar *radar);
#include "../aweather-location.h"
/* Drawing functions */
-static gpointer _draw_hud(GisCallback *callback, gpointer _self)
+static void _draw_hud(GisCallback *callback, gpointer _self)
{
GisPluginRadar *self = GIS_PLUGIN_RADAR(_self);
if (!self->colormap)
- return NULL;
+ return;
g_debug("GisPluginRadar: _draw_hud");
/* Print the color table */
glVertex3f(-0.9, (float)((i ) - 256/2)/(256/2), 0.0); // bot right
}
glEnd();
-
- return NULL;
}