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.38.tar.gz
[xscreensaver]
/
hacks
/
glx
/
glknots.c
diff --git
a/hacks/glx/glknots.c
b/hacks/glx/glknots.c
index fead436e35e31122f616a4908d7337462d0420c1..730cadb19ec9274708b49f8402879ca38b8504df 100644
(file)
--- a/
hacks/glx/glknots.c
+++ b/
hacks/glx/glknots.c
@@
-16,8
+16,9
@@
#define DEFAULTS "*delay: 30000 \n" \
"*showFPS: False \n" \
"*wireframe: False \n" \
#define DEFAULTS "*delay: 30000 \n" \
"*showFPS: False \n" \
"*wireframe: False \n" \
+ "*suppressRotationAnimation: True\n" \
-# define
refresh
_knot 0
+# define
free
_knot 0
# define release_knot 0
#undef countof
#define countof(x) (sizeof((x))/sizeof((*x)))
# define release_knot 0
#undef countof
#define countof(x) (sizeof((x))/sizeof((*x)))
@@
-177,8
+178,15
@@
ENTRYPOINT void
reshape_knot (ModeInfo *mi, int width, int height)
{
GLfloat h = (GLfloat) height / (GLfloat) width;
reshape_knot (ModeInfo *mi, int width, int height)
{
GLfloat h = (GLfloat) height / (GLfloat) width;
+ int y = 0;
- glViewport (0, 0, (GLint) width, (GLint) height);
+ if (width > height * 5) { /* tiny window: show middle */
+ height = width * 9/16;
+ y = -height/2;
+ h = height / (GLfloat) width;
+ }
+
+ glViewport (0, y, (GLint) width, (GLint) height);
glMatrixMode(GL_PROJECTION);
glLoadIdentity();
glMatrixMode(GL_PROJECTION);
glLoadIdentity();
@@
-190,6
+198,14
@@
reshape_knot (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);
}
@@
-248,14
+264,7
@@
init_knot (ModeInfo *mi)
knot_configuration *bp;
int wire = MI_IS_WIREFRAME(mi);
knot_configuration *bp;
int wire = MI_IS_WIREFRAME(mi);
- if (!bps) {
- bps = (knot_configuration *)
- calloc (MI_NUM_SCREENS(mi), sizeof (knot_configuration));
- if (!bps) {
- fprintf(stderr, "%s: out of memory\n", progname);
- exit(1);
- }
- }
+ MI_INIT (mi, bps);
bp = &bps[MI_SCREEN(mi)];
bp = &bps[MI_SCREEN(mi)];
@@
-352,7
+361,7
@@
draw_knot (ModeInfo *mi)
now - bp->last_time >= duration)
{
bp->mode = 1; /* go out */
now - bp->last_time >= duration)
{
bp->mode = 1; /* go out */
- bp->mode_tick = 10
*
speed;
+ bp->mode_tick = 10
/
speed;
bp->last_time = now;
}
}
bp->last_time = now;
}
}
@@
-362,7
+371,7
@@
draw_knot (ModeInfo *mi)
if (--bp->mode_tick <= 0)
{
new_knot (mi);
if (--bp->mode_tick <= 0)
{
new_knot (mi);
- bp->mode_tick = 10
*
speed;
+ bp->mode_tick = 10
/
speed;
bp->mode = 2; /* go in */
}
}
bp->mode = 2; /* go in */
}
}
@@
-416,8
+425,8
@@
draw_knot (ModeInfo *mi)
if (bp->mode != 0)
{
GLfloat s = (bp->mode == 1
if (bp->mode != 0)
{
GLfloat s = (bp->mode == 1
- ? bp->mode_tick / (10
*
speed)
- : ((10
* speed) - bp->mode_tick + 1) / (10 *
speed));
+ ? bp->mode_tick / (10
/
speed)
+ : ((10
/ speed) - bp->mode_tick + 1) / (10 /
speed));
glScalef (s, s, s);
}
glScalef (s, s, s);
}