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
/
dangerball.c
diff --git
a/hacks/glx/dangerball.c
b/hacks/glx/dangerball.c
index a44a55d703ac7beb86b58d589865fcd9abab198c..ec39fbe34f0b59dfb9ea279453137c6481faae55 100644
(file)
--- a/
hacks/glx/dangerball.c
+++ b/
hacks/glx/dangerball.c
@@
-1,4
+1,4
@@
-/* dangerball, Copyright (c) 2001-201
4
Jamie Zawinski <jwz@jwz.org>
+/* dangerball, Copyright (c) 2001-201
7
Jamie Zawinski <jwz@jwz.org>
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
@@
-13,6
+13,7
@@
"*count: 30 \n" \
"*showFPS: False \n" \
"*wireframe: False \n" \
"*count: 30 \n" \
"*showFPS: False \n" \
"*wireframe: False \n" \
+ "*suppressRotationAnimation: True\n" \
# define refresh_ball 0
# define release_ball 0
# define refresh_ball 0
# define release_ball 0
@@
-101,6
+102,14
@@
reshape_ball (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);
}
@@
-195,15
+204,7
@@
init_ball (ModeInfo *mi)
ball_configuration *bp;
int wire = MI_IS_WIREFRAME(mi);
ball_configuration *bp;
int wire = MI_IS_WIREFRAME(mi);
- if (!bps) {
- bps = (ball_configuration *)
- calloc (MI_NUM_SCREENS(mi), sizeof (ball_configuration));
- if (!bps) {
- fprintf(stderr, "%s: out of memory\n", progname);
- exit(1);
- }
- }
-
+ MI_INIT (mi, bps, 0);
bp = &bps[MI_SCREEN(mi)];
bp->glx_context = init_GL(mi);
bp = &bps[MI_SCREEN(mi)];
bp->glx_context = init_GL(mi);