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
/
cubestorm.c
diff --git
a/hacks/glx/cubestorm.c
b/hacks/glx/cubestorm.c
index b5bba46ed6d1f97ccb7d6b02735bd09445b6b2a0..3137c862dcac747a1b8d2e4462233695597d77fc 100644
(file)
--- a/
hacks/glx/cubestorm.c
+++ b/
hacks/glx/cubestorm.c
@@
-14,6
+14,7
@@
"*showFPS: False \n" \
"*fpsSolid: True \n" \
"*wireframe: False \n" \
"*showFPS: False \n" \
"*fpsSolid: True \n" \
"*wireframe: False \n" \
+ "*suppressRotationAnimation: True\n" \
# define refresh_cube 0
# define refresh_cube 0
@@
-174,6
+175,14
@@
reshape_cube (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 | GL_DEPTH_BUFFER_BIT);
}
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
}
@@
-217,14
+226,7
@@
init_cube (ModeInfo *mi)
int wire = MI_IS_WIREFRAME(mi);
int i;
int wire = MI_IS_WIREFRAME(mi);
int i;
- if (!bps) {
- bps = (cube_configuration *)
- calloc (MI_NUM_SCREENS(mi), sizeof (cube_configuration));
- if (!bps) {
- fprintf(stderr, "%s: out of memory\n", progname);
- exit(1);
- }
- }
+ MI_INIT (mi, bps, NULL);
# ifdef HAVE_JWZGLES
dbuf_p = True;
# ifdef HAVE_JWZGLES
dbuf_p = True;
@@
-291,7
+293,6
@@
init_cube (ModeInfo *mi)
draw_faces (mi);
glEndList ();
draw_faces (mi);
glEndList ();
- glDrawBuffer(dbuf_p ? GL_BACK : GL_FRONT);
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
}
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
}
@@
-309,6
+310,8
@@
draw_cube (ModeInfo *mi)
if (!bp->glx_context)
return;
if (!bp->glx_context)
return;
+ glDrawBuffer(dbuf_p ? GL_BACK : GL_FRONT);
+
glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *(bp->glx_context));
glShadeModel(GL_SMOOTH);
glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *(bp->glx_context));
glShadeModel(GL_SMOOTH);