diff options
| author |  rcoh <rcoh@mit.edu> | 2011-01-27 16:50:59 -0500 |
|---|---|---|
| committer | rcoh <rcoh@mit.edu> | 2011-01-27 16:50:59 -0500 |
| commit | 5fb3ea060025241105dc8e9a174513c112f9a133 (patch) | |
| tree | e98b1b3eab0b05b0e518b08cbab086d224fd9250 /config/6thFloor.xml | |
| parent | 5d29906fff79bc6e4ba83be7028e1380a0014d21 (diff) | |
A metric $#%$-ton of changes. Added doc-strings to EVERYTHING. Phew. Fixed a massive bug that
increases performance in by up to a factor of 60. A bunch of new behaviors for the class.
Diffstat (limited to 'config/6thFloor.xml')
| -rw-r--r-- | config/6thFloor.xml | 85 |
1 files changed, 43 insertions, 42 deletions
diff --git a/config/6thFloor.xml b/config/6thFloor.xml index c98486a..b58ff57 100644 --- a/config/6thFloor.xml +++ b/config/6thFloor.xml @@ -39,8 +39,17 @@ <InputElement> <Class>inputs.PygameInput</Class> <Args><!--Passed as a dictionary--> - <Id>pygame</Id> + <Id>pygameclick</Id> <RefreshInterval>10</RefreshInterval> + <Clicks>True</Clicks> + </Args> + </InputElement> + <InputElement> + <Class>inputs.PygameInput</Class> + <Args><!--Passed as a dictionary--> + <Id>pygamekey</Id> + <RefreshInterval>10</RefreshInterval> + <Keyboard>True</Keyboard> </Args> </InputElement> <InputElement> @@ -62,14 +71,11 @@ <InputElement Id="followmouse"> <InheritsFrom>inputs/MouseFollower.xml</InheritsFrom> </InputElement> - <InputElement> - <Class>inputs.RandomLocs</Class> - <Args> - <Id>randomLoc</Id> - </Args> - </InputElement> </InputConfiguration> <BehaviorConfiguration> + <Behavior Id="risefall"> + <InheritsFrom>behaviors/RiseFall.xml</InheritsFrom> + </Behavior> <Behavior> <Class>behaviors.EchoBehavior</Class> <Args> @@ -88,9 +94,6 @@ <ExpandRate>1</ExpandRate> </Args> </Behavior> - <Behavior Id="redshift"> - <InheritsFrom>behaviors/RedShift.xml</InheritsFrom> - </Behavior> <Behavior Id="colorchange"> <InheritsFrom>behaviors/RandomColor.xml</InheritsFrom> <Args> @@ -162,18 +165,29 @@ <Behavior> <Class>behaviors.BehaviorChain</Class> <Args> + <Id>risefalldie</Id> + <ChainedBehaviors> + <Id>risefall</Id> + <Id>2sec</Id> + <Id>dim</Id> + </ChainedBehaviors> + </Args> + </Behavior> + <Behavior> + <Class>behaviors.BehaviorChain</Class> + <Args> <Id>inpexpanddim</Id> <Inputs> - <Id>pygame</Id> + <Id>pygamekey</Id> </Inputs> <ChainedBehaviors> + <Id>mitdoors</Id> <Id>colorchange</Id> <Id>mover</Id> <Id>decay</Id> </ChainedBehaviors> - <RecursiveHooks>{'mover':'movebounce'}</RecursiveHooks> + <RecursiveHooks>{'mover':'risefalldie'}</RecursiveHooks> <RenderToScreen>True</RenderToScreen> - <Mapper>gaussmap</Mapper> </Args> </Behavior> <Behavior> @@ -182,12 +196,26 @@ <Id>debug</Id> <z-index>0</z-index> <Inputs> - <Id>pygame</Id> + <Id>pygamekey</Id> <Id>udp</Id> </Inputs> </Args> </Behavior> <Behavior> + <Class>behaviors.Timeout</Class> + <Args> + <Id>2sec</Id> + <Timeout>2000</Timeout> + </Args> + </Behavior> + <Behavior> + <Class>behaviors.MITDoors</Class> + <Args> + <Id>mitdoors</Id> + <Bottom>50</Bottom> + </Args> + </Behavior> + <Behavior> <Class>behaviors.AllPixelsLeft</Class> <Args> <Id>pixelsleft</Id> @@ -211,7 +239,7 @@ <Args> <Id>runcolordecay</Id> <Inputs> - <Id>pygame</Id> + <Id>pygameclick</Id> </Inputs> <ChainedBehaviors> <Id>colorchange</Id> @@ -224,39 +252,12 @@ </Args> </Behavior> <Behavior> - <Class>behaviors.BehaviorChain</Class> - <Args> - <Id>randomwalk</Id> - <Inputs> - <Id>pygame</Id> - </Inputs> - <ChainedBehaviors> - <Id>colorchange</Id> - <Id>mover</Id> - <Id>decay</Id> - </ChainedBehaviors> - <RecursiveHooks>{'mover':'redwalk'}</RecursiveHooks> - <RenderToScreen>False</RenderToScreen> - <Mapper>gaussmap</Mapper> - </Args> - </Behavior> - <Behavior> <Class>behaviors.ResponseMover</Class> <Args> <Id>mover</Id> </Args> </Behavior> <Behavior> - <Class>behaviors.BehaviorChain</Class> - <Args> - <Id>redwalk</Id> - <ChainedBehaviors> - <Id>randmovement</Id> - <Id>redshift</Id> - </ChainedBehaviors> - </Args> - </Behavior> - <Behavior> <Class>behaviors.RandomWalk</Class> <Args> <Id>randmovement</Id> |