X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=hacks%2Fjulia.c;h=8e12cd8c9ea9a012e9aa86ae45f38dae39b6c45b;hp=6a7323def51dc9687448082d5dec6f87a180cfaf;hb=07faf451b99879183ed7e909e43a0e065be1ee7f;hpb=49f5b54f312fe4ac2e9bc47581a72451bd0e8439

diff --git a/hacks/julia.c b/hacks/julia.c
index 6a7323de..8e12cd8c 100644
--- a/hacks/julia.c
+++ b/hacks/julia.c
@@ -20,6 +20,7 @@ static const char sccsid[] = "@(#)julia.c	4.03 97/04/10 xlockmore";
  * other special, indirect and consequential damages.
  *
  * Revision History:
+ * 10-Jun-06: j.grahl@ucl.ac.uk: tweaked functions for parameter of Julia set
  * 28-May-97: jwz@jwz.org: added interactive frobbing with the mouse.
  * 10-May-97: jwz@jwz.org: turned into a standalone program.
  * 02-Dec-95: snagged boilerplate from hop.c
@@ -159,6 +160,7 @@ incr(ModeInfo * mi, juliastruct * jp)
 	else
 	  {
 	  NOTRACK:
+#if 0
 		jp->cr = 1.5 * (sin(M_PI * (jp->inc / 300.0)) *
 						sin(jp->inc * M_PI / 200.0));
 		jp->ci = 1.5 * (cos(M_PI * (jp->inc / 300.0)) *
@@ -166,6 +168,15 @@ incr(ModeInfo * mi, juliastruct * jp)
 
 		jp->cr += 0.5 * cos(M_PI * jp->inc / 400.0);
 		jp->ci += 0.5 * sin(M_PI * jp->inc / 400.0);
+#else
+        jp->cr = 1.5 * (sin(M_PI * (jp->inc / 290.0)) *
+                        sin(jp->inc * M_PI / 210.0));
+        jp->ci = 1.5 * (cos(M_PI * (jp->inc / 310.0)) *
+                        cos(jp->inc * M_PI / 190.0));
+
+        jp->cr += 0.5 * cos(M_PI * jp->inc / 395.0);
+        jp->ci += 0.5 * sin(M_PI * jp->inc / 410.0);
+#endif
 	  }
 }