X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fconfig%2Fjuggler3d.xml;h=65f1974335481c96353a0cc19de9c9aa6cf4fb61;hb=6afd6db0ae9396cd7ff897ade597cd5483f49b0e;hp=b2822ba3df5da359920622aae1f101112722578f;hpb=0d6b320def9180cf907ceaed56b23a972a11b757;p=xscreensaver

diff --git a/hacks/config/juggler3d.xml b/hacks/config/juggler3d.xml
index b2822ba3..65f19743 100644
--- a/hacks/config/juggler3d.xml
+++ b/hacks/config/juggler3d.xml
@@ -1,34 +1,53 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<screensaver name="juggler3d" _label="Juggler3D">
+<screensaver name="juggler3d" _label="Juggler3D" gl="yes">
   <command arg="-root"/>
 
-	<number id="speed" type="slider" arg="-speed %" _label="Juggling Speed"
-		_low-label="Slow" _high-label="Fast" low="0.5" high="5.0" default="2.2"/>
-		  
-	<number id="trans" type="slider" arg="-trans %" _label="Juggler Horizontal Speed"
-		_low-label="Slow" _high-label="Fast" low="0.05" high="2.0" default="0.1"/>
-
-	<number id="spin" type="slider" arg="-spin %" _label="Juggler Spin Speed"
-		_low-label="Slow" _high-label="Fast" low="3.0" high="50.0" default="20.0"/>
-
-	<number id="minobjs" type="spinbutton" arg="-minobjs %" _label="Min Objects"
-          low="3" high="35" default="8"/>
-
-	<number id="maxobjs" type="spinbutton" arg="-maxobjs %" _label="Max Objects"
-          low="3" high="35" default="8"/>		  
-
-	<number id="minhinc" type="spinbutton" arg="-minhinc %" _label="Min Height"
-          low="1" high="31" default="2"/>
-		  
-	<number id="maxhinc" type="spinbutton" arg="-maxhinc %" _label="Max Height"
-          low="1" high="31" default="6"/>		  
-
-	<boolean id="wire"   _label="Wireframe" arg-set="-wireframe"/>
-	<boolean id="showfps" _label="Show Frames-per-Second" arg-set="-fps"/>
-
-	<_description>
-3D simulation of a juggler performing with balls, clubs and rings.  Written
-by Brian Apps and partially based on his Win32 Juggle Saver program.
-	</_description>
+  <hgroup>
+   <vgroup>
+    <number id="delay" type="slider" arg="-delay %"
+            _label="Frame rate" _low-label="Low" _high-label="High"
+            low="0" high="100000" default="10000"
+            convert="invert"/>
+
+    <number id="count" type="slider" arg="-count %"
+            _label="Speed" _low-label="Slow" _high-label="Fast"
+            low="50" high="1000" default="200"
+            convert="invert"/>
+   </vgroup>
+   <vgroup>
+    <number id="cycles" type="slider" arg="-cycles %"
+            _label="Performance length" _low-label="Short" _high-label="Long"
+            low="50" high="1000" default="1000"/>
+
+    <number id="tail" type="slider" arg="-tail %"
+            _label="Trail length" _low-label="None" _high-label="Long"
+            low="0" high="100" default="1"/>
+   </vgroup>
+  </hgroup>
+
+  <hgroup>
+    <boolean id="balls" _label="Balls" arg-unset="-no-balls"/>
+    <boolean id="clubs" _label="Clubs" arg-unset="-no-clubs"/>
+    <boolean id="rings" _label="Rings" arg-unset="-no-rings"/>
+    <boolean id="knives" _label="Knives" arg-unset="-no-knives"/>
+<!--<boolean id="torches" _label="Flaming torches" arg-unset="-no-torches"/>-->
+    <boolean id="bballs" _label="Bowling balls" arg-unset="-no-bballs"/>
+  </hgroup>
+
+  <boolean id="describe" _label="Print Cambridge juggling pattern descriptions" arg-unset="-no-describe"/>
+  <string id="pattern" _label="Juggle this pattern" arg="-pattern %" />
+
+  <boolean id="showfps" _label="Show frame rate" arg-set="-fps"/>
+
+  <xscreensaver-updater />
+
+  <_description>
+A 3D juggling stick-man, with Cambridge juggling pattern
+notation used to describe the patterns he juggles.
+
+http://en.wikipedia.org/wiki/Siteswap
+
+Written by Tim Auckland and Jamie Zawinski; 2002.
+  </_description>
 </screensaver>