From http://www.jwz.org/xscreensaver/xscreensaver-5.20.tar.gz

[xscreensaver] / hacks / glx / atunnel.c

diff --git a/hacks/glx/atunnel.c b/hacks/glx/atunnel.c
index baea0ef85e885c12c88dee670d1a87bcded3b25e..13b8399b6674684812aabc0ae5b4f17d5a027dcd 100644 (file)
--- a/hacks/glx/atunnel.c
+++ b/hacks/glx/atunnel.c
@@ -185,7 +185,6 @@ static void Init(ModeInfo * mi)
        GLfloat light_position[] = {0.0, 0.0, 1.0, 0.0};
        GLfloat fogColor[4] = {0.8, 0.8, 0.8, 1.0};
 
-       glClearColor(0, 0, 0, 0);
        if (do_texture)
        {
                glGenTextures(MAX_TEXTURE, sa->texture);
@@ -197,7 +196,7 @@ static void Init(ModeInfo * mi)
                LoadTexture(mi, texture5,5);
                glEnable(GL_TEXTURE_2D);
        }
-       sa->ts = InitTunnel();
+       sa->ts = atunnel_InitTunnel();
        
        /* Set lighting parameters */
        if (do_light)
@@ -213,6 +212,11 @@ static void Init(ModeInfo * mi)
        
                glEnable(GL_LIGHTING);
        }
+
+# ifdef HAVE_JWZGLES /* #### glPolygonMode other than GL_FILL unimplemented */
+    do_wire = 0;
+# endif
+
        if (do_wire) {
                glDisable(GL_NORMALIZE);
                glDisable(GL_CULL_FACE);
@@ -271,8 +275,8 @@ ENTRYPOINT void draw_atunnel(ModeInfo * mi)
 
        glLoadIdentity();
 
-       DrawTunnel(sa->ts, do_texture, do_light, sa->texture);
-       SplashScreen(sa->ts, do_wire, do_texture, do_light);
+       atunnel_DrawTunnel(sa->ts, do_texture, do_light, sa->texture);
+       atunnel_SplashScreen(sa->ts, do_wire, do_texture, do_light);
 
        glFlush();  
        /* manage framerate display */