summaryrefslogtreecommitdiffstats
path: root/hacks/glx/blocktube.c
diff options
context:
space:
mode:
authorSimon Rettberg2021-04-06 14:43:39 +0200
committerSimon Rettberg2021-04-07 13:38:37 +0200
commit38886de0c3e9ea5729ef23e4c653fa2822f52e8f (patch)
tree9b799c8c968a92cc77746a95e0e8bdd90b6b13c3 /hacks/glx/blocktube.c
parentMaybe not remove, but ... (diff)
downloadxscreensaver-38886de0c3e9ea5729ef23e4c653fa2822f52e8f.tar.gz
xscreensaver-38886de0c3e9ea5729ef23e4c653fa2822f52e8f.tar.xz
xscreensaver-38886de0c3e9ea5729ef23e4c653fa2822f52e8f.zip
xscreensaver 6.00v28r1openslx
Diffstat (limited to 'hacks/glx/blocktube.c')
-rw-r--r--hacks/glx/blocktube.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/hacks/glx/blocktube.c b/hacks/glx/blocktube.c
index 811b185..ca29d87 100644
--- a/hacks/glx/blocktube.c
+++ b/hacks/glx/blocktube.c
@@ -20,8 +20,6 @@
# define release_blocktube 0
# define blocktube_handle_event xlockmore_no_events
-#undef countof
-#define countof(x) (sizeof((x))/sizeof((*x)))
#include "xlockmore.h"
#include "colors.h"
@@ -321,13 +319,12 @@ ENTRYPOINT void reshape_blocktube (ModeInfo *mi, int width, int height)
gluPerspective(45.0, 1/h, 1.0, 100.0);
glMatrixMode(GL_MODELVIEW);
-# 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);
+ GLfloat s = (MI_WIDTH(mi) < MI_HEIGHT(mi)
+ ? (MI_WIDTH(mi) / (GLfloat) MI_HEIGHT(mi))
+ : 1);
+ glScalef (s, s, s);
}
-# endif
}
static int cube_vertices(float x, float y, float z, int wire)