X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=hacks%2Fconfig%2Fifs.xml;h=488fd3bc21c5668b21936373d087941a7cccaa56;hp=59b251fcc630e87fecb347aabea1c3296def81c0;hb=019de959b265701cd0c3fccbb61f2b69f06bf9ee;hpb=447db08c956099b3b183886729108bf5b364c4b8

diff --git a/hacks/config/ifs.xml b/hacks/config/ifs.xml
index 59b251fc..488fd3bc 100644
--- a/hacks/config/ifs.xml
+++ b/hacks/config/ifs.xml
@@ -5,41 +5,59 @@
   <command arg="-root"/>
 
   <number id="delay" type="slider" arg="-delay %"
-    _label="Speed" _low-label="Slow" _high-label="Fast"
-    low="0" high="40000" default="10000"
+    _label="Frame rate" _low-label="Low" _high-label="High"
+    low="0" high="100000" default="20000"
     convert="invert"/>
 
-  <number id="functions" type="spinbutton" arg="-functions %"
-    _label="Functions" low="2" high="6" default="3"/>
-
-  <number id="detail" type="spinbutton" arg="-detail %"
-    _label="Detail" low="2" high="30" default="9"/>
-    
-  <boolean id="translate" _label="Translate" arg-unset="-notranslate"/>
-  <boolean id="scale" _label="Scale" arg-unset="-noscale"/>
-  <boolean id="rotate" _label="Rotate" arg-unset="-norotate"/>
-    
-  <select id="colour mode">
-    <option id="blend"    _label="Blend"    arg-set="-mode 0"/>
-    <option id="function" _label="Function" arg-set="-mode 1"/>
-    <option id="single"   _label="Single" arg-set="-mode 2"/>
-  </select>
-  
+  <number id="functions" type="slider" arg="-functions %"
+    _label="Number of functions" _low-label="2" _high-label="6"
+           low="2" high="6" default="3"/>
+
+  <number id="detail" type="slider" arg="-detail %"
+    _label="Detail" _low-label="Low" _high-label="High"
+    low="4" high="14" default="9"/>
+
+<!--
+  On a 2.93 gHz iMac i7, I get these rates with -delay 0:
+
+    detail 3:  invisible
+    detail 4:  barely visible
+    detail 5:  1000+ fps, looks like noise at -delay 0, ok at -delay 20000
+    detail 8:  ~700+ fps
+    detail 9:  ~400 fps
+    detail 10: ~300 fps
+    detail 11: ~100 fps
+    detail 12:  ~50 fps
+    detail 13:  ~17 fps
+    detail 14:   ~8 fps
+    detail 15:   ~2 fps
+
+  With the default -delay, CPU load only starts causing the frame rate
+  to drop below 30 fps detail 12 or higher.
+-->
+
   <number id="colors" type="slider" arg="-colors %"
-    _label="Number of Colours" _low-label="2" _high-label="Many"
+    _label="Number of colors" _low-label="2" _high-label="Many"
     low="2" high="255" default="200" />
 
+  <hgroup>
+   <boolean id="translate" _label="Translate" arg-unset="-no-translate"/>
+   <boolean id="scale"     _label="Scale"     arg-unset="-no-scale"/>
+   <boolean id="rotate"    _label="Rotate"    arg-unset="-no-rotate"/>
+   <boolean id="showfps" _label="Show frame rate" arg-set="-fps"/>
+  </hgroup>
+
+  <xscreensaver-updater />
+
   <_description>
 
-This one draws spinning, colliding iterated-function-system images.
+Clouds of iterated function systems spin and collide.
 
-Note that the "quality" parameter is exponential.  Number of points
+Note that the "Detail" parameter is exponential.  Number of points
 drawn is functions^detail.
 
-The number of colours is only used in Blend mode to provide a palette
-to create the base colours.  These are then blended together in a
-non-colourmap friendly fashion.
+http://en.wikipedia.org/wiki/Iterated_function_system
 
-Written by Chris Le Sueur.
+Written by Chris Le Sueur and Robby Griffin; 1997.
   </_description>
 </screensaver>