ftp://ftp.krokus.ru/pub/OpenBSD/distfiles/xscreensaver-4.21.tar.gz

[xscreensaver] / hacks / glx / circuit.c

diff --git a/hacks/glx/circuit.c b/hacks/glx/circuit.c
index e7ee382b80daae3fb04d1771578bf2c1e03b1c82..6cf0d73b90436a33bbd75248e06a2fd97d6ac3e6 100644 (file)
--- a/hacks/glx/circuit.c
+++ b/hacks/glx/circuit.c
@@ -46,16 +46,8 @@
 #define DEF_SEVEN       "False"
 #define DEF_PARTS       "10"
 
-
-#define DEFAULTS        "*parts:      " DEF_PARTS " \n" \
-                        "*spin:       " DEF_SPIN   "\n" \
-                        "*delay:       20000       \n" \
-                        "*showFPS:       False       \n" \
-                        "*seven:      " DEF_SEVEN  "\n" \
-                        "*light:      True  \n" \
-                        "*rotate:      False\n" \
-                        "*font:      fixed\n" \
-                        "*rotatespeed:      1\n" \
+#define DEFAULTS        "*delay:   20000 \n" \
+                        "*showFPS: False \n"
 
 # include "xlockmore.h"                         /* from the xscreensaver distribution */
 #else  /* !STANDALONE */
@@ -91,14 +83,14 @@ static XrmOptionDescRec opts[] = {
   {"-parts", ".circuit.parts", XrmoptionSepArg, "10" },
   {"-font", ".circuit.font", XrmoptionSepArg, "fixed" },
   {"-rotate-speed", ".circuit.rotatespeed", XrmoptionSepArg, "1" },
-  {"+spin", ".circuit.spin", XrmoptionNoArg, (caddr_t) "false" },
-  {"-spin", ".circuit.spin", XrmoptionNoArg, (caddr_t) "true" },
-  {"+light", ".circuit.light", XrmoptionNoArg, (caddr_t) "false" },
-  {"-light", ".circuit.light", XrmoptionNoArg, (caddr_t) "true" },
-  {"+seven", ".circuit.seven", XrmoptionNoArg, (caddr_t) "false" },
-  {"-seven", ".circuit.seven", XrmoptionNoArg, (caddr_t) "true" },
-  {"+rotate", ".circuit.rotate", XrmoptionNoArg, (caddr_t) "false" },
-  {"-rotate", ".circuit.rotate", XrmoptionNoArg, (caddr_t) "true" },
+  {"+spin", ".circuit.spin", XrmoptionNoArg, "false" },
+  {"-spin", ".circuit.spin", XrmoptionNoArg, "true" },
+  {"+light", ".circuit.light", XrmoptionNoArg, "false" },
+  {"-light", ".circuit.light", XrmoptionNoArg, "true" },
+  {"+seven", ".circuit.seven", XrmoptionNoArg, "false" },
+  {"-seven", ".circuit.seven", XrmoptionNoArg, "true" },
+  {"+rotate", ".circuit.rotate", XrmoptionNoArg, "false" },
+  {"-rotate", ".circuit.rotate", XrmoptionNoArg, "true" },
 };
 
 static argtype vars[] = {
@@ -149,7 +141,7 @@ static int YMAX = 30;
 
 #define MAX_COMPONENTS 30
 
-#define MOVE_MULT 0.05
+#define MOVE_MULT 0.02
 
 static float f_rand(void) {
    return ((float)RAND(10000)/(float)10000);
@@ -1498,7 +1490,7 @@ Component * NewComponent(void)
   c->rotx = f_rand();
   c->roty = f_rand();
   c->rotz = f_rand();
-  c->drot = f_rand() * 7;
+  c->drot = f_rand() * 3;
   c->rdeg = 0;
   c->dz = f_rand()*2 - 1;
   c->norm = 0;