X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2Flament.c;h=214aaf6208a5d455addf242f15224249f1370441;hb=88cfe534a698a0562e81345957a50714af1453bc;hp=bfc6ce4db2bbe8f76ff94dbd736cae42b1626f06;hpb=6afd6db0ae9396cd7ff897ade597cd5483f49b0e;p=xscreensaver diff --git a/hacks/glx/lament.c b/hacks/glx/lament.c index bfc6ce4d..214aaf62 100644 --- a/hacks/glx/lament.c +++ b/hacks/glx/lament.c @@ -326,7 +326,7 @@ scale_for_window (ModeInfo *mi) /* Constrain it to roughly life-sized on the screen, not huge. */ # ifdef USE_IPHONE - if (size > 768) /* iPad retina */ + if (size > 768) /* iPad retina / iPhone 6 */ target_size *= 1.5; else # endif @@ -913,6 +913,10 @@ draw (ModeInfo *mi) case LAMENT_LID_CLOSE: case LAMENT_LID_ZOOM: { + GLfloat d = 0.21582; + int i; + const int lists[4] = { OBJ_LID_A, OBJ_LID_B, OBJ_LID_C, OBJ_LID_D }; + lc->facing_p = facing_screen_p (mi); if (lc->anim_z < 0.5) @@ -920,9 +924,6 @@ draw (ModeInfo *mi) else glTranslatef (8 * (0.5 - (lc->anim_z - 0.5)), 0, 0); - GLfloat d = 0.21582; - int i; - const int lists[4] = { OBJ_LID_A, OBJ_LID_B, OBJ_LID_C, OBJ_LID_D }; glCallList (lc->dlists[OBJ_LID_BASE]); mi->polygon_count += lc->polys[OBJ_LID_BASE]; for (i = 0; i < countof(lists); i++)