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.35.tar.gz
[xscreensaver]
/
hacks
/
glx
/
atunnel.c
diff --git
a/hacks/glx/atunnel.c
b/hacks/glx/atunnel.c
index baea0ef85e885c12c88dee670d1a87bcded3b25e..ea43b9bf87151ded310f282935d40bcb96fe0149 100644
(file)
--- a/
hacks/glx/atunnel.c
+++ b/
hacks/glx/atunnel.c
@@
-41,6
+41,7
@@
static const char sccsid[] = "@(#)atunnel.c 5.13 2004/05/25 xlockmore";
#ifdef STANDALONE /* xscreensaver mode */
#define DEFAULTS "*delay: 10000 \n" \
"*showFPS: False \n" \
#ifdef STANDALONE /* xscreensaver mode */
#define DEFAULTS "*delay: 10000 \n" \
"*showFPS: False \n" \
+ "*suppressRotationAnimation: True\n" \
# define refresh_atunnel 0
# define atunnel_handle_event 0
# define refresh_atunnel 0
# define atunnel_handle_event 0
@@
-185,7
+186,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};
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);
if (do_texture)
{
glGenTextures(MAX_TEXTURE, sa->texture);
@@
-197,7
+197,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)
@@
-213,6
+213,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);
@@
-271,8
+276,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 */