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-move.c
diff --git
a/hacks/glx/stonerview-move.c
b/hacks/glx/stonerview-move.c
index b8a2041b17b4fb1fffd3359d2dd382b77fba8508..fc2931d4a4bc5d81e9e2eef4ac7c1cdc88dd5c3d 100644
(file)
--- a/
hacks/glx/stonerview-move.c
+++ b/
hacks/glx/stonerview-move.c
@@
-32,7
+32,7
@@
void
void
-init_move(stonerview_state *st)
+
stonerview_
init_move(stonerview_state *st)
{
/*st->theta = new_osc_linear(
new_osc_wrap(0, 36000, 25),
{
/*st->theta = new_osc_linear(
new_osc_wrap(0, 36000, 25),
@@
-95,15
+95,12
@@
init_move(stonerview_state *st)
new_osc_buffer(st, new_osc_wrap(st, 0, 3600, 17)),
new_osc_buffer(st, new_osc_wrap(st, 0, 3600, 7)));
new_osc_buffer(st, new_osc_wrap(st, 0, 3600, 17)),
new_osc_buffer(st, new_osc_wrap(st, 0, 3600, 7)));
- move_increment(st);
-}
-
-void final_move(stonerview_state *st)
-{
+ stonerview_move_increment(st);
}
/* Set up the list of polygon data for rendering. */
}
/* Set up the list of polygon data for rendering. */
-void move_increment(stonerview_state *st)
+void
+stonerview_move_increment(stonerview_state *st)
{
int ix, val;
/* GLfloat fval; */
{
int ix, val;
/* GLfloat fval; */
@@
-112,7
+109,7
@@
void move_increment(stonerview_state *st)
GLfloat ptrad, pttheta;
for (ix=0; ix<st->num_els; ix++) {
GLfloat ptrad, pttheta;
for (ix=0; ix<st->num_els; ix++) {
- elem_t *el = &st->elist[ix];
+
stonerview_
elem_t *el = &st->elist[ix];
/* Grab r and theta... */
val = osc_get(st, st->theta, ix);
/* Grab r and theta... */
val = osc_get(st, st->theta, ix);