X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fconfig%2Flavalite.xml;h=5e7d4f7f5289c3ff4be2d674ff5a9aca36e468d4;hb=aa75c7476aeaa84cf3abc192b376a8b03c325213;hp=68011be4ebb70c7d9f533ec36999a2b4bb16372f;hpb=13dbc569cdc6e29019722c0ef9b932a925efbcad;p=xscreensaver

diff --git a/hacks/config/lavalite.xml b/hacks/config/lavalite.xml
index 68011be4..5e7d4f7f 100644
--- a/hacks/config/lavalite.xml
+++ b/hacks/config/lavalite.xml
@@ -1,27 +1,49 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<screensaver name="lavalite" _label="LavaLite">
+<screensaver name="lavalite" _label="Lavalite" gl="yes">
 
   <command arg="-root"/>
 
-  <number id="delay" type="slider" arg="-delay %"
-          _label="Speed" _low-label="Slow" _high-label="Fast"
-          low="0" high="50000" default="10000"
-          convert="invert"/>
+  <video href="https://www.youtube.com/watch?v=XKbtdHL35u0"/>
 
-  <number id="speed" type="slider" arg="-speed %"
-          _label="Activity" _low-label="Sparse" _high-label="Dense"
-          low="0.001" high="0.01" default="0.003"/>
+  <hgroup>
+   <vgroup>
+    <number id="delay" type="slider" arg="-delay %"
+            _label="Frame rate" _low-label="Low" _high-label="High"
+            low="0" high="100000" default="30000"
+            convert="invert"/>
 
-  <number id="count" type="slider" arg="-count %"
-          _label="Max Blobs" _low-label="1" _high-label="10"
-          low="1" high="10" default="3"/>
+    <number id="speed" type="slider" arg="-speed %"
+            _label="Activity" _low-label="Sparse" _high-label="Dense"
+            low="0.001" high="0.01" default="0.003"/>
+   </vgroup>
+   <vgroup>
+    <number id="count" type="slider" arg="-count %"
+            _label="Max blobs" _low-label="1" _high-label="10"
+            low="1" high="10" default="3"/>
 
-  <number id="resolution" type="slider" arg="-resolution %"
-          _label="Resolution" _low-label="Low" _high-label="High"
-          low="10" high="120" default="40"/>
+    <number id="resolution" type="slider" arg="-resolution %"
+            _label="Resolution" _low-label="Low" _high-label="High"
+            low="10" high="120" default="40"/>
+   </vgroup>
+  </hgroup>
 
-  <boolean id="wander" _label="Wander" arg-set="-wander"/>
+  <hgroup>
+   <vgroup>
+
+ <hgroup>
+  <boolean id="impatient" _label="Impatient"   arg-set="-impatient"/>
+  <boolean id="smooth"    _label="Smooth"      arg-unset="-no-smooth"/>
+  <boolean id="wander"    _label="Wander" arg-set="-wander"/>
+ </hgroup>
+
+ <hgroup>
+  <boolean id="wire"      _label="Wireframe"   arg-set="-wireframe"/>
+  <boolean id="showfps"   _label="Show frame rate" arg-set="-fps"/>
+ </hgroup>
+
+   </vgroup>
+   <vgroup>
 
   <select id="style">
     <option id="classic" _label="Classic Lavalite" arg-set="-style classic"/>
@@ -32,32 +54,37 @@
   </select>
 
   <select id="rotation">
-    <option id="no"  _label="Don't Rotate" arg-set="-no-spin"/>
-    <option id="x"   _label="Rotate around X axis"/>
-    <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="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"/>
+    <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" arg-set="-spin XYZ"/>
   </select>
 
-  <select id="render">
-    <option id="wire"     _label="Wireframe" arg-set="-wireframe"/>
-    <option id="solid"    _label="Smooth"/>
-    <option id="solid"    _label="Faceted" arg-set="-no-smooth"/>
-  </select>
+   </vgroup>
+  </hgroup>
+
+  <xscreensaver-updater />
 
   <_description>
-Draws a 3D Simulation a Lava Lite(r): odd-shaped blobs of a mysterious
+A Simulation a Lava Lite(r).  Odd-shaped blobs of a mysterious
 substance are heated, slowly rise to the top of the bottle, and then
-drop back down as they cool.  This program requires OpenGL and a fairly
-fast machine (both CPU and 3D performance.)  Written by Jamie Zawinski.
+drop back down as they cool.  This simulation requires a fairly fast
+machine (both CPU and 3D performance.)
 
 "LAVA LITE(r) and the configuration of the LAVA(r) brand motion lamp are
 registered trademarks of Haggerty Enterprises, Inc.  The configuration
 of the globe and base of the motion lamp are registered trademarks of
 Haggerty Enterprises, Inc. in the U.S.A. and in other countries around
 the world."
+
+https://en.wikipedia.org/wiki/Lava_lamp
+https://en.wikipedia.org/wiki/Metaballs
+https://en.wikipedia.org/wiki/Lavarand
+
+Written by Jamie Zawinski; 2002.
   </_description>
 </screensaver>