diff options
| author |  Russell Cohen <rcoh@mit.edu> | 2010-11-25 21:44:00 -0500 |
|---|---|---|
| committer | Russell Cohen <rcoh@mit.edu> | 2010-11-25 21:44:00 -0500 |
| commit | 5783d6336f014c05e0e46d7bc35533e70b280582 (patch) | |
| tree | b4e0b0b2787b8fe464baadbd375ad6dc6c1dbf76 /config | |
| parent | b042647b68abdc82490ca6e059993b8eba28904c (diff) | |
Added BehaviorChain to support chains of behaviors. Added FollowMouse
parameter to PygameInput to support following of mice. Added component
registry to Util which allows any component to access any other
component. Some changes to the structure of LightInstallation.
Diffstat (limited to 'config')
| -rw-r--r-- | config/.LightInstallationConfig.xml.swp | bin | 12288 -> 20480 bytes | |||
| -rw-r--r-- | config/Behavior.params | 2 | ||||
| -rw-r--r-- | config/Input.params | 3 | ||||
| -rw-r--r-- | config/LightInstallationConfig.xml | 54 |
4 files changed, 50 insertions, 9 deletions
diff --git a/config/.LightInstallationConfig.xml.swp b/config/.LightInstallationConfig.xml.swp Binary files differindex cfcec1b..e3dbfd3 100644 --- a/config/.LightInstallationConfig.xml.swp +++ b/config/.LightInstallationConfig.xml.swp diff --git a/config/Behavior.params b/config/Behavior.params index 532fa03..0967ef4 100644 --- a/config/Behavior.params +++ b/config/Behavior.params @@ -1 +1 @@ -{'Inputs':'Inputs must be defined!'} +{} diff --git a/config/Input.params b/config/Input.params index f051cb3..0967ef4 100644 --- a/config/Input.params +++ b/config/Input.params @@ -1,2 +1 @@ -{'InputId': 'InputId must be defined in config XML', 'RefreshInterval': -'RefreshInterval must be defined in config XML'} +{} diff --git a/config/LightInstallationConfig.xml b/config/LightInstallationConfig.xml index a5f4a08..a4722db 100644 --- a/config/LightInstallationConfig.xml +++ b/config/LightInstallationConfig.xml @@ -56,14 +56,22 @@ <InputElement> <Class>inputs.PygameInput</Class> <Args><!--Passed as a dictionary--> - <InputId>pygame</InputId> + <Id>pygame</Id> + <RefreshInterval>100</RefreshInterval> + </Args> + </InputElement> + <InputElement> + <Class>inputs.PygameInput</Class> + <Args><!--Passed as a dictionary--> + <Id>followmouse</Id> + <FollowMouse>True</FollowMouse> <RefreshInterval>100</RefreshInterval> </Args> </InputElement> <InputElement> <Class>inputs.UDPInput</Class> <Args> - <InputId>UDP</InputId> + <Id>UDP</Id> <Port>6038</Port> <RefreshInterval>100</RefreshInterval> </Args> @@ -73,21 +81,55 @@ <Behavior> <Class>behaviors.EchoBehavior</Class> <Args> - <behaviorId>echo</behaviorId> + <Id>echo</Id> + <z-index>0</z-index> + <RenderToScreen>False</RenderToScreen> + <Inputs> + </Inputs> + </Args> + </Behavior> + <Behavior> + <Class>behaviors.ColorChangerBehavior</Class> + <Args> + <Id>color</Id> <z-index>0</z-index> + <RenderToScreen>False</RenderToScreen> + <Inputs> + </Inputs> + </Args> + </Behavior> + <Behavior> + <Class>behaviors.DecayBehavior</Class> + <Args> + <Id>decay</Id> + <z-index>0</z-index> + <RenderToScreen>False</RenderToScreen> <Inputs> - <InputId>pygame</InputId> </Inputs> </Args> </Behavior> <Behavior> <Class>behaviors.DebugBehavior</Class> <Args> - <behaviorId>debug</behaviorId> + <Id>debug</Id> <z-index>0</z-index> <Inputs> - <InputId>UDP</InputId> + <Id>UDP</Id> + </Inputs> + </Args> + </Behavior> + <Behavior> + <Class>behaviors.BehaviorChain</Class> + <Args> + <Inputs> + <Id>followmouse</Id> </Inputs> + <ChainedBehaviors> + <Id>echo</Id> + <Id>color</Id> + <Id>decay</Id> + </ChainedBehaviors> + <RenderToScreen>True</RenderToScreen> </Args> </Behavior> </BehaviorConfiguration> |