X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=hacks%2Fconfig%2Fjigglypuff.xml;h=45634466162ebfb7d43e7bb9e16b0940068f586f;hp=02a7e149eaf79a97d9ef263b097efb831a9434cc;hb=019de959b265701cd0c3fccbb61f2b69f06bf9ee;hpb=49f5b54f312fe4ac2e9bc47581a72451bd0e8439

diff --git a/hacks/config/jigglypuff.xml b/hacks/config/jigglypuff.xml
index 02a7e149..45634466 100644
--- a/hacks/config/jigglypuff.xml
+++ b/hacks/config/jigglypuff.xml
@@ -1,69 +1,72 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<screensaver name="jigglypuff" _label="JigglyPuff">
+<screensaver name="jigglypuff" _label="JigglyPuff" gl="yes">
 
   <command arg="-root"/>
 
- <boolean id="random" _label="Randomize Almost Everything" arg-unset="-no-random"/>
+  <hgroup>
+   <boolean id="random" _label="Randomize almost everything" arg-unset="-no-random"/>
+
+   <select id="color">
+    <option id="cycle"     _label="Cycle" />
+    <option id="flowerbox" _label="Flower box" arg-set="-color flowerbox"/>
+    <option id="clownbarf" _label="Clown barf" arg-set="-color clownbarf"/>
+    <option id="chrome" _label="Chrome" arg-set="-color chrome"/>
+   </select>
+
+   <select id="start">
+    <option id="sphere" _label="Sphere" />
+    <option id="tetrahedron" _label="Tetrahedron" arg-set="-tetra"/>
+   </select>
+
+   <boolean id="wireframe" _label="Wireframe" arg-set="-wireframe"/>
+   <boolean id="showfps" _label="Show frame rate" arg-set="-fps"/>
+
+  </hgroup>
 
   <hgroup>
    <vgroup>
-
-      <number id="complexity" type="slider" arg="-complexity %"
-              _label="Complexity" _low-label="Low" _high-label="High"
-              low="1" high="3" default="2"/>
+      <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="speed" type="slider" arg="-speed %"
               _label="Rotation speed" _low-label="Slow" _high-label="Fast"
-              low="50" high="1000" default="250"/>
+              low="50" high="1000" default="500"/>
 
-      <number id="spherism" type="slider" arg="-spherism %"
-               _label="Sphere strength" _low-label="none" _high-label="strong"
-               low="0" high="1000" default="200"/>
+      <number id="damping" type="slider" arg="-damping %"
+               _label="Inertial damping" _low-label="Low" _high-label="High"
+               low="10" high="1000" default="500" convert="invert"/>
+   </vgroup>
 
+   <vgroup>
       <number id="hold" type="slider" arg="-hold %"
-               _label="Vertex-vertex force" _low-label="none" _high-label="strong"
-               low="0" high="1000" default="700"/>
+               _label="Vertex-vertex force" _low-label="None" _high-label="Strong"
+               low="0" high="1000" default="800"/>
 
+      <number id="complexity" type="slider" arg="-complexity %"
+              _label="Complexity" _low-label="Low" _high-label="High"
+              low="1" high="3" default="2"/>
+
+      <number id="spherism" type="slider" arg="-spherism %"
+               _label="Sphere strength" _low-label="None" _high-label="Strong"
+               low="0" high="1000" default="75"/>
     </vgroup>
-    <vgroup>
 
+    <vgroup>
       <number id="distance" type="slider" arg="-distance %"
-               _label="Vertex-vertex behavior" _low-label="expand"
-               _high-label="collapse" low="0" high="1000" default="300"/>
-
-      <number id="damping" type="slider" arg="-damping %"
-               _label="Inertial damping" _low-label="Low" _high-label="High"
-               low="10" high="1000" default="500" convert="invert"/>
+               _label="Vertex-vertex behavior" _low-label="Expand"
+               _high-label="Collapse" low="0" high="1000" default="100"/>
 
       <number id="spooky" type="slider" arg="-spooky %"
                _label="Spookiness" _low-label="None" _high-label="Spoooooky"
                low="0" high="12" default="0"/>
 
-    <hgroup>
-     <select id="color">
-      <option id="cycle"     _label="Cycle" />
-      <option id="flowerbox" _label="Flower box" arg-set="-color flowerbox"/>
-      <option id="clownbarf" _label="Clown barf" arg-set="-color clownbarf"/>
-      <option id="chrome" _label="Chrome" arg-set="-color chrome"/>
-     </select>
-
-     <select id="start">
-      <option id="sphere" _label="Sphere" />
-      <option id="tetrahedron" _label="Tetrahedron" arg-set="-tetra"/>
-     </select>
-    </hgroup>
-
-    <boolean id="wireframe" _label="Wireframe" arg-set="-wireframe"/>
-    <boolean id="showfps" _label="Show Frames-per-Second" arg-set="-fps"/>
-
     </vgroup>
   </hgroup>
 
-  <number id="delay" type="slider" arg="-delay %"
-          _label="Animation Speed" _low-label="Slow" _high-label="Fast"
-          low="0" high="20000" default="20000"
-          convert="invert"/>
+  <xscreensaver-updater />
 
   <_description>
 This does bad things with quasi-spherical objects.
@@ -71,11 +74,10 @@ This does bad things with quasi-spherical objects.
 You have a tetrahedron with tesselated faces.  The vertices on these
 faces have forces on them: one proportional to the distance from the
 surface of a sphere; and one proportional to the distance from the
-neighbors.  They also have inertia.
-
-The resulting effect can range from a shape that does nothing, to a
-frenetic polygon storm.  Somewhere in between there it usually
-manifests as a blob that jiggles in a kind of disturbing manner.
+neighbors.  They also have inertia.  The resulting effect can range
+from a shape that does nothing, to a frenetic polygon storm.
+Somewhere in between there it usually manifests as a blob that jiggles
+in a kind of disturbing manner.
 
 Written by Keith Macleod; 2003.
   </_description>