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.37.tar.gz
[xscreensaver]
/
hacks
/
glx
/
gears.c
diff --git
a/hacks/glx/gears.c
b/hacks/glx/gears.c
index 5a8fd86f2eb82a698e79fc7d48179cca591c13d5..0c292a2eae8ef04f1d6369c88b71875cad22ec21 100644
(file)
--- a/
hacks/glx/gears.c
+++ b/
hacks/glx/gears.c
@@
-16,6
+16,7
@@
"*count: 0 \n" \
"*showFPS: False \n" \
"*wireframe: False \n" \
"*count: 0 \n" \
"*showFPS: False \n" \
"*wireframe: False \n" \
+ "*suppressRotationAnimation: True\n" \
# define refresh_gears 0
# define release_gears 0
# define refresh_gears 0
# define release_gears 0
@@
-98,6
+99,14
@@
reshape_gears (ModeInfo *mi, int width, int height)
0.0, 0.0, 0.0,
0.0, 1.0, 0.0);
0.0, 0.0, 0.0,
0.0, 1.0, 0.0);
+# ifdef HAVE_MOBILE /* Keep it the same relative size when rotated. */
+ {
+ int o = (int) current_device_rotation();
+ if (o != 0 && o != 180 && o != -180)
+ glScalef (1/h, 1/h, 1/h);
+ }
+# endif
+
glClear(GL_COLOR_BUFFER_BIT);
}
glClear(GL_COLOR_BUFFER_BIT);
}
@@
-238,7
+247,8
@@
new_gear (ModeInfo *mi, gear *parent)
double pix = g->tooth_h * MI_HEIGHT(mi); /* approx. tooth size in pixels */
if (pix <= 2.5) g->size = INVOLUTE_SMALL;
else if (pix <= 3.5) g->size = INVOLUTE_MEDIUM;
double pix = g->tooth_h * MI_HEIGHT(mi); /* approx. tooth size in pixels */
if (pix <= 2.5) g->size = INVOLUTE_SMALL;
else if (pix <= 3.5) g->size = INVOLUTE_MEDIUM;
- else g->size = INVOLUTE_LARGE;
+ else if (pix <= 25) g->size = INVOLUTE_LARGE;
+ else g->size = INVOLUTE_HUGE;
}
g->base_p = !parent;
}
g->base_p = !parent;
@@
-688,14
+698,7
@@
init_gears (ModeInfo *mi)
int wire = MI_IS_WIREFRAME(mi);
int i;
int wire = MI_IS_WIREFRAME(mi);
int i;
- if (!bps) {
- bps = (gears_configuration *)
- calloc (MI_NUM_SCREENS(mi), sizeof (gears_configuration));
- if (!bps) {
- fprintf(stderr, "%s: out of memory\n", progname);
- exit(1);
- }
- }
+ MI_INIT (mi, bps, NULL);
bp = &bps[MI_SCREEN(mi)];
bp = &bps[MI_SCREEN(mi)];
@@
-758,7
+761,7
@@
init_gears (ModeInfo *mi)
bp->planetary_p = False;
if (total_gears <= 0)
bp->planetary_p = False;
if (total_gears <= 0)
- total_gears = 3 + abs (BELLRAND (8) - 4); /* 3 - 7, mostly 3. */
+ total_gears = 3 +
f
abs (BELLRAND (8) - 4); /* 3 - 7, mostly 3. */
bp->gears = (gear **) calloc (total_gears+2, sizeof(**bp->gears));
bp->ngears = 0;
bp->gears = (gear **) calloc (total_gears+2, sizeof(**bp->gears));
bp->ngears = 0;