X-Git-Url: http://pileus.org/git/?p=grits;a=blobdiff_plain;f=src%2Fplugins%2Fenv.c;h=1a0110c49a24def9c56d040d6daa937fda2b7ca9;hp=7deea1fee3e08db85bb36a5d2d23b1cade99e42c;hb=72643f9bd6c87e08670eb1a0aad2da5573b99774;hpb=b92087ed5280da4c84ea927a73a8d7bb461e7d47

diff --git a/src/plugins/env.c b/src/plugins/env.c
index 7deea1f..1a0110c 100644
--- a/src/plugins/env.c
+++ b/src/plugins/env.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009 Andy Spencer <spenceal@rose-hulman.edu>
+ * Copyright (C) 2009-2010 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
@@ -15,24 +15,33 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+/**
+ * SECTION:env
+ * @short_description: Environment plugin
+ *
+ * #GisPluginEnv provides environmental information such as sky images. It can
+ * also paint a blank overlay on the surface so that other plugins can draw
+ * transparent overlays nicely.
+ */
+
 #include <math.h>
 #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 void expose(GisCallback *callback, GisOpenGL *opengl, 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));
@@ -54,7 +63,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);
@@ -67,25 +76,41 @@ static gpointer expose(GisCallback *callback, gpointer _self)
 		glPopMatrix();
 	}
 	*/
-
-	return NULL;
 }
 
 
 /***********
  * Methods *
  ***********/
+/**
+ * gis_plugin_env_new:
+ * @viewer: the #GisViewer to use for drawing
+ * @prefs:  the #GisPrefs for storing configurations
+ *
+ * Create a new instance of the environment plugin.
+ *
+ * Returns: the new #GisPluginEnv
+ */
 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);
+
+	/* 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;
 }
 
 
@@ -103,7 +128,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 */
@@ -111,13 +136,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;
 }