diff options
| author |  Russell Cohen <rcoh@mit.edu> | 2011-01-12 10:02:10 -0500 |
|---|---|---|
| committer | Russell Cohen <rcoh@mit.edu> | 2011-01-12 10:02:10 -0500 |
| commit | c7fc6c2725231eb1427f0edf00d3219409b3d55b (patch) | |
| tree | 5b0040cb8673c9a01513977e3b11f440afd30d49 /config/Outdoor.xml | |
| parent | aaf8bdbee7fdc1d4721f43307fc824c373c69ec4 (diff) | |
| parent | 9315ded6555a7afb8f11d96e5a4c446389f157cb (diff) | |
Merge branch 'master' into behaviors
Conflicts:
LightInstallation.py
Diffstat (limited to 'config/Outdoor.xml')
| -rw-r--r-- | config/Outdoor.xml | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/config/Outdoor.xml b/config/Outdoor.xml index 053f31e..5ad2c58 100644 --- a/config/Outdoor.xml +++ b/config/Outdoor.xml @@ -40,9 +40,17 @@ <Class>inputs.PygameInput</Class> <Args><!--Passed as a dictionary--> <Id>pygame</Id> - <RefreshInterval>100</RefreshInterval> + <RefreshInterval>10</RefreshInterval> </Args> </InputElement> + <!--<InputElement> + <Class>inputs.TCPInput</Class> + <Args> + <Id>tcp</Id> + <Port>20120</Port> + <RefreshInterval>10</RefreshInterval> + </Args> + </InputElement>--> <InputElement Id="followmouse"> <InheritsFrom>inputs/MouseFollower.xml</InheritsFrom> </InputElement> @@ -68,6 +76,12 @@ <Behavior Id="decay"> <InheritsFrom>behaviors/PixelDecay.xml</InheritsFrom> </Behavior> + <Behavior Id="slowdecay"> + <InheritsFrom>behaviors/PixelDecay.xml</InheritsFrom> + <Args> + <Coefficient>.01</Coefficient> + </Args> + </Behavior> <Behavior> <Class>behaviors.DebugBehavior</Class> <Args> @@ -88,13 +102,13 @@ <Class>behaviors.Square</Class> <Args> <Id>square</Id> - <Width>10</Width> + <Width>5</Width> </Args> </Behavior> <Behavior Id="recursivedecay"> <InheritsFrom>behaviors/LoopAndDie.xml</InheritsFrom> <Args> - <InitialResponseCount>2000</InitialResponseCount> + <InitialResponseCount>300</InitialResponseCount> </Args> </Behavior> <Behavior> @@ -134,11 +148,12 @@ <Id>mousechaser</Id> <Inputs> <Id>followmouse</Id> + <Id>tcp</Id> </Inputs> <ChainedBehaviors> <Id>echo</Id> <Id>square</Id> - <Id>decay</Id> + <Id>slowdecay</Id> </ChainedBehaviors> <RenderToScreen>True</RenderToScreen> </Args> |