aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar lalpert <lalpert@mit.edu>2011-02-20 18:32:10 -0500
committerGravatar lalpert <lalpert@mit.edu>2011-02-20 18:32:10 -0500
commitfd13edeeb2f277ee78af6d8ced1fba81a67ed1ba (patch)
treed1178eb10e6723327d1f5f588e3df42b14b14dd9
parentcd6217a54ac34cd13cc43dc17fe35a834f98b278 (diff)
Made C5Sign-pygame use Leah, added import random, mae rain faster
-rw-r--r--config/C5Sign-Leah.xml6
-rw-r--r--config/C5Sign-pygame.xml2
-rw-r--r--inputs/ParametricLocationInput.py1
3 files changed, 5 insertions, 4 deletions
diff --git a/config/C5Sign-Leah.xml b/config/C5Sign-Leah.xml
index dc7305e..94fda27 100644
--- a/config/C5Sign-Leah.xml
+++ b/config/C5Sign-Leah.xml
@@ -48,7 +48,7 @@
<yloc>top</yloc>
<xEquation>random.random()</xEquation>
<yEquation>0</yEquation>
- <RefreshInterval>500</RefreshInterval>
+ <RefreshInterval>100</RefreshInterval>
</Args>
</InputElement>
<InputElement>
@@ -94,7 +94,7 @@
<Args>
<Id>xymove</Id>
<XStep>0</XStep>
- <YStep>2</YStep>
+ <YStep>.5</YStep>
</Args>
</Behavior>
@@ -104,7 +104,7 @@
<Id>modifyY</Id>
<ParamType>Sensor</ParamType>
<ParamName>YStep</ParamName>
- <ParamOp>{val}+.5</ParamOp>
+ <ParamOp>{val}+.1</ParamOp>
</Args>
</Behavior>
diff --git a/config/C5Sign-pygame.xml b/config/C5Sign-pygame.xml
index 2040642..d08e14c 100644
--- a/config/C5Sign-pygame.xml
+++ b/config/C5Sign-pygame.xml
@@ -14,5 +14,5 @@
</Args>
</InputElement>
</InputConfiguration>
- <InheritsFrom>config/C5Sign.xml</InheritsFrom>
+ <InheritsFrom>config/C5Sign-Leah.xml</InheritsFrom>
</LightInstallation>
diff --git a/inputs/ParametricLocationInput.py b/inputs/ParametricLocationInput.py
index e817a9d..7c7e968 100644
--- a/inputs/ParametricLocationInput.py
+++ b/inputs/ParametricLocationInput.py
@@ -1,6 +1,7 @@
import util.TimeOps as clock
import util.ComponentRegistry as compReg
import util.Strings as Strings
+import random
from operationscore.Input import *
class ParametricLocationInput(Input):
"""Takes three arguments: xEquation, yEquation, and useClock where