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.35.tar.gz
[xscreensaver]
/
hacks
/
glx
/
glslideshow.c
diff --git
a/hacks/glx/glslideshow.c
b/hacks/glx/glslideshow.c
index 992d75cbbea974029b05b8ec1ba7c9e6dff40338..3e3548d8e08f6df20ded6b18d5c73c3b81fd11ab 100644
(file)
--- a/
hacks/glx/glslideshow.c
+++ b/
hacks/glx/glslideshow.c
@@
-226,7
+226,7
@@
ENTRYPOINT ModeSpecOpt slideshow_opts = {countof(opts), opts, countof(vars), var
static const char *
blurb (void)
{
static const char *
blurb (void)
{
-# ifdef HAVE_
COCOA
+# ifdef HAVE_
JWXYZ
return "GLSlideshow";
# else
static char buf[255];
return "GLSlideshow";
# else
static char buf[255];
@@
-867,6
+867,7
@@
draw_sprites (ModeInfo *mi)
glPushMatrix();
glPushMatrix();
+/*
{
GLfloat rot = current_device_rotation();
glTranslatef (0.5, 0.5, 0);
{
GLfloat rot = current_device_rotation();
glTranslatef (0.5, 0.5, 0);
@@
-879,6
+880,7
@@
draw_sprites (ModeInfo *mi)
}
glTranslatef (-0.5, -0.5, 0);
}
}
glTranslatef (-0.5, -0.5, 0);
}
+*/
for (i = 0; i < ss->nsprites; i++)
draw_sprite (mi, ss->sprites[i]);
for (i = 0; i < ss->nsprites; i++)
draw_sprite (mi, ss->sprites[i]);
@@
-911,6
+913,7
@@
reshape_slideshow (ModeInfo *mi, int width, int height)
glViewport (0, 0, width, height);
glMatrixMode (GL_PROJECTION);
glLoadIdentity();
glViewport (0, 0, width, height);
glMatrixMode (GL_PROJECTION);
glLoadIdentity();
+ glRotatef (current_device_rotation(), 0, 0, 1);
glMatrixMode (GL_MODELVIEW);
glLoadIdentity();
glMatrixMode (GL_MODELVIEW);
glLoadIdentity();
@@
-993,7
+996,7
@@
sanity_check (ModeInfo *mi)
static void
check_fps (ModeInfo *mi)
{
static void
check_fps (ModeInfo *mi)
{
-#ifndef HAVE_
COCOA /* always assume Cocoa is
fast enough */
+#ifndef HAVE_
JWXYZ /* always assume Cocoa and mobile are
fast enough */
slideshow_state *ss = &sss[MI_SCREEN(mi)];
slideshow_state *ss = &sss[MI_SCREEN(mi)];
@@
-1045,7
+1048,7
@@
check_fps (ModeInfo *mi)
/* Need this in case zoom changed. */
reshape_slideshow (mi, mi->xgwa.width, mi->xgwa.height);
/* Need this in case zoom changed. */
reshape_slideshow (mi, mi->xgwa.width, mi->xgwa.height);
-#endif /* HAVE_
COCOA
*/
+#endif /* HAVE_
JWXYZ
*/
}
}