projects
/
xscreensaver
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ftp://ftp.linux.ncsu.edu/mirror/ftp.redhat.com/pub/redhat/linux/enterprise/4/en/os...
[xscreensaver]
/
hacks
/
glx
/
superquadrics.c
diff --git
a/hacks/glx/superquadrics.c
b/hacks/glx/superquadrics.c
index 55d7122e99e9918effe42c1481c4ccd79334c69f..a566589cd3a2fba8539b4208e70cc5117192b01f 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
/*-
@@
-71,13
+70,6
@@
static const char sccsid[] = "@(#)superquadrics.c 4.07 97/11/24 xlockmore";
* Ed Mackey
*/
* Ed Mackey
*/
-/*-
- * due to a Bug/feature in VMS X11/Intrinsic.h has to be placed before xlock.
- * otherwise caddr_t is not defined correctly
- */
-
-#include <X11/Intrinsic.h>
-
#ifdef STANDALONE
# define PROGCLASS "Superquadrics"
# define HACK_INIT init_superquadrics
#ifdef STANDALONE
# define PROGCLASS "Superquadrics"
# define HACK_INIT init_superquadrics
@@
-86,6
+78,7
@@
static const char sccsid[] = "@(#)superquadrics.c 4.07 97/11/24 xlockmore";
# define DEFAULTS "*delay: 40000 \n" \
"*count: 25 \n" \
"*cycles: 40 \n" \
# define DEFAULTS "*delay: 40000 \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 */
@@
-107,11
+100,11
@@
static float spinspeed;
static XrmOptionDescRec opts[] =
{
static XrmOptionDescRec opts[] =
{
- {"-spinspeed", ".superquadrics.spinspeed", XrmoptionSepArg,
(caddr_t) NULL
}
+ {"-spinspeed", ".superquadrics.spinspeed", XrmoptionSepArg,
0
}
};
static argtype vars[] =
{
};
static argtype vars[] =
{
- {
(caddr_t *) &
spinspeed, "spinspeed", "Spinspeed", DEF_SPINSPEED, t_Float}
+ {
&
spinspeed, "spinspeed", "Spinspeed", DEF_SPINSPEED, t_Float}
};
static OptionStruct desc[] =
{
};
static OptionStruct desc[] =
{
@@
-752,6
+745,7
@@
draw_superquadrics(ModeInfo * mi)
NextSuperquadricDisplay(sp);
NextSuperquadricDisplay(sp);
+ if (mi->fps_p) do_fps (mi);
glFinish();
glXSwapBuffers(display, window);
}
glFinish();
glXSwapBuffers(display, window);
}