X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=hacks%2Fconfig%2Fhypertorus.xml;h=8ed026f42375442920913e3f92939fbf9a70f5ba;hp=1dff4d646d0d55588dbfd2d702a74a5575bee1ad;hb=019de959b265701cd0c3fccbb61f2b69f06bf9ee;hpb=3f438031d610c7e15fd33876a879b97e290e05fb

diff --git a/hacks/config/hypertorus.xml b/hacks/config/hypertorus.xml
index 1dff4d64..8ed026f4 100644
--- a/hacks/config/hypertorus.xml
+++ b/hacks/config/hypertorus.xml
@@ -1,62 +1,76 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<screensaver name="hypertorus" _label="4D Hypertorus">
+<screensaver name="hypertorus" _label="Hypertorus" gl="yes">
 
   <command arg="-root"/>
 
-  <select id="display-mode">
-    <option id="wire" _label="Wireframe Mesh"
-            arg-set="-wireframe"/>
-    <option id="surface" _label="Solid Surface"
-            arg-set="-surface"/>
-    <option id="transparent" _label="Transparent Surface"
-            arg-set="-transparent"/>
-  </select>
-
-  <select id="appearance">
-    <option id="solid" _label="Solid Object"
-            arg-set="-solid"/>
-    <option id="bands" _label="See-Through Bands"
-            arg-set="-bands"/>
-  </select>
-
-  <select id="colors">
-    <option id="twosided" _label="Two-Sided"
-            arg-set="-twosided"/>
-    <option id="colorwheel" _label="Color Wheel"
-            arg-set="-colorwheel"/>
-  </select>
-
-  <select id="projection3d">
-    <option id="perspective-3d" _label="Perspective 3d"
-            arg-set="-perspective-3d"/>
-    <option id="orthographic-3d" _label="Orthographic 3d"
-            arg-set="-orthographic-3d"/>
-  </select>
-
-  <select id="projection4d">
-    <option id="perspective-4d" _label="Perspective 4d"
-            arg-set="-perspective-4d"/>
-    <option id="orthographic-4d" _label="Orthographic 4d"
-            arg-set="-orthographic-4d"/>
-  </select>
+  <hgroup>
+  <number id="delay" type="slider" arg="-delay %"
+          _label="Frame rate" _low-label="Low" _high-label="High"
+          low="0" high="100000" default="25000"
+          convert="invert"/>
+  <boolean id="showfps" _label="Show frame rate" arg-set="-fps"/>
+  </hgroup>
+
+  <hgroup>
+    <select id="display-mode">
+      <option id="wire"        _label="Wireframe"
+              arg-set="-mode wireframe"/>
+      <option id="surface"     _label="Solid"/>
+      <option id="transparent" _label="Transparent"
+              arg-set="-mode transparent"/>
+    </select>
+
+    <select id="appearance">
+      <option id="solid" _label="Solid object"
+              arg-set="-appearance solid"/>
+      <option id="bands" _label="Transparent bands"/>
+      <option id="bands" _label="1 transparent spiral"
+              arg-set="-appearance spirals-1"/>
+      <option id="bands" _label="2 transparent spirals"
+              arg-set="-appearance spirals-2"/>
+      <option id="bands" _label="4 transparent spirals"
+              arg-set="-appearance spirals-4"/>
+      <option id="bands" _label="8 transparent spirals"
+              arg-set="-appearance spirals-8"/>
+      <option id="bands" _label="16 Transparent spirals"
+              arg-set="-appearance spirals-16"/>
+    </select>
+
+    <select id="colors">
+      <option id="twosided" _label="Two-sided" arg-set="-twosided"/>
+      <option id="colorwheel" _label="Color wheel"/>
+    </select>
+
+    <select id="projection3d">
+      <option id="perspective-3d" _label="Perspective 3D"/>
+      <option id="orthographic-3d" _label="Orthographic 3D"
+              arg-set="-orthographic-3d"/>
+    </select>
+
+    <select id="projection4d">
+      <option id="perspective-4d" _label="Perspective 4D"/>
+      <option id="orthographic-4d" _label="Orthographic 4D"
+              arg-set="-orthographic-4d"/>
+    </select>
+  </hgroup>
 
   <hgroup>
 
     <vgroup>
 
       <number id="speed-wx" type="slider" arg="-speed-wx %"
-              _label="WX Rotation Speed"
+              _label="WX rotation speed"
               _low-label="-4.0" _high-label="4.0"
               low="-4.0" high="4.0" default="1.1"/>
 
       <number id="speed-wy" type="slider" arg="-speed-wy %"
-              _label="WY Rotation Speed"
+              _label="WY rotation speed"
               _low-label="-4.0" _high-label="4.0"
               low="-4.0" high="4.0" default="1.3"/>
 
       <number id="speed-wz" type="slider" arg="-speed-wz %"
-              _label="WZ Rotation Speed"
+              _label="WZ rotation speed"
               _low-label="-4.0" _high-label="4.0"
               low="-4.0" high="4.0" default="1.5"/>
 
@@ -65,17 +79,17 @@
     <vgroup>
 
       <number id="speed-xy" type="slider" arg="-speed-xy %"
-              _label="XY Rotation Speed"
+              _label="XY rotation speed"
               _low-label="-4.0" _high-label="4.0"
               low="-4.0" high="4.0" default="1.7"/>
     
       <number id="speed-xz" type="slider" arg="-speed-xz %"
-              _label="XZ Rotation Speed"
+              _label="XZ rotation speed"
               _low-label="-4.0" _high-label="4.0"
               low="-4.0" high="4.0" default="1.9"/>
     
       <number id="speed-yz" type="slider" arg="-speed-yz %"
-              _label="YZ Rotation Speed"
+              _label="YZ rotation speed"
               _low-label="-4.0" _high-label="4.0"
               low="-4.0" high="4.0" default="2.1"/>
     
@@ -83,17 +97,18 @@
 
   </hgroup>
 
-  <number id="delay" type="slider" arg="-delay %"
-          _label="Display Speed" _low-label="Slow" _high-label="Fast"
-          low="0" high="40000" default="25000"
-          convert="invert"/>
-
-  <boolean id="showfps" _label="Show Frames-per-Second" arg-set="-fps"/>
+  <xscreensaver-updater />
 
   <_description>
-This program shows a rotating Clifford Torus: a torus lying on the
-"surface" of a 4D hypersphere.  Written by Carsten Steger, inspired by
-Thomas Banchoff's book "Beyond the Third Dimension: Geometry, Computer
-Graphics, and Higher Dimensions", Scientific American Library, 1990.
+This shows a rotating Clifford Torus: a torus lying on the
+"surface" of a 4D hypersphere.  Inspired by Thomas Banchoff's book
+"Beyond the Third Dimension: Geometry, Computer Graphics, and Higher
+Dimensions", Scientific American Library, 1990.
+
+http://en.wikipedia.org/wiki/N-sphere
+http://en.wikipedia.org/wiki/Clifford_torus
+http://en.wikipedia.org/wiki/Regular_polytope
+
+Written by Carsten Steger; 2003.
   </_description>
 </screensaver>