projects
/
xscreensaver
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
http://www.jwz.org/xscreensaver/xscreensaver-5.12.tar.gz
[xscreensaver]
/
hacks
/
glx
/
spheremonics.c
diff --git
a/hacks/glx/spheremonics.c
b/hacks/glx/spheremonics.c
index 29177c290a0f197f969d50a4ca5e15d2ebd3da81..7bd9967a6255b3968ca3bfe0c72bf0df75077baa 100644
(file)
--- a/
hacks/glx/spheremonics.c
+++ b/
hacks/glx/spheremonics.c
@@
-63,7
+63,7
@@
#define DEFAULTS "*delay: 30000 \n" \
"*showFPS: False \n" \
"*wireframe: False \n" \
#define DEFAULTS "*delay: 30000 \n" \
"*showFPS: False \n" \
"*wireframe: False \n" \
- "*labelfont: -*-
times-bold
-r-normal-*-180-*\n"
+ "*labelfont: -*-
helvetica-medium
-r-normal-*-180-*\n"
# define refresh_spheremonics 0
# define release_spheremonics 0
# define refresh_spheremonics 0
# define release_spheremonics 0
@@
-302,23
+302,25
@@
draw_circle (ModeInfo *mi, Bool teeth_p)
static void
draw_bounding_box (ModeInfo *mi)
{
static void
draw_bounding_box (ModeInfo *mi)
{
- spheremonics_configuration *cc = &ccs[MI_SCREEN(mi)];
+ /* spheremonics_configuration *cc = &ccs[MI_SCREEN(mi)]; */
static const GLfloat c1[4] = { 0.2, 0.2, 0.6, 1.0 };
static const GLfloat c2[4] = { 1.0, 0.0, 0.0, 1.0 };
int wire = MI_IS_WIREFRAME(mi);
static const GLfloat c1[4] = { 0.2, 0.2, 0.6, 1.0 };
static const GLfloat c2[4] = { 1.0, 0.0, 0.0, 1.0 };
int wire = MI_IS_WIREFRAME(mi);
- GLfloat x1 = cc->bbox[0].x;
- GLfloat y1 = cc->bbox[0].y;
- GLfloat z1 = cc->bbox[0].z;
- GLfloat x2 = cc->bbox[1].x;
- GLfloat y2 = cc->bbox[1].y;
- GLfloat z2 = cc->bbox[1].z;
+ GLfloat x1,y1,z1,x2,y2,z2;
-#if 1
+# if 0
+ x1 = cc->bbox[0].x;
+ y1 = cc->bbox[0].y;
+ z1 = cc->bbox[0].z;
+ x2 = cc->bbox[1].x;
+ y2 = cc->bbox[1].y;
+ z2 = cc->bbox[1].z;
+# else
x1 = y1 = z1 = -0.5;
x2 = y2 = z2 = 0.5;
x1 = y1 = z1 = -0.5;
x2 = y2 = z2 = 0.5;
-#endif
+#
endif
if (do_bbox && !wire)
{
if (do_bbox && !wire)
{
@@
-690,8
+692,6
@@
init_spheremonics (ModeInfo *mi)
fprintf(stderr, "%s: out of memory\n", progname);
exit(1);
}
fprintf(stderr, "%s: out of memory\n", progname);
exit(1);
}
-
- cc = &ccs[MI_SCREEN(mi)];
}
cc = &ccs[MI_SCREEN(mi)];
}
cc = &ccs[MI_SCREEN(mi)];
@@
-888,7
+888,7
@@
draw_spheremonics (ModeInfo *mi)
print_gl_string (mi->dpy, cc->font, cc->font_list,
mi->xgwa.width, mi->xgwa.height,
10, mi->xgwa.height - 10,
print_gl_string (mi->dpy, cc->font, cc->font_list,
mi->xgwa.width, mi->xgwa.height,
10, mi->xgwa.height - 10,
- buf);
+ buf
, False
);
}
if (!static_parms)
}
if (!static_parms)