diff options
author | dan <dmtaub@gmail.com> | 2011-01-28 16:31:58 -0500 |
---|---|---|
committer | dan <dmtaub@gmail.com> | 2011-01-28 16:31:58 -0500 |
commit | b11a72afece56dc138aac5400057668e8388f43d (patch) | |
tree | b779455122ee1987d3fcd9b51fcffa8d03057b86 /config/MobileTest.xml | |
parent | 6a0bfdfb00944ae0bcc6215a194c3290b4a085f2 (diff) | |
parent | b67a37ad06fa4c97dcdb32cecc71c7f492b12840 (diff) |
Merge branch 'fridaydemo' of github.com:rcoh/SmootLight into osc
Conflicts:
behaviors/ControllerOSC.py
Diffstat (limited to 'config/MobileTest.xml')
-rw-r--r-- | config/MobileTest.xml | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/config/MobileTest.xml b/config/MobileTest.xml index af94c25..63c3b47 100644 --- a/config/MobileTest.xml +++ b/config/MobileTest.xml @@ -26,6 +26,16 @@ <Height>1</Height> </Args> </PixelMapper> + <PixelMapper> + <Class>pixelmappers.GaussianMapper</Class> + <Args> + <Id>mobilegaussmap</Id> + <CutoffDist>30</CutoffDist> + <MinWeight>0.1</MinWeight> + <Width>10</Width> + <Height>1</Height> + </Args> + </PixelMapper> </PixelMapperConfiguration> <RendererConfiguration> <Renderer> @@ -227,26 +237,12 @@ </Inputs> <ChainedBehaviors> <Id>move</Id> + <Id>mobileshake</Id> <Id>decay</Id> </ChainedBehaviors> <RenderToScreen>True</RenderToScreen> - <Mapper>gaussmap</Mapper> + <Mapper>mobilegaussmap</Mapper> </Args> </Behavior> - <Behavior> - <Class>behaviors.BehaviorChain</Class> - <Args> - <Id>shakeanddecay</Id> - <Inputs> - <Id>tcp</Id> - </Inputs> - <ChainedBehaviors> - <Id>mobileshake</Id> - <Id>slowdecay</Id> - </ChainedBehaviors> - <RenderToScreen>True</RenderToScreen> - <Mapper>simplemap</Mapper> - </Args> - </Behavior> </BehaviorConfiguration> </LightInstallation> |