X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Fplugins%2Fenv.c;h=a22ad0b03f2aea586f0a9be5c3574ec41f11c886;hb=07448c519e963bae1cfde4f1ff353478dd28136c;hp=4c25fc24ad9e8d1a4b71f6db474a23677f4f85cc;hpb=f93aa6df36b91a106bd9be7e8dd60b83b0f6a0cb;p=grits
diff --git a/src/plugins/env.c b/src/plugins/env.c
index 4c25fc2..a22ad0b 100644
--- a/src/plugins/env.c
+++ b/src/plugins/env.c
@@ -15,83 +15,100 @@
* along with this program. If not, see .
*/
+/**
+ * SECTION:env
+ * @short_description: Environment plugin
+ *
+ * #GritsPluginEnv 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
-#include
#include
-#include
+#include
#include "env.h"
/***********
* Helpers *
***********/
-static gpointer expose(GisCallback *callback, gpointer _self)
+static void expose(GritsCallback *callback, GritsOpenGL *opengl, gpointer _env)
{
- GisPluginEnv *self = GIS_PLUGIN_ENV(_self);
- g_debug("GisPluginEnv: expose");
+ GritsPluginEnv *env = GRITS_PLUGIN_ENV(_env);
+ g_debug("GritsPluginEnv: expose");
gdouble lat, lon, elev;
- gis_viewer_get_location(self->viewer, &lat, &lon, &elev);
+ grits_viewer_get_location(env->viewer, &lat, &lon, &elev);
/* Misc */
- gdouble rg = MAX(0, 1-(elev/20000));
- gdouble blue = MAX(0, 1-(elev/50000));
- glClearColor(MIN(0.65,rg), MIN(0.65,rg), MIN(1,blue), 1.0f);
+ gdouble rg = MAX(0, 1-(elev/40000));
+ gdouble blue = MAX(0, 1-(elev/100000));
+ glClearColor(MIN(0.4,rg), MIN(0.4,rg), MIN(1,blue), 1.0f);
glClear(GL_COLOR_BUFFER_BIT);
/* Attempt to render an atmosphere */
- /*
glEnable(GL_COLOR_MATERIAL);
glDisable(GL_CULL_FACE);
glDisable(GL_LIGHTING);
+ glMatrixMode(GL_MODELVIEW);
+ glBlendFunc(GL_SRC_ALPHA, GL_DST_ALPHA);
+ grits_viewer_center_position(env->viewer, lat, lon, -EARTH_R);
- glBlendFunc(GL_ONE, GL_ONE);
+ gdouble ds = EARTH_R+elev; // distance to self
+ gdouble da = EARTH_R+300000; // distance to top of atmosphere
+ gdouble dg = EARTH_R-100000; // distance to top of atmosphere
+ gdouble ang = acos(EARTH_R/ds); // angle to horizon
+ ang = MAX(ang,0.1);
- glMatrixMode(GL_MODELVIEW);
+ gdouble ar = sin(ang)*da; // top of quad fan "atomosphere"j
+ gdouble az = cos(ang)*da; //
- elev = -EARTH_R;
- 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);
-
- glBegin(GL_TRIANGLE_FAN);
- glVertex3f(0, 0, 0);
- for (gdouble i = 0; i <= 2*G_PI; i += G_PI/10) {
- gint rad = 1*EARTH_R + 300000;
- glVertex3f(rad*sin(i), rad*cos(i), 0);
- g_message("%f %f %f", 3*EARTH_R*sin(i), 3*EARTH_R*cos(i), 0.);
- }
- glEnd();
- glPopMatrix();
- }
- */
+ gdouble gr = sin(ang)*dg; // bottom of quad fan "ground"
+ gdouble gz = cos(ang)*dg; //
- return NULL;
+ glBegin(GL_QUAD_STRIP);
+ for (gdouble i = 0; i <= 2*G_PI; i += G_PI/30) {
+ glColor4f(0.3, 0.3, 1.0, 1.0); glVertex3f(gr*sin(i), gr*cos(i), gz);
+ glColor4f(0.3, 0.3, 1.0, 0.0); glVertex3f(ar*sin(i), ar*cos(i), az);
+ }
+ glEnd();
}
/***********
* Methods *
***********/
-GisPluginEnv *gis_plugin_env_new(GisViewer *viewer, GisPrefs *prefs)
+/**
+ * grits_plugin_env_new:
+ * @viewer: the #GritsViewer to use for drawing
+ * @prefs: the #GritsPrefs for storing configurations
+ *
+ * Create a new instance of the environment plugin.
+ *
+ * Returns: the new #GritsPluginEnv
+ */
+GritsPluginEnv *grits_plugin_env_new(GritsViewer *viewer, GritsPrefs *prefs)
{
- g_debug("GisPluginEnv: new");
- GisPluginEnv *self = g_object_new(GIS_TYPE_PLUGIN_ENV, NULL);
- self->viewer = viewer;
+ g_debug("GritsPluginEnv: new");
+ GritsPluginEnv *env = g_object_new(GRITS_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 */
+ GritsCallback *callback = grits_callback_new(expose, env);
+ GritsTile *background = grits_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);
- gis_viewer_add(viewer, GIS_OBJECT(self->background), GIS_LEVEL_BACKGROUND, 0);
+ gpointer ref1, ref2;
+ ref1 = grits_viewer_add(viewer, GRITS_OBJECT(callback), GRITS_LEVEL_BACKGROUND, FALSE);
+ ref2 = grits_viewer_add(viewer, GRITS_OBJECT(background), GRITS_LEVEL_BACKGROUND, FALSE);
+ env->refs = g_list_prepend(env->refs, ref1);
+ env->refs = g_list_prepend(env->refs, ref2);
- return self;
+ return env;
}
@@ -99,31 +116,39 @@ GisPluginEnv *gis_plugin_env_new(GisViewer *viewer, GisPrefs *prefs)
* GObject code *
****************/
/* Plugin init */
-static void gis_plugin_env_plugin_init(GisPluginInterface *iface);
-G_DEFINE_TYPE_WITH_CODE(GisPluginEnv, gis_plugin_env, G_TYPE_OBJECT,
- G_IMPLEMENT_INTERFACE(GIS_TYPE_PLUGIN,
- gis_plugin_env_plugin_init));
-static void gis_plugin_env_plugin_init(GisPluginInterface *iface)
+static void grits_plugin_env_plugin_init(GritsPluginInterface *iface);
+G_DEFINE_TYPE_WITH_CODE(GritsPluginEnv, grits_plugin_env, G_TYPE_OBJECT,
+ G_IMPLEMENT_INTERFACE(GRITS_TYPE_PLUGIN,
+ grits_plugin_env_plugin_init));
+static void grits_plugin_env_plugin_init(GritsPluginInterface *iface)
{
- g_debug("GisPluginEnv: plugin_init");
+ g_debug("GritsPluginEnv: plugin_init");
/* Add methods to the interface */
}
/* Class/Object init */
-static void gis_plugin_env_init(GisPluginEnv *self)
+static void grits_plugin_env_init(GritsPluginEnv *env)
{
- g_debug("GisPluginEnv: init");
+ g_debug("GritsPluginEnv: init");
/* Set defaults */
}
-static void gis_plugin_env_dispose(GObject *gobject)
+static void grits_plugin_env_dispose(GObject *gobject)
{
- g_debug("GisPluginEnv: dispose");
- GisPluginEnv *self = GIS_PLUGIN_ENV(gobject);
+ g_debug("GritsPluginEnv: dispose");
+ GritsPluginEnv *env = GRITS_PLUGIN_ENV(gobject);
/* Drop references */
- G_OBJECT_CLASS(gis_plugin_env_parent_class)->dispose(gobject);
+ if (env->viewer) {
+ for (GList *cur = env->refs; cur; cur = cur->next)
+ grits_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(grits_plugin_env_parent_class)->dispose(gobject);
}
-static void gis_plugin_env_class_init(GisPluginEnvClass *klass)
+static void grits_plugin_env_class_init(GritsPluginEnvClass *klass)
{
- g_debug("GisPluginEnv: class_init");
+ g_debug("GritsPluginEnv: class_init");
GObjectClass *gobject_class = (GObjectClass*)klass;
- gobject_class->dispose = gis_plugin_env_dispose;
+ gobject_class->dispose = grits_plugin_env_dispose;
}