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
/
hypertorus.c
diff --git
a/hacks/glx/hypertorus.c
b/hacks/glx/hypertorus.c
index f957f5d28249154fff4d16334ce135cb01731972..908f612e266a8002114d52aeb95ee4420acf7ff7 100644
(file)
--- a/
hacks/glx/hypertorus.c
+++ b/
hacks/glx/hypertorus.c
@@
-631,16
+631,12
@@
static void init(ModeInfo *mi)
glMatrixMode(GL_MODELVIEW);
glLoadIdentity();
glMatrixMode(GL_MODELVIEW);
glLoadIdentity();
+# ifdef HAVE_JWZGLES /* #### glPolygonMode other than GL_FILL unimplemented */
if (display_mode == DISP_WIREFRAME)
if (display_mode == DISP_WIREFRAME)
- {
- glDisable(GL_DEPTH_TEST);
- glShadeModel(GL_FLAT);
- glPolygonMode(GL_FRONT_AND_BACK,GL_LINE);
- glDisable(GL_LIGHTING);
- glDisable(GL_LIGHT0);
- glDisable(GL_BLEND);
- }
- else if (display_mode == DISP_SURFACE)
+ display_mode = DISP_SURFACE;
+# endif
+
+ if (display_mode == DISP_SURFACE)
{
glEnable(GL_DEPTH_TEST);
glDepthFunc(GL_LESS);
{
glEnable(GL_DEPTH_TEST);
glDepthFunc(GL_LESS);
@@
-676,7
+672,7
@@
static void init(ModeInfo *mi)
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA,GL_ONE);
}
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA,GL_ONE);
}
- else
+ else
/* display_mode == DISP_WIREFRAME */
{
glDisable(GL_DEPTH_TEST);
glShadeModel(GL_FLAT);
{
glDisable(GL_DEPTH_TEST);
glShadeModel(GL_FLAT);