X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fconfig%2Fpipes.xml;h=2fa82e23f5d06f75b9fadb38abce7f54708f6656;hb=6f5482d73adb0165c0130bb47d852644ab0c4869;hp=6cce501b3f4bdcb0390a758dce9f960d11a88f74;hpb=49f5b54f312fe4ac2e9bc47581a72451bd0e8439;p=xscreensaver

diff --git a/hacks/config/pipes.xml b/hacks/config/pipes.xml
index 6cce501b..2fa82e23 100644
--- a/hacks/config/pipes.xml
+++ b/hacks/config/pipes.xml
@@ -1,37 +1,41 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<screensaver name="pipes" _label="Pipes">
+<screensaver name="pipes" _label="Pipes" gl="yes">
 
   <command arg="-root"/>
 
-  <select id="style">
-    <option id="curves" _label="Curved Pipes"   arg-set="-count 0"/>
-    <option id="balls"  _label="Ball Joints"    arg-set="-count 1"/>
-    <option id="fit"    _label="Bolted Fittings"/>
-  </select>
+  <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="size" type="slider" arg="-cycles %"
-          _label="Number of Pipes" _low-label="One" _high-label="A Hundred"
-          low="1" high="100" default="10"/>
+  <number id="cycles" type="slider" arg="-cycles %"
+          _label="Number of pipes" _low-label="One" _high-label="A hundred"
+          low="1" high="100" default="5"/>
 
   <number id="size" type="slider" arg="-size %"
-          _label="Pipe Length" _low-label="Short" _high-label="Long"
+          _label="Pipe length" _low-label="Short" _high-label="Long"
           low="0" high="3000" default="500"/>
 
   <number id="factory" type="slider" arg="-factory %"
           _label="Gadgetry" _low-label="None" _high-label="Lots"
           low="0" high="10" default="2"/>
 
-  <number id="delay" type="slider" arg="-delay %"
-          _label="Speed" _low-label="Slow" _high-label="Fast"
-          low="0" high="80000" default="10000"
-          convert="invert"/>
+  <hgroup>
+   <boolean id="fisheye" _label="Fisheye lens" arg-unset="-no-fisheye"/>
+   <boolean id="tight"   _label="Allow tight turns" arg-set="-tightturns"/>
+   <select id="style">
+    <option id="curves" _label="Curved pipes"   arg-set="-count 3"/>
+    <option id="balls"  _label="Ball joints"    arg-set="-count 1"/>
+    <option id="fit"    _label="Bolted fittings"/>
+    <option id="random" _label="Random style"   arg-set="-count 0"/>
+   </select>
+  </hgroup>
 
   <hgroup>
-   <boolean id="fisheye" _label="Fisheye Lens" arg-unset="-no-fisheye"/>
-   <boolean id="tight"   _label="Allow Tight Turns" arg-set="-tightturns"/>
+   <boolean id="showfps" _label="Show frame rate" arg-set="-fps"/>
+   <boolean id="wire"    _label="Wireframe" arg-set="-wireframe"/>
   </hgroup>
-   <boolean id="showfps" _label="Show Frames-per-Second" arg-set="-fps"/>
 
   <_description>
 A growing plumbing system, with bolts and valves.