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
/
menger.c
diff --git
a/hacks/glx/menger.c
b/hacks/glx/menger.c
index ef7ddce2fff6ae2c2b97b8864837519ac26e1f41..249d224013f6e5d6611580587fe3040b93b45542 100644
(file)
--- a/
hacks/glx/menger.c
+++ b/
hacks/glx/menger.c
@@
-53,9
+53,10
@@
#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
_sponge 0
+# define
free
_sponge 0
# define release_sponge 0
#undef countof
#define countof(x) (sizeof((x))/sizeof((*x)))
# define release_sponge 0
#undef countof
#define countof(x) (sizeof((x))/sizeof((*x)))
@@
-127,8
+128,15
@@
ENTRYPOINT void
reshape_sponge (ModeInfo *mi, int width, int height)
{
GLfloat h = (GLfloat) height / (GLfloat) width;
reshape_sponge (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();
@@
-140,6
+148,14
@@
reshape_sponge (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);
}
@@
-392,14
+408,7
@@
init_sponge (ModeInfo *mi)
sponge_configuration *sp;
int wire = MI_IS_WIREFRAME(mi);
sponge_configuration *sp;
int wire = MI_IS_WIREFRAME(mi);
- if (!sps) {
- sps = (sponge_configuration *)
- calloc (MI_NUM_SCREENS(mi), sizeof (sponge_configuration));
- if (!sps) {
- fprintf(stderr, "%s: out of memory\n", progname);
- exit(1);
- }
- }
+ MI_INIT (mi, sps);
sp = &sps[MI_SCREEN(mi)];
sp = &sps[MI_SCREEN(mi)];