X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=hacks%2Fglx%2Fstonerview.c;h=0e11395e2ace623c7c2b8c2603daddba80e4e598;hp=79b17fb6b5673958107de234e15a869790280ed7;hb=6f5482d73adb0165c0130bb47d852644ab0c4869;hpb=c70f94f648d51bb4828193124f325fa52b0e57f3 diff --git a/hacks/glx/stonerview.c b/hacks/glx/stonerview.c index 79b17fb6..0e11395e 100644 --- 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->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! */ @@ -111,10 +111,12 @@ draw_stonerview (ModeInfo *mi) glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *(bp->glx_context)); glPushMatrix (); + glRotatef( current_device_rotation(), 0, 0, 1); gltrackball_rotate (bp->trackball); - win_draw(bp->st); + + stonerview_win_draw(bp->st); if (! bp->button_down_p) - move_increment(bp->st); + stonerview_move_increment(bp->st); 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) - win_release (bp->st); + stonerview_win_release (bp->st); } free (bps); bps = 0;