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.22.tar.gz
[xscreensaver]
/
hacks
/
glx
/
engine.c
diff --git
a/hacks/glx/engine.c
b/hacks/glx/engine.c
index d83c0e45a6a55437c257461330c4d073e73e6425..9c37c8b8647ba8db0e2d16f587e4779018ea74f6 100644
(file)
--- a/
hacks/glx/engine.c
+++ b/
hacks/glx/engine.c
@@
-284,13
+284,13
@@
static void make_tables(Engine *e)
float f;
f = ONEREV / (M_PI * 2);
float f;
f = ONEREV / (M_PI * 2);
- for (i = 0 ; i <
=
TWOREV ; i++) {
+ for (i = 0 ; i < TWOREV ; i++) {
e->sin_table[i] = sin(i/f);
}
e->sin_table[i] = sin(i/f);
}
- for (i = 0 ; i <
=
TWOREV ; i++) {
+ for (i = 0 ; i < TWOREV ; i++) {
e->cos_table[i] = cos(i/f);
}
e->cos_table[i] = cos(i/f);
}
- for (i = 0 ; i <
=
TWOREV ; i++) {
+ for (i = 0 ; i < TWOREV ; i++) {
e->tan_table[i] = tan(i/f);
}
}
e->tan_table[i] = tan(i/f);
}
}
@@
-587,7
+587,7
@@
static int boom(Engine *e, GLfloat x, GLfloat y, int s)
glLightfv(GL_LIGHT1, GL_POSITION, e->boom_lpos);
glLightfv(GL_LIGHT1, GL_DIFFUSE, e->boom_red);
glLightfv(GL_LIGHT1, GL_SPECULAR, e->boom_red);
glLightfv(GL_LIGHT1, GL_POSITION, e->boom_lpos);
glLightfv(GL_LIGHT1, GL_DIFFUSE, e->boom_red);
glLightfv(GL_LIGHT1, GL_SPECULAR, e->boom_red);
- glLight
i
(GL_LIGHT1, GL_LINEAR_ATTENUATION, 1.3);
+ glLight
f
(GL_LIGHT1, GL_LINEAR_ATTENUATION, 1.3);
glLighti(GL_LIGHT1, GL_CONSTANT_ATTENUATION, 0);
glMaterialfv(GL_FRONT, GL_AMBIENT_AND_DIFFUSE, e->boom_red);
glLighti(GL_LIGHT1, GL_CONSTANT_ATTENUATION, 0);
glMaterialfv(GL_FRONT, GL_AMBIENT_AND_DIFFUSE, e->boom_red);
@@
-618,6
+618,7
@@
static int display(Engine *e)
e->lookat[0], e->lookat[1], e->lookat[2],
0.0, 1.0, 0.0);
glPushMatrix();
e->lookat[0], e->lookat[1], e->lookat[2],
0.0, 1.0, 0.0);
glPushMatrix();
+
glLightfv(GL_LIGHT0, GL_POSITION, lightpos);
glLightfv(GL_LIGHT0, GL_SPECULAR, light_sp);
glLightfv(GL_LIGHT0, GL_DIFFUSE, light_sp);
glLightfv(GL_LIGHT0, GL_POSITION, lightpos);
glLightfv(GL_LIGHT0, GL_SPECULAR, light_sp);
glLightfv(GL_LIGHT0, GL_DIFFUSE, light_sp);
@@
-627,9
+628,15
@@
static int display(Engine *e)
get_position (e->rot, &x, &y, &z, !e->button_down_p);
glTranslatef(x*16-9, y*14-7, z*16-10);
}
get_position (e->rot, &x, &y, &z, !e->button_down_p);
glTranslatef(x*16-9, y*14-7, z*16-10);
}
+
if (spin) {
double x, y, z;
if (spin) {
double x, y, z;
+
+ /* Do it twice because we don't track the device's orientation. */
+ glRotatef( current_device_rotation(), 0, 0, 1);
gltrackball_rotate (e->trackball);
gltrackball_rotate (e->trackball);
+ glRotatef(-current_device_rotation(), 0, 0, 1);
+
get_rotation(e->rot, &x, &y, &z, !e->button_down_p);
glRotatef(x*ONEREV, 1.0, 0.0, 0.0);
glRotatef(y*ONEREV, 0.0, 1.0, 0.0);
get_rotation(e->rot, &x, &y, &z, !e->button_down_p);
glRotatef(x*ONEREV, 1.0, 0.0, 0.0);
glRotatef(y*ONEREV, 0.0, 1.0, 0.0);
@@
-983,6
+990,7
@@
ENTRYPOINT void draw_engine(ModeInfo *mi)
mi->polygon_count = display(e);
mi->polygon_count = display(e);
+ glColor3f (1, 1, 0);
if (do_titles)
print_gl_string (mi->dpy,
# ifdef HAVE_GLBITMAP
if (do_titles)
print_gl_string (mi->dpy,
# ifdef HAVE_GLBITMAP