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.15.tar.gz
[xscreensaver]
/
hacks
/
apollonian.c
diff --git
a/hacks/apollonian.c
b/hacks/apollonian.c
index 39a905afbfc4703cd5555c54543ae816f912b7db..ab34e04abc67d1766ca5e5fba004e3c76cfd7133 100644
(file)
--- a/
hacks/apollonian.c
+++ b/
hacks/apollonian.c
@@
-613,12
+613,14
@@
p(ModeInfo *mi, circle c)
#define BIG 7
static void
#define BIG 7
static void
-f(ModeInfo *mi, circle c1, circle c2, circle c3, circle c4)
+f(ModeInfo *mi, circle c1, circle c2, circle c3, circle c4
, int depth
)
{
apollonianstruct *cp = &apollonians[MI_SCREEN(mi)];
int e = (int) ((cp->c1.e >= 0.0) ? 1.0 : -cp->c1.e);
circle c;
{
apollonianstruct *cp = &apollonians[MI_SCREEN(mi)];
int e = (int) ((cp->c1.e >= 0.0) ? 1.0 : -cp->c1.e);
circle c;
+ if (depth > mi->recursion_depth) mi->recursion_depth = depth;
+
c.e = 2*(c1.e+c2.e+c3.e) - c4.e;
c.s = 2*(c1.s+c2.s+c3.s) - c4.s;
c.h = 2*(c1.h+c2.h+c3.h) - c4.h;
c.e = 2*(c1.e+c2.e+c3.e) - c4.e;
c.s = 2*(c1.s+c2.s+c3.s) - c4.s;
c.h = 2*(c1.h+c2.h+c3.h) - c4.h;
@@
-629,9
+631,9
@@
f(ModeInfo *mi, circle c1, circle c2, circle c3, circle c4)
c.x / c.e < -BIG || c.y / c.e < -BIG)
return;
p(mi, c);
c.x / c.e < -BIG || c.y / c.e < -BIG)
return;
p(mi, c);
- f(mi, c2, c3, c, c1);
- f(mi, c1, c3, c, c2);
- f(mi, c1, c2, c, c3);
+ f(mi, c2, c3, c, c1
, depth+1
);
+ f(mi, c1, c3, c, c2
, depth+1
);
+ f(mi, c1, c2, c, c3
, depth+1
);
}
ENTRYPOINT void
}
ENTRYPOINT void
@@
-768,6
+770,8
@@
init_apollonian (ModeInfo * mi)
randomize_c(i, &(cp->c3));
randomize_c(i, &(cp->c4));
#endif
randomize_c(i, &(cp->c3));
randomize_c(i, &(cp->c4));
#endif
+
+ mi->recursion_depth = -1;
}
ENTRYPOINT void
}
ENTRYPOINT void
@@
-797,16
+801,16
@@
draw_apollonian (ModeInfo * mi)
p(mi, cp->c4);
break;
case 1:
p(mi, cp->c4);
break;
case 1:
- f(mi, cp->c1, cp->c2, cp->c3, cp->c4);
+ f(mi, cp->c1, cp->c2, cp->c3, cp->c4
, 0
);
break;
case 2:
break;
case 2:
- f(mi, cp->c1, cp->c2, cp->c4, cp->c3);
+ f(mi, cp->c1, cp->c2, cp->c4, cp->c3
, 0
);
break;
case 3:
break;
case 3:
- f(mi, cp->c1, cp->c3, cp->c4, cp->c2);
+ f(mi, cp->c1, cp->c3, cp->c4, cp->c2
, 0
);
break;
case 4:
break;
case 4:
- f(mi, cp->c2, cp->c3, cp->c4, cp->c1);
+ f(mi, cp->c2, cp->c3, cp->c4, cp->c1
, 0
);
}
}
if (++cp->time > MI_CYCLES(mi))
}
}
if (++cp->time > MI_CYCLES(mi))