projects
/
xscreensaver
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
http://packetstormsecurity.org/UNIX/admin/xscreensaver-4.14.tar.gz
[xscreensaver]
/
hacks
/
glx
/
superquadrics.c
diff --git
a/hacks/glx/superquadrics.c
b/hacks/glx/superquadrics.c
index cfc2999a56d7a8938ba9f125423063e9636e8e0f..f274741b5557ef854a0ef1f3ebd6eca5b5006667 100644
(file)
--- a/
hacks/glx/superquadrics.c
+++ b/
hacks/glx/superquadrics.c
@@
-1,9
+1,8
@@
/* -*- Mode: C; tab-width: 4 -*- */
/* superquadrics --- 3D mathematical shapes */
/* -*- Mode: C; tab-width: 4 -*- */
/* superquadrics --- 3D mathematical shapes */
-#if
!defined( lint ) && !defined( SABER )
+#if
0
static const char sccsid[] = "@(#)superquadrics.c 4.07 97/11/24 xlockmore";
static const char sccsid[] = "@(#)superquadrics.c 4.07 97/11/24 xlockmore";
-
#endif
/*-
#endif
/*-
@@
-83,9
+82,10
@@
static const char sccsid[] = "@(#)superquadrics.c 4.07 97/11/24 xlockmore";
# define HACK_INIT init_superquadrics
# define HACK_DRAW draw_superquadrics
# define superquadrics_opts xlockmore_opts
# define HACK_INIT init_superquadrics
# define HACK_DRAW draw_superquadrics
# define superquadrics_opts xlockmore_opts
-# define DEFAULTS "*delay:
100
\n" \
+# define DEFAULTS "*delay:
40000
\n" \
"*count: 25 \n" \
"*cycles: 40 \n" \
"*count: 25 \n" \
"*cycles: 40 \n" \
+ "*showFPS: False \n" \
"*wireframe: False \n"
# include "xlockmore.h" /* from the xscreensaver distribution */
#else /* !STANDALONE */
"*wireframe: False \n"
# include "xlockmore.h" /* from the xscreensaver distribution */
#else /* !STANDALONE */
@@
-752,6
+752,7
@@
draw_superquadrics(ModeInfo * mi)
NextSuperquadricDisplay(sp);
NextSuperquadricDisplay(sp);
+ if (mi->fps_p) do_fps (mi);
glFinish();
glXSwapBuffers(display, window);
}
glFinish();
glXSwapBuffers(display, window);
}