X-Git-Url: http://pileus.org/git/?p=grits;a=blobdiff_plain;f=src%2Fplugins%2Fenv.c;h=e5787c6d6cead1d1837720735b1a9ce0a25f5c7a;hp=e0d916a3eb3b923b75e869fdcfc9d4454e5505d6;hb=bd716715f1d13a8df514fcfa53fd82aebdfda770;hpb=10671a702a73850f66173d0ddc0632b768affb7e

diff --git a/src/plugins/env.c b/src/plugins/env.c
index e0d916a..e5787c6 100644
--- a/src/plugins/env.c
+++ b/src/plugins/env.c
@@ -19,20 +19,20 @@
 #include <gtk/gtkgl.h>
 #include <GL/gl.h>
 
-#include <gis/gis.h>
+#include <gis.h>
 
 #include "env.h"
 
 /***********
  * Helpers *
  ***********/
-static gpointer expose(GisCallback *callback, gpointer _self)
+static gpointer expose(GisCallback *callback, gpointer _env)
 {
-	GisPluginEnv *self = GIS_PLUGIN_ENV(_self);
+	GisPluginEnv *env = GIS_PLUGIN_ENV(_env);
 	g_debug("GisPluginEnv: expose");
 
 	gdouble lat, lon, elev;
-	gis_viewer_get_location(self->viewer, &lat, &lon, &elev);
+	gis_viewer_get_location(env->viewer, &lat, &lon, &elev);
 
 	/* Misc */
 	gdouble rg   = MAX(0, 1-(elev/20000));
@@ -40,9 +40,6 @@ static gpointer expose(GisCallback *callback, gpointer _self)
 	glClearColor(MIN(0.65,rg), MIN(0.65,rg), MIN(1,blue), 1.0f);
 	glClear(GL_COLOR_BUFFER_BIT);
 
-	/* Clear the earth */
-	gis_viewer_render_tile(self->viewer, self->background);
-
 	/* Attempt to render an atmosphere */
 	/*
 	glEnable(GL_COLOR_MATERIAL);
@@ -57,7 +54,7 @@ static gpointer expose(GisCallback *callback, gpointer _self)
 	for (elev = -EARTH_R; elev < 0; elev += EARTH_R/10) {
 		glPushMatrix();
 		glColor4f(0.3, 0.3, 1.0, 0.2);
-		gis_viewer_center_position(self->viewer, lat, lon, elev);
+		gis_viewer_center_position(env->viewer, lat, lon, elev);
 
 		glBegin(GL_TRIANGLE_FAN);
 		glVertex3f(0, 0, 0);
@@ -81,19 +78,23 @@ static gpointer expose(GisCallback *callback, gpointer _self)
 GisPluginEnv *gis_plugin_env_new(GisViewer *viewer, GisPrefs *prefs)
 {
 	g_debug("GisPluginEnv: new");
-	GisPluginEnv *self = g_object_new(GIS_TYPE_PLUGIN_ENV, NULL);
-	self->viewer = viewer;
+	GisPluginEnv *env = g_object_new(GIS_TYPE_PLUGIN_ENV, NULL);
+	env->viewer = g_object_ref(viewer);
 
-	/* Load blank background texture */
-	glGenTextures(1, &self->tex);
-	self->background = gis_tile_new(NULL, NORTH, SOUTH, EAST, WEST);
-	self->background->data = &self->tex;
+	/* Create objects */
+	GisCallback *callback   = gis_callback_new(expose, env);
+	GisTile     *background = gis_tile_new(NULL, NORTH, SOUTH, EAST, WEST);
+	glGenTextures(1, &env->tex);
+	background->data = &env->tex;
 
 	/* Add renderers */
-	GisCallback *callback = gis_callback_new(expose, self);
-	gis_viewer_add(viewer, GIS_OBJECT(callback), GIS_LEVEL_BACKGROUND, 0);
+	gpointer ref1, ref2;
+	ref1 = gis_viewer_add(viewer, GIS_OBJECT(callback),   GIS_LEVEL_BACKGROUND, FALSE);
+	ref2 = gis_viewer_add(viewer, GIS_OBJECT(background), GIS_LEVEL_BACKGROUND, FALSE);
+	env->refs = g_list_prepend(env->refs, ref1);
+	env->refs = g_list_prepend(env->refs, ref2);
 
-	return self;
+	return env;
 }
 
 
@@ -111,7 +112,7 @@ static void gis_plugin_env_plugin_init(GisPluginInterface *iface)
 	/* Add methods to the interface */
 }
 /* Class/Object init */
-static void gis_plugin_env_init(GisPluginEnv *self)
+static void gis_plugin_env_init(GisPluginEnv *env)
 {
 	g_debug("GisPluginEnv: init");
 	/* Set defaults */
@@ -119,13 +120,21 @@ static void gis_plugin_env_init(GisPluginEnv *self)
 static void gis_plugin_env_dispose(GObject *gobject)
 {
 	g_debug("GisPluginEnv: dispose");
-	GisPluginEnv *self = GIS_PLUGIN_ENV(gobject);
+	GisPluginEnv *env = GIS_PLUGIN_ENV(gobject);
 	/* Drop references */
+	if (env->viewer) {
+		for (GList *cur = env->refs; cur; cur = cur->next)
+			gis_viewer_remove(env->viewer, cur->data);
+		g_list_free(env->refs);
+		g_object_unref(env->viewer);
+		glDeleteTextures(1, &env->tex);
+		env->viewer = NULL;
+	}
 	G_OBJECT_CLASS(gis_plugin_env_parent_class)->dispose(gobject);
 }
 static void gis_plugin_env_class_init(GisPluginEnvClass *klass)
 {
 	g_debug("GisPluginEnv: class_init");
 	GObjectClass *gobject_class = (GObjectClass*)klass;
-	gobject_class->dispose  = gis_plugin_env_dispose;
+	gobject_class->dispose = gis_plugin_env_dispose;
 }