http://www.jwz.org/xscreensaver/xscreensaver-5.07.tar.gz

[xscreensaver] / hacks / glx / klein.c

diff --git a/hacks/glx/klein.c b/hacks/glx/klein.c
index 2329170475568a7104434f532e86feb35a5a5f10..b90644da9f289e7f007ded0d4fc1a5e6ad42cc73 100644 (file)
--- a/hacks/glx/klein.c
+++ b/hacks/glx/klein.c
@@ -11,23 +11,10 @@
  */
 
 #ifdef STANDALONE
-# define PROGCLASS                                     "Klein"
-# define HACK_INIT                                     init_klein
-# define HACK_DRAW                                     draw_klein
-# define HACK_RESHAPE                          reshape_klein
-# define HACK_HANDLE_EVENT                     klein_handle_event
-# define EVENT_MASK                                    PointerMotionMask
-# define klein_opts                                    xlockmore_opts
-
-
-#define DEF_SPIN                               "True"
-#define DEF_WANDER                             "False"
-#define DEF_RANDOM                             "False"
-#define DEF_SPEED                              "150"
-
 # define DEFAULTS                                      "*delay:                20000   \n" \
                                                                        "*showFPS:      False   \n"
 
+# define refresh_klein 0
 # include "xlockmore.h"                /* from the xscreensaver distribution */
 #else  /* !STANDALONE */
 # include "xlock.h"                    /* from the xlockmore distribution */
@@ -35,7 +22,11 @@
 
 #ifdef USE_GL
 
-#include <GL/glu.h>
+#define DEF_SPIN                               "True"
+#define DEF_WANDER                             "False"
+#define DEF_RAND                               "True"
+#define DEF_SPEED                              "150"
+
 #include "rotator.h"
 #include "gltrackball.h"
 
@@ -87,14 +78,14 @@ static XrmOptionDescRec opts[] = {
 };
 
 static argtype vars[] = {
-  {&rand,      "rand",   "Random", DEF_RANDOM, t_Bool},
+  {&rand,      "rand",   "Random", DEF_RAND,   t_Bool},
   {&do_spin,   "spin",   "Spin",   DEF_SPIN,   t_Bool},
   {&do_wander, "wander", "Wander", DEF_WANDER, t_Bool},
   {&speed,     "speed",  "Speed",  DEF_SPEED,  t_Int},
 };
 
 
-ModeSpecOpt klein_opts = {countof(opts), opts, countof(vars), vars, NULL};
+ENTRYPOINT ModeSpecOpt klein_opts = {countof(opts), opts, countof(vars), vars, NULL};
 
 
 
@@ -117,6 +108,8 @@ typedef struct {
        float du, dv;
        float a, b, c;
 
+    float draw_step;
+
 } kleinstruct;
 
 static kleinstruct *klein = NULL;
@@ -126,10 +119,10 @@ static void
 draw(ModeInfo *mi)
 {
        kleinstruct *kp = &klein[MI_SCREEN(mi)];
-       static float step = 0.0;
        double u, v;
        float coord[3];
        
+    mi->polygon_count = 0;
        glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
        glEnable(GL_DEPTH_TEST);
@@ -167,6 +160,7 @@ draw(ModeInfo *mi)
                                coord[2] = sin(u/2)*sin(v) + cos(u/2)*sin(2*v)/2;
                                glColor3f(coord[0]+0.7, coord[1]+0.7, coord[2]+0.7);
                                glVertex3fv(coord);
+                mi->polygon_count++;
                        }
                }
                break;
@@ -178,6 +172,7 @@ draw(ModeInfo *mi)
                                        coord[2] = kp->a*(cos(v) + sin(tan((v/2))))+0.2*u;
                                        glColor3f(coord[0]+0.7, coord[1]+0.7, coord[2]+0.7);
                                        glVertex3fv(coord);
+                    mi->polygon_count++;
                                }
                        }
                        break;
@@ -189,6 +184,7 @@ draw(ModeInfo *mi)
                                        coord[2] = u*u-v*v;
                                        glColor3f(coord[0]+0.7, coord[1]+0.7, coord[2]+0.7);
                                        glVertex3fv(coord);
+                    mi->polygon_count++;
                                }
                        }
                        break;
@@ -201,6 +197,7 @@ draw(ModeInfo *mi)
 
                                        glColor3f(coord[0]+0.7, coord[1]+0.7, coord[2]+0.7);
                                        glVertex3fv(coord);
+                    mi->polygon_count++;
                                }
                        }
                        break;
@@ -212,6 +209,7 @@ draw(ModeInfo *mi)
                                        coord[2] = v*sin(u/2);
                                        glColor3f(coord[0]+0.7, coord[1]+0.7, coord[2]+0.7);
                                        glVertex3fv(coord);
+                    mi->polygon_count++;
                                }
                        }
                        break;
@@ -223,6 +221,7 @@ draw(ModeInfo *mi)
                                        coord[2] = sin(kp->b+=0.00001)*v/(2*M_PI)+kp->a*(1-v/(2*M_PI))*sin(u);
                                        glColor3f(coord[0]+0.7, coord[1]+0.7, coord[2]+0.7);
                                        glVertex3fv(coord);
+                    mi->polygon_count++;
                                }
                        }
                        break;
@@ -234,6 +233,7 @@ draw(ModeInfo *mi)
                                        coord[2] = u;
                                        glColor3f(coord[0]+0.7, coord[1]+0.7, coord[2]+0.7);
                                        glVertex3fv(coord);
+                    mi->polygon_count++;
                                }
                        }
                        break;
@@ -245,6 +245,7 @@ draw(ModeInfo *mi)
                                        coord[2] = sin(v);
                                        glColor3f(coord[0]+0.7, coord[1]+0.7, coord[2]+0.7);
                                        glVertex3fv(coord);
+                    mi->polygon_count++;
                                }
                        }
                        break;
@@ -256,6 +257,7 @@ draw(ModeInfo *mi)
                                        coord[2] = sin(u/2)*cos(v) + cos(u/2)*sin(v);
                                        glColor3f(coord[0]+0.7, coord[1]+0.7, coord[2]+0.7);
                                        glVertex3fv(coord);
+                    mi->polygon_count++;
                                }
                        }
                        break;
@@ -263,14 +265,16 @@ draw(ModeInfo *mi)
        glEnd();
        glPopMatrix();
 
+    if (kp->render == GL_LINES)
+      mi->polygon_count /= 2;
 
-       kp->a = sin(step+=0.01);
-       kp->b = cos(step+=0.01);
+       kp->a = sin(kp->draw_step+=0.01);
+       kp->b = cos(kp->draw_step+=0.01);
 }
 
 
 /* new window size or exposure */
-void
+ENTRYPOINT void
 reshape_klein(ModeInfo *mi, int width, int height)
 {
        GLfloat h = (GLfloat) height / (GLfloat) width;
@@ -290,7 +294,7 @@ reshape_klein(ModeInfo *mi, int width, int height)
 }
 
 
-Bool
+ENTRYPOINT Bool
 klein_handle_event (ModeInfo *mi, XEvent *event)
 {
        kleinstruct *kp = &klein[MI_SCREEN(mi)];
@@ -304,7 +308,9 @@ klein_handle_event (ModeInfo *mi, XEvent *event)
                        return True;
        } else if (event->xany.type == ButtonPress &&
                (event->xbutton.button == Button4 ||
-                event->xbutton.button == Button5)) {
+                event->xbutton.button == Button5 ||
+                event->xbutton.button == Button6 ||
+                event->xbutton.button == Button7)) {
       gltrackball_mousewheel (kp->trackball, event->xbutton.button, 10,
                               !!event->xbutton.state);
       return True;
@@ -317,7 +323,7 @@ klein_handle_event (ModeInfo *mi, XEvent *event)
 }
 
 
-void
+ENTRYPOINT void
 init_klein(ModeInfo *mi)
 {
        int      screen = MI_SCREEN(mi);
@@ -374,7 +380,7 @@ init_klein(ModeInfo *mi)
        }
 }
 
-void
+ENTRYPOINT void
 draw_klein(ModeInfo * mi)
 {
        kleinstruct *kp = &klein[MI_SCREEN(mi)];
@@ -392,7 +398,7 @@ draw_klein(ModeInfo * mi)
        glXSwapBuffers(display, window);
 }
 
-void
+ENTRYPOINT void
 release_klein(ModeInfo * mi)
 {
        if (klein != NULL) {
@@ -413,6 +419,8 @@ release_klein(ModeInfo * mi)
 }
 
 
+XSCREENSAVER_MODULE ("Klein", klein)
+
 /*********************************************************/
 
 #endif