projects
/
xscreensaver
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
http://www.tienza.es/crux/src/www.jwz.org/xscreensaver/xscreensaver-5.04.tar.gz
[xscreensaver]
/
hacks
/
glx
/
voronoi.c
diff --git
a/hacks/glx/voronoi.c
b/hacks/glx/voronoi.c
index c59e6ba81bfd01e0ebf9d52430598bebe4b31f6f..9680182931677a960a7694199c126f35e122f121 100644
(file)
--- a/
hacks/glx/voronoi.c
+++ b/
hacks/glx/voronoi.c
@@
-26,12
+26,12
@@
#ifdef USE_GL /* whole file */
#ifdef USE_GL /* whole file */
-#define DEF_POINTS "
10
"
+#define DEF_POINTS "
25
"
#define DEF_POINT_SIZE "9"
#define DEF_POINT_SPEED "1"
#define DEF_POINT_SIZE "9"
#define DEF_POINT_SPEED "1"
-#define DEF_POINT_DELAY "0.
1
"
+#define DEF_POINT_DELAY "0.
05
"
#define DEF_ZOOM_SPEED "1"
#define DEF_ZOOM_SPEED "1"
-#define DEF_ZOOM_DELAY "1
0
"
+#define DEF_ZOOM_DELAY "1
5
"
typedef struct node {
GLfloat x, y;
typedef struct node {
GLfloat x, y;
@@
-275,6
+275,7
@@
draw_cells (ModeInfo *mi)
glColor4fv (nn->color2);
glVertex2f (nn->x, nn->y);
glEnd();
glColor4fv (nn->color2);
glVertex2f (nn->x, nn->y);
glEnd();
+ mi->polygon_count++;
}
}
else
}
}
else
@@
-304,6
+305,7
@@
draw_cells (ModeInfo *mi)
glVertex2f ( 0.2, 0);
glEnd ();
glRotatef (360.0/5, 0, 0, 1);
glVertex2f ( 0.2, 0);
glEnd ();
glRotatef (360.0/5, 0, 0, 1);
+ mi->polygon_count++;
}
glPopMatrix();
}
}
glPopMatrix();
}
@@
-464,17
+466,11
@@
init_voronoi (ModeInfo *mi)
if (point_size < 0) point_size = 10;
if (point_size < 0) point_size = 10;
- vp->ncolors =
64
;
+ vp->ncolors =
128
;
vp->colors = (XColor *) calloc (vp->ncolors, sizeof(XColor));
vp->colors = (XColor *) calloc (vp->ncolors, sizeof(XColor));
-#if 0
- make_random_colormap (0, 0, 0,
- vp->colors, &vp->ncolors,
- True, False, 0, False);
-#else
make_smooth_colormap (0, 0, 0,
vp->colors, &vp->ncolors,
False, False, False);
make_smooth_colormap (0, 0, 0,
vp->colors, &vp->ncolors,
False, False, False);
-#endif
reshape_voronoi (mi, MI_WIDTH(mi), MI_HEIGHT(mi));
reshape_voronoi (mi, MI_WIDTH(mi), MI_HEIGHT(mi));
@@
-496,10
+492,10
@@
draw_voronoi (ModeInfo *mi)
glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *(vp->glx_context));
glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *(vp->glx_context));
- glShadeModel(GL_
SMOOTH
);
+ glShadeModel(GL_
FLAT
);
glEnable(GL_POINT_SMOOTH);
glEnable(GL_POINT_SMOOTH);
- glEnable(GL_LINE_SMOOTH);
- glEnable(GL_POLYGON_SMOOTH);
+/* glEnable(GL_LINE_SMOOTH);*/
+/* glEnable(GL_POLYGON_SMOOTH);*/
glEnable (GL_DEPTH_TEST);
glDepthFunc (GL_LEQUAL);
glEnable (GL_DEPTH_TEST);
glDepthFunc (GL_LEQUAL);