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.27.tar.gz
[xscreensaver]
/
hacks
/
glx
/
rubikblocks.c
diff --git
a/hacks/glx/rubikblocks.c
b/hacks/glx/rubikblocks.c
index e8caf32f140d18a94205848a1f5a5224a018bec9..ed5e1775a6ef8d5f72e43e2e80e2c5aa8157fb12 100644
(file)
--- a/
hacks/glx/rubikblocks.c
+++ b/
hacks/glx/rubikblocks.c
@@
-128,7
+128,6
@@
static const GLfloat lmodel_ambient[] = {0.1, 0.1, 0.1, 1.0};
static const GLfloat material_ambient[] = {0.7, 0.7, 0.7, 1.0};
static const GLfloat material_diffuse[] = {0.7, 0.7, 0.7, 1.0};
static const GLfloat material_specular[] = {0.2, 0.2, 0.2, 1.0};
static const GLfloat material_ambient[] = {0.7, 0.7, 0.7, 1.0};
static const GLfloat material_diffuse[] = {0.7, 0.7, 0.7, 1.0};
static const GLfloat material_specular[] = {0.2, 0.2, 0.2, 1.0};
-static const GLfloat zpos = -18.0;
/*************************************************************************/
/*************************************************************************/
@@
-262,7
+261,12
@@
draw_main(ModeInfo *mi, rubikblocks_conf *cp)
glLoadIdentity();
get_position(cp->rot, &x, &y, &z, !cp->button_down);
glTranslatef((x-0.5)*6, (y-0.5)*6, -20);
glLoadIdentity();
get_position(cp->rot, &x, &y, &z, !cp->button_down);
glTranslatef((x-0.5)*6, (y-0.5)*6, -20);
+
+ /* Do it twice because we don't track the device's orientation. */
+ glRotatef( current_device_rotation(), 0, 0, 1);
gltrackball_rotate(cp->trackball);
gltrackball_rotate(cp->trackball);
+ glRotatef(-current_device_rotation(), 0, 0, 1);
+
get_rotation(cp->rot, &x, &y, &z, !cp->button_down);
glRotatef(x*360, 1, 0, 0);
glRotatef(y*360, 0, 1, 0);
get_rotation(cp->rot, &x, &y, &z, !cp->button_down);
glRotatef(x*360, 1, 0, 0);
glRotatef(y*360, 0, 1, 0);
@@
-431,6
+435,11
@@
init_gl(ModeInfo *mi)
int status;
#endif
cp->wire = MI_IS_WIREFRAME(mi);
int status;
#endif
cp->wire = MI_IS_WIREFRAME(mi);
+
+# ifdef HAVE_JWZGLES /* #### glPolygonMode other than GL_FILL unimplemented */
+ cp->wire = 0;
+# endif
+
if(MI_IS_MONO(mi))
tex = False;
if(cp->wire) {
if(MI_IS_MONO(mi))
tex = False;
if(cp->wire) {