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.39.tar.gz
[xscreensaver]
/
hacks
/
glx
/
moebius.c
diff --git
a/hacks/glx/moebius.c
b/hacks/glx/moebius.c
index 80a8246381a171d7c2036ce94e9238187d1ae0d2..5ef2c0dffbf1919acb3a345e7a1951a821010b84 100644
(file)
--- a/
hacks/glx/moebius.c
+++ b/
hacks/glx/moebius.c
@@
-79,7
+79,7
@@
static const char sccsid[] = "@(#)moebius.c 5.01 2001/03/01 xlockmore";
#ifdef STANDALONE
# define MODE_moebius
#ifdef STANDALONE
# define MODE_moebius
-# define
refresh
_moebius 0
+# define
free
_moebius 0
# define release_moebius 0
# define DEFAULTS "*delay: 20000 \n" \
"*showFPS: False \n" \
# define release_moebius 0
# define DEFAULTS "*delay: 20000 \n" \
"*showFPS: False \n" \
@@
-108,8
+108,8
@@
static const char sccsid[] = "@(#)moebius.c 5.01 2001/03/01 xlockmore";
#if 0
#include "e_textures.h"
#else
#if 0
#include "e_textures.h"
#else
-#include "x
pm-ximage
.h"
-#include "
../images/wood.xpm
"
+#include "x
image-loader
.h"
+#include "
images/gen/wood_png.h
"
#endif
#endif /* 0 */
#endif
#endif /* 0 */
@@
-564,8
+564,14
@@
ENTRYPOINT void
reshape_moebius (ModeInfo * mi, int width, int height)
{
moebiusstruct *mp = &moebius[MI_SCREEN(mi)];
reshape_moebius (ModeInfo * mi, int width, int height)
{
moebiusstruct *mp = &moebius[MI_SCREEN(mi)];
+ int y = 0;
- glViewport(0, 0, mp->WindW = (GLint) width, mp->WindH = (GLint) height);
+ if (width > height * 5) { /* tiny window: show middle */
+ height = width;
+ y = -height/2;
+ }
+
+ glViewport(0, y, mp->WindW = (GLint) width, mp->WindH = (GLint) height);
glMatrixMode(GL_PROJECTION);
glLoadIdentity();
glFrustum(-1.0, 1.0, -1.0, 1.0, 5.0, 15.0);
glMatrixMode(GL_PROJECTION);
glLoadIdentity();
glFrustum(-1.0, 1.0, -1.0, 1.0, 5.0, 15.0);
@@
-627,10
+633,8
@@
pinit(ModeInfo *mi)
check_gl_error("mipmapping");
#else
{
check_gl_error("mipmapping");
#else
{
- XImage *img = xpm_to_ximage (mi->dpy,
- mi->xgwa.visual,
- mi->xgwa.colormap,
- wood_texture);
+ XImage *img = image_data_to_ximage (mi->dpy, mi->xgwa.visual,
+ wood_png, sizeof(wood_png));
glTexImage2D (GL_TEXTURE_2D, 0, GL_RGBA,
img->width, img->height, 0,
GL_RGBA,
glTexImage2D (GL_TEXTURE_2D, 0, GL_RGBA,
img->width, img->height, 0,
GL_RGBA,
@@
-673,7
+677,7
@@
init_moebius (ModeInfo * mi)
{
moebiusstruct *mp;
{
moebiusstruct *mp;
- MI_INIT (mi, moebius
, NULL
);
+ MI_INIT (mi, moebius);
mp = &moebius[MI_SCREEN(mi)];
mp->step = NRAND(90);
mp->ant_position = NRAND(90);
mp = &moebius[MI_SCREEN(mi)];
mp->step = NRAND(90);
mp->ant_position = NRAND(90);