X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=hacks%2Fconfig%2Fcubenetic.xml;h=3d22cbb0094685d0b8563a36e8a3480f341f759a;hp=3be42f5ccd09ab510a295a57ec70bc75076f8574;hb=019de959b265701cd0c3fccbb61f2b69f06bf9ee;hpb=cccbddbc4140cf9a06d7d95cc5c0ca36eb5d6e28

diff --git a/hacks/config/cubenetic.xml b/hacks/config/cubenetic.xml
index 3be42f5c..3d22cbb0 100644
--- a/hacks/config/cubenetic.xml
+++ b/hacks/config/cubenetic.xml
@@ -1,56 +1,65 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<screensaver name="cubenetic" _label="Cubenetic">
+<screensaver name="cubenetic" _label="Cubenetic" gl="yes">
 
   <command arg="-root"/>
 
-  <number id="speed" type="slider" arg="-delay %"
-          _label="Speed" _low-label="Slow" _high-label="Fast"
-          low="0" high="50000" default="30000"
-          convert="invert"/>
-
-  <number id="count" type="slider" arg="-count %"
-          _label="Boxes" _low-label="Few" _high-label="Many"
-          low="1" high="20" default="5"/>
-
-  <boolean id="wander" _label="Wander" arg-unset="-no-wander"/>
-
-  <select id="rotation">
-    <option id="no"  _label="Don't Rotate" arg-set="-no-spin"/>
-    <option id="x"   _label="Rotate around X axis" arg-set="-spin X"/>
-    <option id="y"   _label="Rotate around Y axis" arg-set="-spin Y"/>
-    <option id="z"   _label="Rotate around Z axis" arg-set="-spin Z"/>
-    <option id="xy"  _label="Rotate around X and Y axes" arg-set="-spin XY"/>
-    <option id="xz"  _label="Rotate around X and Z axes" arg-set="-spin XZ"/>
-    <option id="yz"  _label="Rotate around Y and Z axes" arg-set="-spin YZ"/>
-    <option id="xyz" _label="Rotate around all three axes"/>
-  </select>
-
-  <select id="render">
-    <option id="wire"     _label="Display Wireframe" arg-set="-wireframe"/>
-    <option id="textured" _label="Display Surface Patterns"/>
-    <option id="solid"    _label="Display Solid Colors" arg-set="-no-texture"/>
-  </select>
-
-  <number id="wave-speed" type="slider" arg="-wave-speed %"
-          _label="Surface Pattern Speed" _low-label="Slow" _high-label="Fast"
-          low="5" high="150" default="80"/>
-
-  <number id="wave-radius" type="slider" arg="-wave-radius %"
-          _label="Surface Pattern Overlap"
-          _low-label="Small" _high-label="Large"
-          low="5" high="600" default="512"/>
-
-  <number id="waves" type="slider" arg="-waves %"
-          _label="Surface Pattern Complexity"
-          _low-label="Low" _high-label="High"
-          low="1" high="20" default="3"/>
-
-  <boolean id="showfps" _label="Show Frames-per-Second" arg-set="-fps"/>
+  <hgroup>
+   <vgroup>
+    <number id="delay" type="slider" arg="-delay %"
+            _label="Frame rate" _low-label="Low" _high-label="High"
+            low="0" high="100000" default="20000"
+            convert="invert"/>
+
+    <number id="count" type="slider" arg="-count %"
+            _label="Boxes" _low-label="Few" _high-label="Many"
+            low="1" high="20" default="5"/>
+
+    <hgroup>
+     <boolean id="wander" _label="Wander" arg-unset="-no-wander"/>
+
+     <select id="rotation">
+       <option id="no"  _label="Don't rotate"               arg-set="-spin 0"/>
+       <option id="x"   _label="Rotate around X axis"       arg-set="-spin X"/>
+       <option id="y"   _label="Rotate around Y axis"       arg-set="-spin Y"/>
+       <option id="z"   _label="Rotate around Z axis"       arg-set="-spin Z"/>
+       <option id="xy"  _label="Rotate around X and Y axes" arg-set="-spin XY"/>
+       <option id="xz"  _label="Rotate around X and Z axes" arg-set="-spin XZ"/>
+       <option id="yz"  _label="Rotate around Y and Z axes" arg-set="-spin YZ"/>
+       <option id="xyz" _label="Rotate around all three axes"/>
+     </select>
+    </hgroup>
+   </vgroup>
+
+   <vgroup>
+    <number id="wave-speed" type="slider" arg="-wave-speed %"
+            _label="Surface pattern speed" _low-label="Slow" _high-label="Fast"
+            low="5" high="150" default="80"/>
+
+    <number id="wave-radius" type="slider" arg="-wave-radius %"
+            _label="Surface pattern overlap"
+            _low-label="Small" _high-label="Large"
+            low="5" high="600" default="512"/>
+
+    <number id="waves" type="slider" arg="-waves %"
+            _label="Surface pattern complexity"
+            _low-label="Low" _high-label="High"
+            low="1" high="20" default="3"/>
+   </vgroup>
+  </hgroup>
+
+  <hgroup>
+   <boolean id="tex"     _label="Textured"  arg-unset="-no-texture"/>
+   <boolean id="wire"    _label="Wireframe"   arg-set="-wireframe"/>
+   <boolean id="showfps" _label="Show frame rate" arg-set="-fps"/>
+  </hgroup>
+
+  <xscreensaver-updater />
 
   <_description>
 Draws a pulsating set of overlapping boxes with ever-chaning blobby
 patterns undulating across their surfaces.  It's sort of a cubist Lavalite.
-Written by Jamie Zawinski.
+
+Written by Jamie Zawinski; 2002.
   </_description>
 </screensaver>