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

[xscreensaver] / hacks / glx / tunnel_draw.c

diff --git a/hacks/glx/tunnel_draw.c b/hacks/glx/tunnel_draw.c
index 333161bb5d50ef3e71187288f6783efebfb78627..8a87c7673d5bc142b764802b3adc920595020a0f 100644 (file)
--- a/hacks/glx/tunnel_draw.c
+++ b/hacks/glx/tunnel_draw.c
@@ -45,11 +45,15 @@ static const char sccsid[] = "@(#)tunnel_draw.c     5.13 2004/05/25 xlockmore";
 #include <math.h>
 
 #ifdef STANDALONE
-# ifndef HAVE_COCOA
+# ifndef HAVE_JWXYZ
 #  include <GL/gl.h>
 #  include <GL/glu.h>
 # endif
 #endif
+#ifdef HAVE_ANDROID
+#include <GLES/gl.h>
+#endif
+
 
 #include "tunnel_draw.h"
 
@@ -240,7 +244,7 @@ atunnel_DrawTunnel(struct tunnel_state *st,
                 int do_texture, int do_light, GLuint *textures)
 {
        tnPath *p, *p1, *cmpos;
-       cvPoint op, p4[4], T, ppp, ppp1, op1, op2;
+       cvPoint op, p4[4], T, ppp, op1, op2;
        float t;
        int i, j, k, flag;
        cvPoint points[10];
@@ -387,10 +391,6 @@ atunnel_DrawTunnel(struct tunnel_state *st,
                        
                cvCatmullRom(p4, t, &op1);
 
-               ppp1.x = op1.x;
-               ppp1.y = op1.y;
-               ppp1.z = op1.z + 0.25;
-
                T.x = op1.x - op.x;
                T.y = op1.y - op.y;
                T.z = op1.z - op.z;