*/
-/*-
- * due to a Bug/feature in VMS X11/Intrinsic.h has to be placed before xlock.
- * otherwise caddr_t is not defined correctly
- */
-
-#include <X11/Intrinsic.h>
-
#ifdef STANDALONE
-# define PROGCLASS "Planet"
-# define HACK_INIT init_planet
-# define HACK_DRAW draw_planet
-# define HACK_RESHAPE reshape_planet
-# define planet_opts xlockmore_opts
-#define DEFAULTS "*delay: 15000 \n" \
+#define DEFAULTS "*delay: 20000 \n" \
"*showFPS: False \n" \
- "*rotate: True \n" \
- "*roll: True \n" \
- "*wander: True \n" \
"*wireframe: False \n" \
- "*light: True \n" \
- "*texture: True \n" \
- "*stars: True \n" \
- "*image: BUILTIN \n" \
"*imageForeground: Green \n" \
"*imageBackground: Blue \n"
-
+# define refresh_planet 0
# include "xlockmore.h" /* from the xscreensaver distribution */
#else /* !STANDALONE */
# include "xlock.h" /* from the xlockmore distribution */
# endif /* VMS */
#endif
-
-#include <GL/glu.h>
-
#define DEF_ROTATE "True"
#define DEF_ROLL "True"
#define DEF_WANDER "True"
+#define DEF_SPIN "0.03"
#define DEF_TEXTURE "True"
#define DEF_STARS "True"
#define DEF_LIGHT "True"
+#define DEF_RESOLUTION "128"
#define DEF_IMAGE "BUILTIN"
#undef countof
static int do_stars;
static int do_light;
static char *which_image;
+static int resolution;
+static float star_spin;
+
static XrmOptionDescRec opts[] = {
- {"-rotate", ".glplanet.rotate", XrmoptionNoArg, (caddr_t) "true" },
- {"+rotate", ".glplanet.rotate", XrmoptionNoArg, (caddr_t) "false" },
- {"-roll", ".glplanet.roll", XrmoptionNoArg, (caddr_t) "true" },
- {"+roll", ".glplanet.roll", XrmoptionNoArg, (caddr_t) "false" },
- {"-wander", ".glplanet.wander", XrmoptionNoArg, (caddr_t) "true" },
- {"+wander", ".glplanet.wander", XrmoptionNoArg, (caddr_t) "false" },
- {"-texture", ".glplanet.texture", XrmoptionNoArg, (caddr_t) "true" },
- {"+texture", ".glplanet.texture", XrmoptionNoArg, (caddr_t) "false" },
- {"-stars", ".glplanet.stars", XrmoptionNoArg, (caddr_t) "true" },
- {"+stars", ".glplanet.stars", XrmoptionNoArg, (caddr_t) "false" },
- {"-light", ".glplanet.light", XrmoptionNoArg, (caddr_t) "true" },
- {"+light", ".glplanet.light", XrmoptionNoArg, (caddr_t) "false" },
- {"-image", ".glplanet.image", XrmoptionSepArg, (caddr_t) 0 },
+ {"-rotate", ".glplanet.rotate", XrmoptionNoArg, "true" },
+ {"+rotate", ".glplanet.rotate", XrmoptionNoArg, "false" },
+ {"-roll", ".glplanet.roll", XrmoptionNoArg, "true" },
+ {"+roll", ".glplanet.roll", XrmoptionNoArg, "false" },
+ {"-wander", ".glplanet.wander", XrmoptionNoArg, "true" },
+ {"+wander", ".glplanet.wander", XrmoptionNoArg, "false" },
+ {"-texture", ".glplanet.texture", XrmoptionNoArg, "true" },
+ {"+texture", ".glplanet.texture", XrmoptionNoArg, "false" },
+ {"-stars", ".glplanet.stars", XrmoptionNoArg, "true" },
+ {"+stars", ".glplanet.stars", XrmoptionNoArg, "false" },
+ {"-spin", ".glplanet.spin", XrmoptionSepArg, 0 },
+ {"-light", ".glplanet.light", XrmoptionNoArg, "true" },
+ {"+light", ".glplanet.light", XrmoptionNoArg, "false" },
+ {"-image", ".glplanet.image", XrmoptionSepArg, 0 },
+ {"-resolution", ".glplanet.resolution", XrmoptionSepArg, 0 },
};
static argtype vars[] = {
- {(caddr_t *) &do_rotate, "rotate", "Rotate", DEF_ROTATE, t_Bool},
- {(caddr_t *) &do_roll, "roll", "Roll", DEF_ROLL, t_Bool},
- {(caddr_t *) &do_wander, "wander", "Wander", DEF_WANDER, t_Bool},
- {(caddr_t *) &do_texture, "texture", "Texture", DEF_TEXTURE, t_Bool},
- {(caddr_t *) &do_stars, "stars", "Stars", DEF_STARS, t_Bool},
- {(caddr_t *) &do_light, "light", "Light", DEF_LIGHT, t_Bool},
- {(caddr_t *) &which_image, "image", "Image", DEF_IMAGE, t_String},
+ {&do_rotate, "rotate", "Rotate", DEF_ROTATE, t_Bool},
+ {&do_roll, "roll", "Roll", DEF_ROLL, t_Bool},
+ {&do_wander, "wander", "Wander", DEF_WANDER, t_Bool},
+ {&do_texture, "texture", "Texture", DEF_TEXTURE, t_Bool},
+ {&do_stars, "stars", "Stars", DEF_STARS, t_Bool},
+ {&do_light, "light", "Light", DEF_LIGHT, t_Bool},
+ {&which_image, "image", "Image", DEF_IMAGE, t_String},
+ {&resolution, "resolution","Resolution", DEF_RESOLUTION, t_Int},
+ {&star_spin, "spin", "Float", DEF_SPIN, t_Float},
};
-ModeSpecOpt planet_opts = {countof(opts), opts, countof(vars), vars, NULL};
+ENTRYPOINT ModeSpecOpt planet_opts = {countof(opts), opts, countof(vars), vars, NULL};
#ifdef USE_MODULES
ModStruct planet_description =
"Animates texture mapped sphere (planet)", 0, NULL};
#endif
+# ifdef __GNUC__
+ __extension__ /* don't warn about "string length is greater than the length
+ ISO C89 compilers are required to support" when including
+ the following XPM file... */
+# endif
#include "../images/earth.xpm"
+
#include "xpm-ximage.h"
+#include "rotator.h"
+#include "gltrackball.h"
/*-
*/
#define NUM_STARS 1000
-#define SLICES 32
-#define STACKS 32
/* radius of the sphere- fairly arbitrary */
#define RADIUS 4
/* structure for holding the planet data */
typedef struct {
GLuint platelist;
+ GLuint latlonglist;
GLuint starlist;
int screen_width, screen_height;
GLXContext *glx_context;
Window window;
-
XColor fg, bg;
-
- GLfloat tx, ty, tz;
- GLfloat dtx, dty, dtz;
- GLfloat xpos, ypos, zpos;
- GLfloat dx, dy, dz;
- GLfloat box_width, box_height, box_depth;
-
GLfloat sunpos[4];
-
+ double z;
+ rotator *rot;
+ trackball_state *trackball;
+ double star_theta;
+ Bool button_down_p;
} planetstruct;
static planetstruct *planets = NULL;
-static inline void
-normalize(GLfloat v[3])
-{
- GLfloat d = (GLfloat) sqrt((double) (v[0] * v[0] +
- v[1] * v[1] +
- v[2] * v[2]));
- if (d != 0)
- {
- v[0] /= d;
- v[1] /= d;
- v[2] /= d;
- }
- else
- {
- v[0] = v[1] = v[2] = 0;
- }
-}
-
-
/* Set up and enable texturing on our object */
static void
setup_xpm_texture (ModeInfo *mi, char **xpm_data)
{
XImage *image = xpm_to_ximage (MI_DISPLAY (mi), MI_VISUAL (mi),
MI_COLORMAP (mi), xpm_data);
+ char buf[1024];
clear_gl_error();
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA,
image->width, image->height, 0,
- GL_RGBA, GL_UNSIGNED_BYTE, image->data);
- check_gl_error("texture");
+ GL_RGBA,
+ /* GL_UNSIGNED_BYTE, */
+ GL_UNSIGNED_INT_8_8_8_8_REV,
+ image->data);
+ sprintf (buf, "builtin texture (%dx%d)", image->width, image->height);
+ check_gl_error(buf);
/* setup parameters for texturing */
glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
{
Display *dpy = mi->dpy;
Visual *visual = mi->xgwa.visual;
+ char buf[1024];
Colormap cmap = mi->xgwa.colormap;
XImage *image = xpm_file_to_ximage (dpy, visual, cmap, filename);
clear_gl_error();
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA,
image->width, image->height, 0,
- GL_RGBA, GL_UNSIGNED_BYTE, image->data);
- check_gl_error("texture");
+ GL_RGBA,
+ /* GL_UNSIGNED_BYTE, */
+ GL_UNSIGNED_INT_8_8_8_8_REV,
+ image->data);
+ sprintf (buf, "texture: %.100s (%dx%d)",
+ filename, image->width, image->height);
+ check_gl_error(buf);
/* setup parameters for texturing */
glPixelStorei(GL_UNPACK_ALIGNMENT, 4);
setup_file_texture (mi, which_image);
check_gl_error("texture initialization");
+
+ /* Need to flip the texture top for bottom for some reason. */
+ glMatrixMode (GL_TEXTURE);
+ glScalef (1, -1, 1);
+ glMatrixMode (GL_MODELVIEW);
}
-void
+static void
init_stars (ModeInfo *mi)
{
+ planetstruct *gp = &planets[MI_SCREEN(mi)];
int i, j;
- GLfloat max_size = 3;
- GLfloat inc = 0.5;
- int steps = max_size / inc;
int width = MI_WIDTH(mi);
int height = MI_HEIGHT(mi);
-
- planetstruct *gp = &planets[MI_SCREEN(mi)];
- Bool wire = MI_IS_WIREFRAME(mi);
-
- if (!wire)
- glEnable (GL_POINT_SMOOTH);
+ int size = (width > height ? width : height);
+ int nstars = size * size / 320;
+ int max_size = 3;
+ GLfloat inc = 0.5;
+ int steps = max_size / inc;
gp->starlist = glGenLists(1);
glNewList(gp->starlist, GL_COMPILE);
- glScalef (1.0/width, 1.0/height, 1);
+ glEnable(GL_POINT_SMOOTH);
for (j = 1; j <= steps; j++)
{
glPointSize(inc * j);
- glBegin(GL_POINTS);
- for (i = 0 ; i < NUM_STARS / steps; i++)
+ glBegin (GL_POINTS);
+ for (i = 0; i < nstars / steps; i++)
{
glColor3f (0.6 + frand(0.3),
0.6 + frand(0.3),
0.6 + frand(0.3));
- glVertex2f ((GLfloat) (random() % width),
- (GLfloat) (random() % height));
+ glVertex2f (2 * size * (0.5 - frand(1.0)),
+ 2 * size * (0.5 - frand(1.0)));
}
- glEnd();
+ glEnd ();
}
- glEndList();
+ glEndList ();
check_gl_error("stars initialization");
}
-void
-draw_stars (ModeInfo * mi)
+static void
+draw_stars (ModeInfo *mi)
{
- int width = MI_WIDTH(mi);
- int height = MI_HEIGHT(mi);
-
planetstruct *gp = &planets[MI_SCREEN(mi)];
- /* Sadly, this causes a stall of the graphics pipeline (as would the
- equivalent calls to glGet*.) But there's no way around this, short
- of having each caller set up the specific display matrix we need
- here, which would kind of defeat the purpose of centralizing this
- code in one file.
- */
- glPushAttrib(GL_TRANSFORM_BIT | /* for matrix contents */
- GL_ENABLE_BIT | /* for various glDisable calls */
- GL_CURRENT_BIT | /* for glColor3f() */
- GL_LIST_BIT); /* for glListBase() */
- {
- check_gl_error ("glPushAttrib");
-
- /* disable lighting and texturing when drawing stars!
- (glPopAttrib() restores these.)
- */
- glDisable(GL_TEXTURE_2D);
- glDisable(GL_LIGHTING);
- glDisable(GL_DEPTH_TEST);
-
- /* glPopAttrib() does not restore matrix changes, so we must
- push/pop the matrix stacks to be non-intrusive there.
- */
- glMatrixMode(GL_PROJECTION);
- glPushMatrix();
- {
- check_gl_error ("glPushMatrix");
- glLoadIdentity();
-
- /* Each matrix mode has its own stack, so we need to push/pop
- them separately. */
- glMatrixMode(GL_MODELVIEW);
- glPushMatrix();
- {
- check_gl_error ("glPushMatrix");
- glLoadIdentity();
+ glDisable(GL_TEXTURE_2D);
+ glDisable(GL_LIGHTING);
+ glDisable(GL_DEPTH_TEST);
- gluOrtho2D (0, width, 0, height);
- check_gl_error ("gluOrtho2D");
+ glMatrixMode (GL_PROJECTION);
+ glPushMatrix ();
+ {
+ glLoadIdentity ();
- /* Draw the stars */
- glScalef (width, height, 1);
- glCallList(gp->starlist);
- check_gl_error ("drawing stars");
- }
- glPopMatrix();
+ glMatrixMode (GL_MODELVIEW);
+ glPushMatrix ();
+ {
+ glLoadIdentity ();
+ glOrtho (-0.5 * MI_WIDTH(mi), 0.5 * MI_WIDTH(mi),
+ -0.5 * MI_HEIGHT(mi), 0.5 * MI_HEIGHT(mi),
+ -100.0, 100.0);
+ glRotatef (gp->star_theta, 0.0, 0.0, 1.0);
+ glCallList (gp->starlist);
}
- glMatrixMode(GL_PROJECTION);
- glPopMatrix();
-
+ glPopMatrix ();
}
- /* clean up after our state changes */
- glPopAttrib();
- check_gl_error ("glPopAttrib");
+ glMatrixMode (GL_PROJECTION);
+ glPopMatrix ();
+
+ glMatrixMode (GL_MODELVIEW);
}
{
planetstruct *gp = &planets[MI_SCREEN(mi)];
- GLfloat lamb[4] = { 0.0, 0.0, 0.0, 1.0 };
+ GLfloat lamb[4] = { 0.1, 0.1, 0.1, 1.0 };
GLfloat ldif[4] = { 1.0, 1.0, 1.0, 1.0 };
GLfloat spec[4] = { 1.0, 1.0, 1.0, 1.0 };
GLfloat mpec[4] = { 1.0, 1.0, 1.0, 1.0 };
GLfloat shiny = .4;
- gp->sunpos[0] = 1.00 - frand(2.00);
- gp->sunpos[1] = 0.25 - frand(0.50);
- gp->sunpos[2] = -1.00;
- gp->sunpos[3] = 0.00;
+ {
+ double h = 0.1 + frand(0.8); /* east-west position - screen-side. */
+ double v = -0.3 + frand(0.6); /* north-south position */
+
+ if (h > 0.3 && h < 0.8) /* avoid having the sun at the camera */
+ h += (h > 0.5 ? 0.2 : -0.2);
+
+ gp->sunpos[0] = cos(h * M_PI);
+ gp->sunpos[1] = sin(h * M_PI);
+ gp->sunpos[2] = sin(v * M_PI);
+ gp->sunpos[3] = 0.00;
+ }
glEnable(GL_LIGHTING);
glEnable(GL_LIGHT0);
glLightfv (GL_LIGHT0, GL_DIFFUSE, ldif);
glLightfv (GL_LIGHT0, GL_SPECULAR, spec);
+ check_gl_error("sun");
glMaterialfv (GL_FRONT, GL_AMBIENT, mamb);
glMaterialfv (GL_FRONT, GL_DIFFUSE, mdif);
glMaterialfv (GL_FRONT, GL_SPECULAR, mpec);
glMaterialf (GL_FRONT, GL_SHININESS, shiny);
- glEnable(GL_BLEND);
- glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+/* glEnable(GL_BLEND);*/
+/* glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);*/
glShadeModel(GL_SMOOTH);
check_gl_error("lighting");
#define RANDSIGN() ((random() & 1) ? 1 : -1)
-static void
-pick_velocity (ModeInfo * mi)
-{
- planetstruct *gp = &planets[MI_SCREEN(mi)];
-
- gp->box_width = 15.0;
- gp->box_height = 15.0;
- gp->box_depth = 5.0;
-
- gp->tx = 0.0;
- gp->ty = 0.0;
- gp->tz = frand(360);
-
- gp->dtx = (frand(0.4) + frand(0.3)) * RANDSIGN();
- gp->dty = (frand(0.4) + frand(0.3)) * RANDSIGN();
- gp->dtz = (frand(5.0) + frand(5.0)); /* the sun sets in the west */
-
- gp->dx = (frand(0.2) + frand(0.2)) * RANDSIGN();
- gp->dy = (frand(0.2) + frand(0.2)) * RANDSIGN();
- gp->dz = (frand(0.2) + frand(0.2)) * RANDSIGN();
-}
-
-
-static void
-rotate_and_move (ModeInfo * mi)
-{
- planetstruct *gp = &planets[MI_SCREEN(mi)];
-
- if (do_roll)
- {
- gp->tx += gp->dtx;
- while (gp->tx < 0) gp->tx += 360;
- while (gp->tx > 360) gp->tx -= 360;
-
- gp->ty += gp->dty;
- while (gp->ty < 0) gp->ty += 360;
- while (gp->ty > 360) gp->ty -= 360;
- }
-
- if (do_rotate)
- {
- gp->tz += gp->dtz;
- while (gp->tz < 0) gp->tz += 360;
- while (gp->tz > 360) gp->tz -= 360;
- }
-
- if (do_wander)
- {
- static int frame = 0;
-# define SINOID(SCALE,SIZE) \
- ((((1 + sin((frame * (SCALE)) / 2 * M_PI)) / 2.0) * (SIZE)) - (SIZE)/2)
- gp->xpos = SINOID(0.031, gp->box_width);
- gp->ypos = SINOID(0.023, gp->box_height);
- gp->zpos = SINOID(0.017, gp->box_depth);
- frame++;
- }
-}
-
-
-void
+ENTRYPOINT void
reshape_planet (ModeInfo *mi, int width, int height)
{
GLfloat h = (GLfloat) height / (GLfloat) width;
}
-void
+ENTRYPOINT Bool
+planet_handle_event (ModeInfo *mi, XEvent *event)
+{
+ planetstruct *gp = &planets[MI_SCREEN(mi)];
+
+ if (event->xany.type == ButtonPress &&
+ event->xbutton.button == Button1)
+ {
+ gp->button_down_p = True;
+ gltrackball_start (gp->trackball,
+ event->xbutton.x, event->xbutton.y,
+ MI_WIDTH (mi), MI_HEIGHT (mi));
+ return True;
+ }
+ else if (event->xany.type == ButtonRelease &&
+ event->xbutton.button == Button1)
+ {
+ gp->button_down_p = False;
+ return True;
+ }
+ else if (event->xany.type == ButtonPress &&
+ (event->xbutton.button == Button4 ||
+ event->xbutton.button == Button5 ||
+ event->xbutton.button == Button6 ||
+ event->xbutton.button == Button7))
+ {
+ gltrackball_mousewheel (gp->trackball, event->xbutton.button, 10,
+ !!event->xbutton.state);
+ return True;
+ }
+ else if (event->xany.type == MotionNotify &&
+ gp->button_down_p)
+ {
+ gltrackball_track (gp->trackball,
+ event->xmotion.x, event->xmotion.y,
+ MI_WIDTH (mi), MI_HEIGHT (mi));
+ return True;
+ }
+
+ return False;
+}
+
+
+ENTRYPOINT void
init_planet (ModeInfo * mi)
{
planetstruct *gp;
}
gp = &planets[screen];
- pick_velocity (mi);
-
if ((gp->glx_context = init_GL(mi)) != NULL) {
reshape_planet(mi, MI_WIDTH(mi), MI_HEIGHT(mi));
}
{
- char *f = get_string_resource("imageForeground", "Foreground");
- char *b = get_string_resource("imageBackground", "Background");
+ char *f = get_string_resource(mi->dpy, "imageForeground", "Foreground");
+ char *b = get_string_resource(mi->dpy, "imageBackground", "Background");
char *s;
if (!f) f = strdup("white");
if (!b) b = strdup("black");
free (b);
}
+ {
+ double spin_speed = 0.5;
+ double wander_speed = 0.02;
+ gp->rot = make_rotator (do_roll ? spin_speed : 0,
+ do_roll ? spin_speed : 0,
+ 0, 1,
+ do_wander ? wander_speed : 0,
+ True);
+ gp->z = frand (1.0);
+ gp->trackball = gltrackball_init ();
+ }
+
if (wire)
{
do_texture = False;
do_light = False;
- glEnable (GL_LINE_SMOOTH);
}
if (do_texture)
if (do_stars)
init_stars (mi);
- glEnable(GL_DEPTH_TEST);
- glEnable(GL_CULL_FACE);
- glCullFace(GL_BACK);
+ if (random() & 1)
+ star_spin = -star_spin;
+ /* construct the polygons of the planet
+ */
gp->platelist = glGenLists(1);
glNewList (gp->platelist, GL_COMPILE);
glColor3f (1,1,1);
glPushMatrix ();
glScalef (RADIUS, RADIUS, RADIUS);
- unit_sphere (STACKS, SLICES, wire);
+ glRotatef (90, 1, 0, 0);
+ glFrontFace(GL_CCW);
+ unit_sphere (resolution, resolution, wire);
+ glPopMatrix ();
+ glEndList();
+
+ /* construct the polygons of the latitude/longitude/axis lines.
+ */
+ gp->latlonglist = glGenLists(1);
+ glNewList (gp->latlonglist, GL_COMPILE);
+ glPushMatrix ();
+ glDisable (GL_TEXTURE_2D);
+ glDisable (GL_LIGHTING);
+ glDisable (GL_LINE_SMOOTH);
+ glColor3f (0.1, 0.3, 0.1);
+ glScalef (RADIUS, RADIUS, RADIUS);
+ glScalef (1.01, 1.01, 1.01);
+ glRotatef (90, 1, 0, 0);
+ unit_sphere (12, 24, 1);
+ glBegin(GL_LINES);
+ glVertex3f(0, -2, 0);
+ glVertex3f(0, 2, 0);
+ glEnd();
glPopMatrix ();
glEndList();
}
-void
+ENTRYPOINT void
draw_planet (ModeInfo * mi)
{
planetstruct *gp = &planets[MI_SCREEN(mi)];
Display *display = MI_DISPLAY(mi);
Window window = MI_WINDOW(mi);
+ double x, y, z;
if (!gp->glx_context)
return;
glXMakeCurrent (display, window, *(gp->glx_context));
+ mi->polygon_count = 0;
+
if (do_stars)
- draw_stars (mi);
+ {
+ draw_stars (mi);
+ mi->polygon_count += NUM_STARS;
+ }
+
+ if (do_light) glEnable(GL_LIGHTING);
+ if (do_texture) glEnable(GL_TEXTURE_2D);
+
+ glEnable (GL_LINE_SMOOTH);
+ glEnable(GL_DEPTH_TEST);
+ glEnable(GL_CULL_FACE);
+ glCullFace(GL_BACK);
glPushMatrix();
+
+ get_position (gp->rot, &x, &y, &z, !gp->button_down_p);
+ glTranslatef((x - 0.5) * 15,
+ (y - 0.5) * 15,
+ (z - 0.5) * 8);
+
+ /* Do it twice because we don't track the device's orientation. */
+ glRotatef( current_device_rotation(), 0, 0, 1);
+ gltrackball_rotate (gp->trackball);
+ glRotatef(-current_device_rotation(), 0, 0, 1);
+
glRotatef (90,1,0,0);
- glTranslatef (gp->xpos, gp->ypos, gp->zpos);
- glRotatef (gp->tx, 1, 0, 0);
- glRotatef (gp->ty, 0, 1, 0);
- glRotatef (gp->tz, 0, 0, 1);
+ if (do_roll)
+ {
+ get_rotation (gp->rot, &x, &y, 0, !gp->button_down_p);
+ glRotatef (x * 360, 1.0, 0.0, 0.0);
+ glRotatef (y * 360, 0.0, 1.0, 0.0);
+ }
glLightfv (GL_LIGHT0, GL_POSITION, gp->sunpos);
+ glRotatef (gp->z * 360, 0.0, 0.0, 1.0);
+ if (do_rotate && !gp->button_down_p)
+ {
+ gp->z -= 0.005; /* the sun sets in the west */
+ if (gp->z < 0) gp->z += 1;
+ }
+
glCallList (gp->platelist);
+ mi->polygon_count += resolution*resolution;
+
+ if (gp->button_down_p)
+ {
+ glCallList (gp->latlonglist);
+ mi->polygon_count += 24*24;
+ }
glPopMatrix();
if (mi->fps_p) do_fps (mi);
glFinish();
glXSwapBuffers(display, window);
- rotate_and_move (mi);
+ gp->star_theta += star_spin;
}
-void
+ENTRYPOINT void
release_planet (ModeInfo * mi)
{
if (planets != NULL) {
if (gp->glx_context) {
/* Display lists MUST be freed while their glXContext is current. */
- glXMakeCurrent(MI_DISPLAY(mi), gp->window, *(gp->glx_context));
+ /* but this gets a BadMatch error. -jwz */
+ /*glXMakeCurrent(MI_DISPLAY(mi), gp->window, *(gp->glx_context));*/
if (glIsList(gp->platelist))
glDeleteLists(gp->platelist, 1);
}
-#endif
+XSCREENSAVER_MODULE_2 ("GLPlanet", glplanet, planet)
+#endif