X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fconfig%2Fcube21.xml;h=1be63e26ee0e5b0da8a87ce18a91a3f5d71471b1;hb=6afd6db0ae9396cd7ff897ade597cd5483f49b0e;hp=78ae0d2b08b5aff8eb46c31053258f91c5a5cbb4;hpb=49f5b54f312fe4ac2e9bc47581a72451bd0e8439;p=xscreensaver

diff --git a/hacks/config/cube21.xml b/hacks/config/cube21.xml
index 78ae0d2b..1be63e26 100644
--- a/hacks/config/cube21.xml
+++ b/hacks/config/cube21.xml
@@ -1,60 +1,74 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<screensaver name="cube21" _label="Cube 21">
+<screensaver name="cube21" _label="Cube21" gl="yes">
 
   <command arg="-root"/>
 
-  <number id="cubesize" type="slider" arg="-cubesize %"
-    _label="Cube size" _low-label="Small" _high-label="Large"
-    low="0.4" high="1.0" default="0.7"/>  
-
-  <number id="speed" type="slider" arg="-delay %"
-    _label="Global speed" _low-label="Slow" _high-label="Fast"
-    low="0" high="30000" default="20000" convert="invert"/>
-
-  <number id="rotspeed" type="slider" arg="-rotspeed %"
-    _label="Rotation" _low-label="Slow" _high-label="Fast"
-    low="1.0" high="10.0" default="3.0"/>
-
-  <number id="wanderspeed" type="slider" arg="-wanderspeed %"
-    _label="Wandering" _low-label="Slow" _high-label="Fast"
-    low="0.3" high="3.0" default="1.0"/>  
-
-  <number id="spinspeed" type="slider" arg="-spinspeed %"
-    _label="Spinning" _low-label="Slow" _high-label="Fast"
-    low="0.5" high="4.0" default="1.0"/>  
-
-  <number id="wait" type="slider" arg="-wait %"
-    _label="Delay in ending position" _low-label="Short" _high-label="Long"
-    low="10.0" high="100.0" default="40.0"/>
-
-  <select id="start">
-    <option id="cube"    _label="Start as cube" arg-set="-no-randomize"/>
-    <option id="shuffle" _label="Start as random shape"/>
-  </select>
-
-  <select id="colors">
-    <option id="white" _label="White"  arg-set="-colormode white"/>
-    <option id="one"   _label="Random color" arg-set="-colormode rnd"/>
-    <option id="se"    _label="Silver Edition" arg-set="-colormode se"/>
-    <option id="two"   _label="Two random colors" arg-set="-colormode two"/>
-    <option id="ce"    _label="Classic Edition" arg-set="-colormode ce"/>
-    <option id="six"   _label="Six random colors"/>
-  </select>
-  
   <hgroup>
-  <boolean id="spin"    _label="Spin"                   arg-unset="-no-spin"/>
-  <boolean id="wander"  _label="Wander"                 arg-unset="-no-wander"/>
-  <boolean id="tex"     _label="Textured"               arg-unset="-no-texture"/>
-  </hgroup>
-  <hgroup>
-  <boolean id="wire"    _label="Wireframe"              arg-set="-wireframe"/>
-  <boolean id="showfps" _label="Show Frames-per-Second" arg-set="-fps"/>
+   <vgroup>
+
+    <number id="speed" type="slider" arg="-delay %"
+      _label="Frame rate" _low-label="Low" _high-label="High"
+      low="0" high="100000" default="20000" convert="invert"/>
+
+    <number id="cubesize" type="slider" arg="-cubesize %"
+      _label="Cube size" _low-label="Small" _high-label="Large"
+      low="0.4" high="1.0" default="0.7"/>  
+
+    <number id="rotspeed" type="slider" arg="-rotspeed %"
+      _label="Rotation" _low-label="Slow" _high-label="Fast"
+      low="1.0" high="10.0" default="3.0"/>
+
+    <select id="start">
+      <option id="cube"    _label="Start as cube" arg-set="-no-randomize"/>
+      <option id="shuffle" _label="Start as random shape"/>
+    </select>
+
+    <select id="colors">
+      <option id="white" _label="White"  arg-set="-colormode white"/>
+      <option id="one"   _label="Random color" arg-set="-colormode rnd"/>
+      <option id="se"    _label="Silver edition" arg-set="-colormode se"/>
+      <option id="two"   _label="Two random colors" arg-set="-colormode two"/>
+      <option id="ce"    _label="Classic edition" arg-set="-colormode ce"/>
+      <option id="six"   _label="Six random colors"/>
+    </select>
+
+   </vgroup>
+   <vgroup>
+
+    <number id="spinspeed" type="slider" arg="-spinspeed %"
+      _label="Spin" _low-label="Slow" _high-label="Fast"
+      low="0.01" high="4.0" default="1.0"/>
+
+    <number id="wanderspeed" type="slider" arg="-wanderspeed %"
+      _label="Wander" _low-label="Slow" _high-label="Fast"
+      low="0.001" high="0.1" default="0.02"/>
+
+    <number id="wait" type="slider" arg="-wait %"
+      _label="Linger" _low-label="Short" _high-label="Long"
+      low="10.0" high="100.0" default="40.0"/>
+
+    <hgroup>
+     <boolean id="spin"    _label="Spin"     arg-unset="-no-spin"/>
+     <boolean id="wander"  _label="Wander"   arg-unset="-no-wander"/>
+     <boolean id="tex"     _label="Outlines" arg-unset="-no-texture"/>
+    </hgroup>
+    <hgroup>
+     <boolean id="wire"    _label="Wireframe"      arg-set="-wireframe"/>
+     <boolean id="showfps" _label="Show frame rate" arg-set="-fps"/>
+    </hgroup>
+
+   </vgroup>
   </hgroup>
 
+  <xscreensaver-updater />
+
   <_description>
-Animates a Rubik-like puzzle known as Cube 21 or Square-1.
-The rotations are chosen randomly.
+The "Cube 21" Rubik-like puzzle, also known as "Square-1".
+The rotations are chosen randomly.  See also the "Rubik",
+"RubikBlocks" and "GLSnake" screen savers.
+
+http://en.wikipedia.org/wiki/Square_One_%28puzzle%29
 
 Written by Vasek Potocek; 2005.
   </_description>