diff options
| author |  Russell Cohen <rcoh@mit.edu> | 2011-01-26 22:24:55 -0500 |
|---|---|---|
| committer | Russell Cohen <rcoh@mit.edu> | 2011-01-26 22:24:55 -0500 |
| commit | 5d29906fff79bc6e4ba83be7028e1380a0014d21 (patch) | |
| tree | 0bb2350046aa69c3b1095983fea59c49026a857b /config/6thFloor.xml | |
| parent | 2019fb2895237aa9d86450daaf6d90831189fc13 (diff) | |
| parent | 82f99fc4583ca3cc9861a9fe30990a4a9ef162c4 (diff) | |
Merge branch 'mobileapp' into biginstall
Conflicts:
behaviors/RestrictLocation.py
behaviors/Square.py
config/6thFloor.xml
inputs/TCPInput.py
layouts/60StripLayout.xml
operationscore/Behavior.py
operationscore/PixelMapper.py
pixelcore/Pixel.py
pixelcore/Screen.py
renderers/60StripSeq.xml
Diffstat (limited to 'config/6thFloor.xml')
| -rw-r--r-- | config/6thFloor.xml | 49 |
1 files changed, 38 insertions, 11 deletions
diff --git a/config/6thFloor.xml b/config/6thFloor.xml index 3f734d9..c98486a 100644 --- a/config/6thFloor.xml +++ b/config/6thFloor.xml @@ -7,7 +7,6 @@ </InstallationConfiguration> <PixelConfiguration> <InheritsFrom>layouts/60StripLayout.xml</InheritsFrom> - <!--<InheritsFrom>layouts/BasicSixStrip.xml</InheritsFrom--> </PixelConfiguration> <PixelMapperConfiguration> <PixelMapper> @@ -29,9 +28,9 @@ </PixelMapper> </PixelMapperConfiguration> <RendererConfiguration> - <Renderer> + <!--Renderer> <InheritsFrom>renderers/60StripSeq.xml</InheritsFrom> - </Renderer> + </Renderer--> <Renderer> <InheritsFrom>renderers/Pygame.xml</InheritsFrom> </Renderer> @@ -44,6 +43,14 @@ <RefreshInterval>10</RefreshInterval> </Args> </InputElement> + <InputElement> + <Class>inputs.UDPInput</Class> + <Args> + <Id>udp</Id> + <Port>3344</Port> + <RefreshInterval>50</RefreshInterval> + </Args> + </InputElement> <!--<InputElement> <Class>inputs.TCPInput</Class> <Args> @@ -71,11 +78,27 @@ <RenderToScreen>False</RenderToScreen> </Args> </Behavior> + <Behavior Id="dim"> + <InheritsFrom>behaviors/DimColor.xml</InheritsFrom> + </Behavior> + <Behavior> + <Class>behaviors.Expand</Class> + <Args> + <Id>expand</Id> + <ExpandRate>1</ExpandRate> + </Args> + </Behavior> <Behavior Id="redshift"> <InheritsFrom>behaviors/RedShift.xml</InheritsFrom> </Behavior> <Behavior Id="colorchange"> <InheritsFrom>behaviors/RandomColor.xml</InheritsFrom> + <Args> + <ColorList> + <Val>(255,0,0)</Val> + <Val>(0,0,255)</Val> + </ColorList> + </Args> </Behavior> <Behavior Id="decay"> <InheritsFrom>behaviors/PixelDecay.xml</InheritsFrom> @@ -129,7 +152,17 @@ <Behavior> <Class>behaviors.BehaviorChain</Class> <Args> - <Id>xymover</Id> + <Id>expanddie</Id> + <ChainedBehaviors> + <Id>expand</Id> + <Id>dim</Id> + </ChainedBehaviors> + </Args> + </Behavior> + <Behavior> + <Class>behaviors.BehaviorChain</Class> + <Args> + <Id>inpexpanddim</Id> <Inputs> <Id>pygame</Id> </Inputs> @@ -150,6 +183,7 @@ <z-index>0</z-index> <Inputs> <Id>pygame</Id> + <Id>udp</Id> </Inputs> </Args> </Behavior> @@ -166,12 +200,6 @@ <Width>20</Width> </Args> </Behavior> - <Behavior> - <Class>behaviors.AllPixels</Class> - <Args> - <Id>allpixels</Id> - </Args> - </Behavior> <Behavior Id="recursivedecay"> <InheritsFrom>behaviors/LoopAndDie.xml</InheritsFrom> <Args> @@ -258,7 +286,6 @@ </Inputs> <ChainedBehaviors> <Id>echo</Id> - <Id>redshift</Id> <Id>square</Id> <Id>singleframe</Id> </ChainedBehaviors> |