X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=hacks%2Fglx%2Fmoebius.c;h=9052f4bcc6c3e83ff08af3e20484ae960bd5ad5e;hp=a265334da55ec2a7a716c7f02bf73919b89a4598;hb=ffd8c0873576a9e3065696a624dce6b766b77062;hpb=df053bcb240bd8d82e3bebf48a9766a8728bca4b diff --git a/hacks/glx/moebius.c b/hacks/glx/moebius.c index a265334d..9052f4bc 100644 --- a/hacks/glx/moebius.c +++ b/hacks/glx/moebius.c @@ -1,13 +1,10 @@ /* -*- Mode: C; tab-width: 4 -*- */ /* moebius --- Moebius Strip II, an Escher-like GL scene with ants. */ -#if !defined( lint ) && !defined( SABER ) -static const char sccsid[] = "@(#)moebius.c 4.08 97/01/04 xlockmore"; - +#if 0 +static const char sccsid[] = "@(#)moebius.c 5.01 2001/03/01 xlockmore"; #endif -#undef DEBUG_LISTS - /*- * Permission to use, copy, modify, and distribute this software and its * documentation for any purpose and without fee is hereby granted, @@ -22,48 +19,50 @@ static const char sccsid[] = "@(#)moebius.c 4.08 97/01/04 xlockmore"; * other special, indirect and consequential damages. * * The RotateAroundU() routine was adapted from the book - * "Computer Graphics Principles and Practice + * "Computer Graphics Principles and Practice * Foley - vanDam - Feiner - Hughes * Second Edition" Pag. 227, exercise 5.15. - * + * * This mode shows some interesting scenes that are impossible OR very * wierd to build in the real universe. Much of the scenes are inspirated * on Mauritz Cornelis Escher's works which derivated the mode's name. * M.C. Escher (1898-1972) was a dutch artist and many people prefer to * say he was a mathematician. * - * Thanks goes to Brian Paul for making it possible and inexpensive to use + * Thanks goes to Brian Paul for making it possible and inexpensive to use * OpenGL at home. * * Since I'm not a native English speaker, my apologies for any grammatical - * mistake. + * mistakes. * - * My e-mail addresses are - * vianna@cat.cbpf.br - * and - * m-vianna@usa.net + * My e-mail address is + * mfvianna@centroin.com.br * * Marcelo F. Vianna (Jun-01-1997) * * Revision History: - * 01-Jan-98: Mode separated from escher and renamed - * 08-Jun-97: New scene implemented: "Impossible Cage" based in a M.C. Escher's - * painting with the same name (quite similar). The first GL mode - * to use texture mapping. - * The "Impossible Cage" scene doesn't use DEPTH BUFFER, the - * wood planks are drawn consistently using GL_CULL_FACE, and - * the painter's algorithm is used to sort the planks. - * Marcelo F. Vianna. - * 07-Jun-97: Speed ups in Moebius Strip using GL_CULL_FACE. - * Marcelo F. Vianna. - * 03-Jun-97: Initial Release (Only one scene: "Moebius Strip") - * The Moebius Strip scene was inspirated in a M.C. Escher's - * painting named Moebius Strip II in wich ants walk across a - * Moebius Strip path, sometimes meeting each other and sometimes - * being in "opposite faces" (note that the moebius strip has - * only one face and one edge). - * Marcelo F. Vianna. - * + * 05-Apr-2002: Removed all gllist uses (fix some bug with nvidia driver) + * 01-Mar-2001: backported from xscreensaver by lassauge@mail.dotcom.fr + * Feb-2001: Made motion and rotation be smoother Jamie Zawinski + * + * 01-Nov-2000: Allocation checks + * 01-Jan-1998: Mode separated from escher and renamed + * 08-Jun-1997: New scene implemented: "Impossible Cage" based in a M.C. + * Escher's painting with the same name (quite similar). The + * first GL mode to use texture mapping. + * The "Impossible Cage" scene doesn't use DEPTH BUFFER, the + * wood planks are drawn consistently using GL_CULL_FACE, and + * the painter's algorithm is used to sort the planks. + * Marcelo F. Vianna. + * 07-Jun-1997: Speed ups in Moebius Strip using GL_CULL_FACE. + * Marcelo F. Vianna. + * 03-Jun-1997: Initial Release (Only one scene: "Moebius Strip") + * The Moebius Strip scene was inspirated in a M.C. Escher's + * painting named Moebius Strip II in wich ants walk across a + * Moebius Strip path, sometimes meeting each other and sometimes + * being in "opposite faces" (note that the moebius strip has + * only one face and one edge). + * Marcelo F. Vianna. */ /*- @@ -78,15 +77,21 @@ static const char sccsid[] = "@(#)moebius.c 4.08 97/01/04 xlockmore"; * In real OpenGL, PseudoColor DO NOT support texture map (as far as I know). */ +#ifdef VMS #include +#endif #ifdef STANDALONE +# define MODE_moebius # define PROGCLASS "Moebius" # define HACK_INIT init_moebius # define HACK_DRAW draw_moebius -# define moebius_opts xlockmore_opts -# define DEFAULTS "*cycles: 1 \n" \ - "*delay: 1000 \n" \ +# define HACK_RESHAPE reshape_moebius +# define HACK_HANDLE_EVENT moebius_handle_event +# define EVENT_MASK PointerMotionMask +# define moebius_opts xlockmore_opts +# define DEFAULTS "*delay: 20000 \n" \ + "*showFPS: False \n" \ "*wireframe: False \n" # include "xlockmore.h" /* from the xscreensaver distribution */ #else /* !STANDALONE */ @@ -94,11 +99,13 @@ static const char sccsid[] = "@(#)moebius.c 4.08 97/01/04 xlockmore"; #endif /* !STANDALONE */ -#ifdef USE_GL +#ifdef MODE_moebius #include #include "e_textures.h" +#include "rotator.h" +#include "gltrackball.h" #define DEF_SOLIDMOEBIUS "False" #define DEF_NOANTS "False" @@ -108,15 +115,16 @@ static int noants; static XrmOptionDescRec opts[] = { - {"-solidmoebius", ".moebius.solidmoebius", XrmoptionNoArg, (caddr_t) "on"}, - {"+solidmoebius", ".moebius.solidmoebius", XrmoptionNoArg, (caddr_t) "off"}, - {"-noants", ".moebius.noants", XrmoptionNoArg, (caddr_t) "on"}, - {"+noants", ".moebius.noants", XrmoptionNoArg, (caddr_t) "off"} + {"-solidmoebius", ".moebius.solidmoebius", XrmoptionNoArg, "on"}, + {"+solidmoebius", ".moebius.solidmoebius", XrmoptionNoArg, "off"}, + {"-noants", ".moebius.noants", XrmoptionNoArg, "on"}, + {"+noants", ".moebius.noants", XrmoptionNoArg, "off"} }; static argtype vars[] = { - {(caddr_t *) & solidmoebius, "solidmoebius", "Solidmoebius", DEF_SOLIDMOEBIUS, t_Bool}, - {(caddr_t *) & noants, "noants", "Noants", DEF_NOANTS, t_Bool} + {&solidmoebius, "solidmoebius", "Solidmoebius", DEF_SOLIDMOEBIUS, t_Bool}, + {&noants, "noants", "Noants", DEF_NOANTS, t_Bool} + }; static OptionStruct desc[] = { @@ -130,7 +138,7 @@ ModeSpecOpt moebius_opts = #ifdef USE_MODULES ModStruct moebius_description = {"moebius", "init_moebius", "draw_moebius", "release_moebius", - "draw_moebius", "change_moebius", NULL, &moebius_opts, + "draw_moebius", "change_moebius", (char *) NULL, &moebius_opts, 1000, 1, 1, 1, 4, 1.0, "", "Shows Moebius Strip II, an Escher-like GL scene with ants", 0, NULL}; @@ -145,14 +153,20 @@ ModStruct moebius_description = #define Pi M_PI #endif +#define ObjMoebiusStrip 0 +#define ObjAntBody 1 +#define MaxObj 2 + /*************************************************************************/ typedef struct { GLint WindH, WindW; GLfloat step; GLfloat ant_position; - int AreObjectsDefined[2]; GLXContext *glx_context; + rotator *rot; + trackball_state *trackball; + Bool button_down_p; } moebiusstruct; static float front_shininess[] = @@ -195,37 +209,37 @@ static float MaterialGray6[] = static float MaterialGray8[] = {0.8, 0.8, 0.8, 1.0}; -static moebiusstruct *moebius = NULL; -static GLuint objects; +static moebiusstruct *moebius = (moebiusstruct *) NULL; #define NUM_SCENES 2 -#define ObjMoebiusStrip 0 -#define ObjAntBody 1 - -static void +static Bool mySphere(float radius) { GLUquadricObj *quadObj; - quadObj = gluNewQuadric(); + if ((quadObj = gluNewQuadric()) == 0) + return False; gluQuadricDrawStyle(quadObj, (GLenum) GLU_FILL); gluSphere(quadObj, radius, 16, 16); gluDeleteQuadric(quadObj); + return True; } -static void +static Bool myCone(float radius) { GLUquadricObj *quadObj; - quadObj = gluNewQuadric(); + if ((quadObj = gluNewQuadric()) == 0) + return False; gluQuadricDrawStyle(quadObj, (GLenum) GLU_FILL); gluCylinder(quadObj, radius, 0, radius * 3, 8, 1); gluDeleteQuadric(quadObj); + return True; } -static void +static Bool draw_moebius_ant(moebiusstruct * mp, float *Material, int mono) { static float ant_step = 0; @@ -240,42 +254,34 @@ draw_moebius_ant(moebiusstruct * mp, float *Material, int mono) glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, MaterialGray5); else glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, Material); - if (!mp->AreObjectsDefined[ObjAntBody]) { - glNewList(objects + ObjAntBody, GL_COMPILE_AND_EXECUTE); - glEnable(GL_CULL_FACE); - glPushMatrix(); - glScalef(1, 1.3, 1); - mySphere(0.18); - glScalef(1, 1 / 1.3, 1); - glTranslatef(0.00, 0.30, 0.00); - mySphere(0.2); - - glTranslatef(-0.05, 0.17, 0.05); - glRotatef(-90, 1, 0, 0); - glRotatef(-25, 0, 1, 0); - myCone(0.05); - glTranslatef(0.00, 0.10, 0.00); - myCone(0.05); - glRotatef(25, 0, 1, 0); - glRotatef(90, 1, 0, 0); - - glScalef(1, 1.3, 1); - glTranslatef(0.15, -0.65, 0.05); - mySphere(0.25); - glScalef(1, 1 / 1.3, 1); - glPopMatrix(); - glDisable(GL_CULL_FACE); - glEndList(); - mp->AreObjectsDefined[ObjAntBody] = 1; -#ifdef DEBUG_LISTS - (void) printf("Ant drawn SLOWLY\n"); -#endif - } else { - glCallList(objects + ObjAntBody); -#ifdef DEBUG_LISTS - (void) printf("Ant drawn quickly\n"); -#endif - } + glEnable(GL_CULL_FACE); + glPushMatrix(); + glScalef(1, 1.3, 1); + if (!mySphere(0.18)) + return False; + glScalef(1, 1 / 1.3, 1); + glTranslatef(0.00, 0.30, 0.00); + if (!mySphere(0.2)) + return False; + + glTranslatef(-0.05, 0.17, 0.05); + glRotatef(-90, 1, 0, 0); + glRotatef(-25, 0, 1, 0); + if (!myCone(0.05)) + return False; + glTranslatef(0.00, 0.10, 0.00); + if (!myCone(0.05)) + return False; + glRotatef(25, 0, 1, 0); + glRotatef(90, 1, 0, 0); + + glScalef(1, 1.3, 1); + glTranslatef(0.15, -0.65, 0.05); + if (!mySphere(0.25)) + return False; + glScalef(1, 1 / 1.3, 1); + glPopMatrix(); + glDisable(GL_CULL_FACE); glDisable(GL_LIGHTING); /* ANTENNAS */ @@ -392,6 +398,7 @@ draw_moebius_ant(moebiusstruct * mp, float *Material, int mono) glEnable(GL_LIGHTING); ant_step += 0.3; + return True; } static void @@ -417,7 +424,7 @@ RotateAaroundU(float Ax, float Ay, float Az, #define MoebiusDivisions 40 #define MoebiusTransversals 4 -static void +static Bool draw_moebius_strip(ModeInfo * mi) { GLfloat Phi, Theta; @@ -428,10 +435,35 @@ draw_moebius_strip(ModeInfo * mi) float Cx, Cy, Cz; - if (!mp->AreObjectsDefined[ObjMoebiusStrip]) { - glNewList(objects + ObjMoebiusStrip, GL_COMPILE_AND_EXECUTE); - - if (solidmoebius) { + if (solidmoebius) { + glBegin(GL_QUAD_STRIP); + Phi = 0; + i = 0; + while (i < (MoebiusDivisions * 2 + 1)) { + Theta = Phi / 2; + cPhi = cos(Phi); + sPhi = sin(Phi); + + i++; + if (mono) + glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, MaterialWhite); + else if (i % 2) + glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, MaterialRed); + else + glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, MaterialGray); + + RotateAaroundU(cPhi, sPhi, 0, -sPhi, cPhi, 0, &Cx, &Cy, &Cz, Theta); + glNormal3f(Cx, Cy, Cz); + RotateAaroundU(0, 0, 1, -sPhi, cPhi, 0, &Cx, &Cy, &Cz, Theta); + glVertex3f(cPhi * 3 + Cx, sPhi * 3 + Cy, +Cz); + glVertex3f(cPhi * 3 - Cx, sPhi * 3 - Cy, -Cz); + + Phi += Pi / MoebiusDivisions; + } + glEnd(); + } else { + for (j = -MoebiusTransversals; j < MoebiusTransversals; j++) { + glPolygonMode(GL_FRONT_AND_BACK, GL_LINE); glBegin(GL_QUAD_STRIP); Phi = 0; i = 0; @@ -440,72 +472,32 @@ draw_moebius_strip(ModeInfo * mi) cPhi = cos(Phi); sPhi = sin(Phi); - i++; - if (mono) + RotateAaroundU(cPhi, sPhi, 0, -sPhi, cPhi, 0, &Cx, &Cy, &Cz, Theta); + glNormal3f(Cx, Cy, Cz); + RotateAaroundU(0, 0, 1, -sPhi, cPhi, 0, &Cx, &Cy, &Cz, Theta); + j++; + if (j == MoebiusTransversals || mono) glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, MaterialWhite); else if (i % 2) glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, MaterialRed); else glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, MaterialGray); - - RotateAaroundU(cPhi, sPhi, 0, -sPhi, cPhi, 0, &Cx, &Cy, &Cz, Theta); - glNormal3f(Cx, Cy, Cz); - RotateAaroundU(0, 0, 1, -sPhi, cPhi, 0, &Cx, &Cy, &Cz, Theta); - glVertex3f(cPhi * 3 + Cx, sPhi * 3 + Cy, +Cz); - glVertex3f(cPhi * 3 - Cx, sPhi * 3 - Cy, -Cz); + glVertex3f(cPhi * 3 + Cx / MoebiusTransversals * j, sPhi * 3 + Cy / MoebiusTransversals * j, +Cz / MoebiusTransversals * j); + j--; + if (j == -MoebiusTransversals || mono) + glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, MaterialWhite); + else if (i % 2) + glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, MaterialRed); + else + glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, MaterialGray); + glVertex3f(cPhi * 3 + Cx / MoebiusTransversals * j, sPhi * 3 + Cy / MoebiusTransversals * j, +Cz / MoebiusTransversals * j); Phi += Pi / MoebiusDivisions; + i++; } glEnd(); - } else { - for (j = -MoebiusTransversals; j < MoebiusTransversals; j++) { - glPolygonMode(GL_FRONT_AND_BACK, GL_LINE); - glBegin(GL_QUAD_STRIP); - Phi = 0; - i = 0; - while (i < (MoebiusDivisions * 2 + 1)) { - Theta = Phi / 2; - cPhi = cos(Phi); - sPhi = sin(Phi); - - RotateAaroundU(cPhi, sPhi, 0, -sPhi, cPhi, 0, &Cx, &Cy, &Cz, Theta); - glNormal3f(Cx, Cy, Cz); - RotateAaroundU(0, 0, 1, -sPhi, cPhi, 0, &Cx, &Cy, &Cz, Theta); - j++; - if (j == MoebiusTransversals || mono) - glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, MaterialWhite); - else if (i % 2) - glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, MaterialRed); - else - glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, MaterialGray); - glVertex3f(cPhi * 3 + Cx / MoebiusTransversals * j, sPhi * 3 + Cy / MoebiusTransversals * j, +Cz / MoebiusTransversals * j); - j--; - if (j == -MoebiusTransversals || mono) - glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, MaterialWhite); - else if (i % 2) - glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, MaterialRed); - else - glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, MaterialGray); - glVertex3f(cPhi * 3 + Cx / MoebiusTransversals * j, sPhi * 3 + Cy / MoebiusTransversals * j, +Cz / MoebiusTransversals * j); - - Phi += Pi / MoebiusDivisions; - i++; - } - glEnd(); - } - glPolygonMode(GL_FRONT_AND_BACK, GL_FILL); } - - glEndList(); - mp->AreObjectsDefined[ObjMoebiusStrip] = 1; -#ifdef DEBUG_LISTS - (void) printf("Strip drawn SLOWLY\n"); -#endif - } else { - glCallList(objects + ObjMoebiusStrip); -#ifdef DEBUG_LISTS - (void) printf("Strip drawn quickly\n"); -#endif + glPolygonMode(GL_FRONT_AND_BACK, GL_FILL); } if (!noants) { @@ -515,7 +507,8 @@ draw_moebius_strip(ModeInfo * mi) glTranslatef(3, 0, 0); glRotatef(mp->ant_position / 2 + 90, 0, 1, 0); glTranslatef(0.28, 0, -0.45); - draw_moebius_ant(mp, MaterialYellow, mono); + if (!draw_moebius_ant(mp, MaterialYellow, mono)) + return False; glPopMatrix(); /* DRAW YELLOW ANT */ @@ -524,7 +517,8 @@ draw_moebius_strip(ModeInfo * mi) glTranslatef(3, 0, 0); glRotatef(mp->ant_position / 2, 0, 1, 0); glTranslatef(0.28, 0, -0.45); - draw_moebius_ant(mp, MaterialBlue, mono); + if (!draw_moebius_ant(mp, MaterialBlue, mono)) + return False; glPopMatrix(); /* DRAW GREEN ANT */ @@ -534,7 +528,8 @@ draw_moebius_strip(ModeInfo * mi) glRotatef(-mp->ant_position / 2, 0, 1, 0); glTranslatef(0.28, 0, 0.45); glRotatef(180, 1, 0, 0); - draw_moebius_ant(mp, MaterialGreen, mono); + if (!draw_moebius_ant(mp, MaterialGreen, mono)) + return False; glPopMatrix(); /* DRAW CYAN ANT */ @@ -544,16 +539,18 @@ draw_moebius_strip(ModeInfo * mi) glRotatef(-mp->ant_position / 2 + 90, 0, 1, 0); glTranslatef(0.28, 0, 0.45); glRotatef(180, 1, 0, 0); - draw_moebius_ant(mp, MaterialCyan, mono); + if (!draw_moebius_ant(mp, MaterialCyan, mono)) + return False; glPopMatrix(); } mp->ant_position += 1; + return True; } #undef MoebiusDivisions #undef MoebiusTransversals -static void -reshape(ModeInfo * mi, int width, int height) +void +reshape_moebius(ModeInfo * mi, int width, int height) { moebiusstruct *mp = &moebius[MI_SCREEN(mi)]; @@ -572,13 +569,12 @@ reshape(ModeInfo * mi, int width, int height) glLineWidth(1); glPointSize(1); } - mp->AreObjectsDefined[ObjMoebiusStrip] = 0; - mp->AreObjectsDefined[ObjAntBody] = 0; } static void pinit(void) { + int status; glClearDepth(1.0); glClearColor(0.0, 0.0, 0.0, 1.0); @@ -604,8 +600,21 @@ pinit(void) glDisable(GL_CULL_FACE); glPixelStorei(GL_UNPACK_ALIGNMENT, 1); - gluBuild2DMipmaps(GL_TEXTURE_2D, 3, WoodTextureWidth, WoodTextureHeight, - GL_RGB, GL_UNSIGNED_BYTE, WoodTextureData); + + clear_gl_error(); + status = gluBuild2DMipmaps(GL_TEXTURE_2D, 3, + WoodTextureWidth, WoodTextureHeight, + GL_RGB, GL_UNSIGNED_BYTE, WoodTextureData); + if (status) + { + const char *s = (char *) gluErrorString (status); + fprintf (stderr, "%s: error mipmapping %dx%d texture: %s\n", + progname, WoodTextureWidth, WoodTextureHeight, + (s ? s : "(unknown)")); + exit (1); + } + check_gl_error("mipmapping"); + glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT); glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT); @@ -616,10 +625,54 @@ pinit(void) glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, front_specular); } + + +void +release_moebius(ModeInfo * mi) +{ + if (moebius != NULL) { + (void) free((void *) moebius); + moebius = (moebiusstruct *) NULL; + } + FreeAllGL(mi); +} + +Bool +moebius_handle_event (ModeInfo *mi, XEvent *event) +{ + moebiusstruct *mp = &moebius[MI_SCREEN(mi)]; + + if (event->xany.type == ButtonPress && + event->xbutton.button & Button1) + { + mp->button_down_p = True; + gltrackball_start (mp->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) + { + mp->button_down_p = False; + return True; + } + else if (event->xany.type == MotionNotify && + mp->button_down_p) + { + gltrackball_track (mp->trackball, + event->xmotion.x, event->xmotion.y, + MI_WIDTH (mi), MI_HEIGHT (mi)); + return True; + } + + return False; +} + + void init_moebius(ModeInfo * mi) { - int screen = MI_SCREEN(mi); moebiusstruct *mp; if (moebius == NULL) { @@ -627,16 +680,20 @@ init_moebius(ModeInfo * mi) sizeof (moebiusstruct))) == NULL) return; } - mp = &moebius[screen]; + mp = &moebius[MI_SCREEN(mi)]; mp->step = NRAND(90); mp->ant_position = NRAND(90); + { + double rot_speed = 0.3; + mp->rot = make_rotator (rot_speed, rot_speed, rot_speed, 1, 0, True); + mp->trackball = gltrackball_init (); + } + if ((mp->glx_context = init_GL(mi)) != NULL) { - reshape(mi, MI_WIDTH(mi), MI_HEIGHT(mi)); + reshape_moebius(mi, MI_WIDTH(mi), MI_HEIGHT(mi)); glDrawBuffer(GL_BACK); - if (!glIsList(objects)) - objects = glGenLists(3); pinit(); } else { MI_CLEARWINDOW(mi); @@ -646,11 +703,17 @@ init_moebius(ModeInfo * mi) void draw_moebius(ModeInfo * mi) { - moebiusstruct *mp = &moebius[MI_SCREEN(mi)]; + moebiusstruct *mp; Display *display = MI_DISPLAY(mi); Window window = MI_WINDOW(mi); + if (moebius == NULL) + return; + mp = &moebius[MI_SCREEN(mi)]; + + MI_IS_DRAWN(mi) = True; + if (!mp->glx_context) return; @@ -662,20 +725,31 @@ draw_moebius(ModeInfo * mi) glTranslatef(0.0, 0.0, -10.0); + gltrackball_rotate (mp->trackball); + if (!MI_IS_ICONIC(mi)) { glScalef(Scale4Window * mp->WindH / mp->WindW, Scale4Window, Scale4Window); } else { glScalef(Scale4Iconic * mp->WindH / mp->WindW, Scale4Iconic, Scale4Iconic); } + { + double x, y, z; + get_rotation (mp->rot, &x, &y, &z, !mp->button_down_p); + glRotatef (x * 360, 1.0, 0.0, 0.0); + glRotatef (y * 360, 0.0, 1.0, 0.0); + glRotatef (z * 360, 0.0, 0.0, 1.0); + } + /* moebius */ - glRotatef(mp->step * 100, 1, 0, 0); - glRotatef(mp->step * 95, 0, 1, 0); - glRotatef(mp->step * 90, 0, 0, 1); - draw_moebius_strip(mi); + if (!draw_moebius_strip(mi)) { + release_moebius(mi); + return; + } glPopMatrix(); + if (MI_IS_FPS(mi)) do_fps (mi); glFlush(); glXSwapBuffers(display, window); @@ -695,17 +769,4 @@ change_moebius(ModeInfo * mi) pinit(); } -void -release_moebius(ModeInfo * mi) -{ - if (moebius != NULL) { - (void) free((void *) moebius); - moebius = NULL; - } - if (glIsList(objects)) { - glDeleteLists(objects, 3); - } - FreeAllGL(mi); -} - #endif