projects
/
xscreensaver
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 ee244ea5c137b38fe7bdd95d488ef9258c2cb090..13b8399b6674684812aabc0ae5b4f17d5a027dcd 100644
(file)
--- a/
hacks/glx/atunnel.c
+++ b/
hacks/glx/atunnel.c
@@
-196,7
+196,7
@@
static void Init(ModeInfo * mi)
LoadTexture(mi, texture5,5);
glEnable(GL_TEXTURE_2D);
}
LoadTexture(mi, texture5,5);
glEnable(GL_TEXTURE_2D);
}
- sa->ts = InitTunnel();
+ sa->ts =
atunnel_
InitTunnel();
/* Set lighting parameters */
if (do_light)
/* Set lighting parameters */
if (do_light)
@@
-212,6
+212,11
@@
static void Init(ModeInfo * mi)
glEnable(GL_LIGHTING);
}
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);
if (do_wire) {
glDisable(GL_NORMALIZE);
glDisable(GL_CULL_FACE);
@@
-270,8
+275,8
@@
ENTRYPOINT void draw_atunnel(ModeInfo * mi)
glLoadIdentity();
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 */
glFlush();
/* manage framerate display */