X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=hacks%2Fconfig%2Fskytentacles.xml;h=132cb317fff0d26e1f30d885bd2587e05540d115;hp=e6fd19f6c855244e5d4812d5634524371c1c9678;hb=019de959b265701cd0c3fccbb61f2b69f06bf9ee;hpb=de460e831dc8578acfa8b72251ab9346c99c1f96

diff --git a/hacks/config/skytentacles.xml b/hacks/config/skytentacles.xml
index e6fd19f6..132cb317 100644
--- a/hacks/config/skytentacles.xml
+++ b/hacks/config/skytentacles.xml
@@ -1,62 +1,69 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<screensaver name="skytentacles" _label="SkyTentacles">
+<screensaver name="skytentacles" _label="SkyTentacles" gl="yes">
 
   <command arg="-root"/>
 
+ <hgroup>
+  <vgroup>
   <number id="count" type="slider" arg="-count %"
           _label="Tentacles" _low-label="1" _high-label="20"
           low="1" high="20" default="9"/>
 
- <hgroup>
-  <vgroup>
-   <number id="delay" type="slider" arg="-delay %"
-           _label="Frame Rate" _low-label="Slow" _high-label="Fast"
-           low="0" high="100000" default="30000"
-           convert="invert"/>
-
    <number id="length" type="slider" arg="-length %"
            _label="Length" _low-label="Short" _high-label="Long"
            low="1.0" high="20.0" default="9.0"/>
 
+   <number id="thickness" type="slider" arg="-thickness %"
+           _label="Thickness" _low-label="Thin" _high-label="Thick"
+           low="0.1" high="5.0" default="1.0"/>
+
+   <number id="flexibility" type="slider" arg="-flexibility %"
+           _label="Flexibility" _low-label="Low" _high-label="High"
+           low="0.1" high="1.0" default="0.35"/>
+
    <number id="wiggliness" type="slider" arg="-wiggliness %"
            _label="Wiggliness" _low-label="Low" _high-label="High"
            low="0.1" high="1.0" default="0.35"/>
 
-    <hgroup>
-     <number id="slices" type="spinbutton" arg="-slices %"
-             _label="Slices" low="1" high="50" default="32"/>
-     <number id="segments" type="spinbutton" arg="-segments %"
-             _label="Segments" low="1" high="50" default="32"/>
-    </hgroup>
-
   </vgroup>
 
   <vgroup>
+   <number id="delay" type="slider" arg="-delay %"
+           _label="Frame rate" _low-label="Slow" _high-label="Fast"
+           low="0" high="100000" default="30000"
+           convert="invert"/>
+
    <number id="speed" type="slider" arg="-speed %"
            _label="Speed" _low-label="Slow" _high-label="Fast"
-           low="0.1" high="20.0" default="1.0"/>
+           low="0.1" high="8.0" default="1.0"/>
+
+   <number id="slices" type="slider" arg="-slices %"
+           _label="X resolution" _low-label="Low" _high-label="High"
+           low="3" high="50" default="16"/>
+   <number id="segments" type="slider" arg="-segments %"
+           _label="Y resolution" _low-label="Low" _high-label="High"
+           low="2" high="50" default="24"/>
+
+   <hgroup>
+    <boolean id="skin" _label="Draw skin"           arg-unset="-no-texture"/>
+    <boolean id="cel"  _label="Cartoony"            arg-set="-cel"/>
+    <boolean id="intersect" _label="Tentacles can intersect" arg-set="-intersect"/>
+   </hgroup>
+   <hgroup>
+    <boolean id="smooth" _label="Smooth"           arg-unset="-no-smooth"/>
+    <boolean id="showfps" _label="Show frame rate" arg-set="-fps"/>
+   </hgroup>
 
-   <number id="thickness" type="slider" arg="-thickness %"
-           _label="Thickness" _low-label="Thin" _high-label="Thick"
-           low="0.1" high="5.0" default="1.0"/>
-
-   <number id="flexibility" type="slider" arg="-flexibility %"
-           _label="Flexibility" _low-label="Low" _high-label="High"
-           low="0.1" high="1.0" default="0.35"/>
-
-    <hgroup>
-     <boolean id="smooth" _label="Smooth" arg-unset="-no-smooth"/>
-     <boolean id="showfps" _label="Show Frames-per-Second" arg-set="-fps"/>
-    </hgroup>
+  </vgroup>
+ </hgroup>
 
-   </vgroup>
-  </hgroup>
 
+  <xscreensaver-updater />
 
-  <_description>
+ <_description>
 There is a tentacled abomination in the sky.   From above you it devours.
 
 Written by Jamie Zawinski; 2008.
-  </_description>
+ </_description>
 </screensaver>