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.18.tar.gz
[xscreensaver]
/
hacks
/
glx
/
stonerview.c
diff --git
a/hacks/glx/stonerview.c
b/hacks/glx/stonerview.c
index 79b17fb6b5673958107de234e15a869790280ed7..0e11395e2ace623c7c2b8c2603daddba80e4e598 100644
(file)
--- a/
hacks/glx/stonerview.c
+++ b/
hacks/glx/stonerview.c
@@
-95,8
+95,8
@@
init_stonerview (ModeInfo *mi)
bp->glx_context = init_GL(mi);
bp->trackball = gltrackball_init ();
bp->glx_context = init_GL(mi);
bp->trackball = gltrackball_init ();
- bp->st = init_view(MI_IS_WIREFRAME(mi), transparent_p);
- init_move(bp->st);
+ bp->st =
stonerview_
init_view(MI_IS_WIREFRAME(mi), transparent_p);
+
stonerview_
init_move(bp->st);
reshape_stonerview (mi, MI_WIDTH(mi), MI_HEIGHT(mi));
clear_gl_error(); /* WTF? sometimes "invalid op" from glViewport! */
reshape_stonerview (mi, MI_WIDTH(mi), MI_HEIGHT(mi));
clear_gl_error(); /* WTF? sometimes "invalid op" from glViewport! */
@@
-111,10
+111,12
@@
draw_stonerview (ModeInfo *mi)
glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *(bp->glx_context));
glPushMatrix ();
glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *(bp->glx_context));
glPushMatrix ();
+ glRotatef( current_device_rotation(), 0, 0, 1);
gltrackball_rotate (bp->trackball);
gltrackball_rotate (bp->trackball);
- win_draw(bp->st);
+
+ stonerview_win_draw(bp->st);
if (! bp->button_down_p)
if (! bp->button_down_p)
- move_increment(bp->st);
+
stonerview_
move_increment(bp->st);
glPopMatrix ();
mi->polygon_count = NUM_ELS;
glPopMatrix ();
mi->polygon_count = NUM_ELS;
@@
-132,7
+134,7
@@
release_stonerview (ModeInfo *mi)
for (screen = 0; screen < MI_NUM_SCREENS(mi); screen++) {
stonerview_configuration *bp = &bps[screen];
if (bp->st)
for (screen = 0; screen < MI_NUM_SCREENS(mi); screen++) {
stonerview_configuration *bp = &bps[screen];
if (bp->st)
- win_release (bp->st);
+
stonerview_
win_release (bp->st);
}
free (bps);
bps = 0;
}
free (bps);
bps = 0;