diff options
author | rcoh <rcoh@mit.edu> | 2011-01-25 14:07:05 -0500 |
---|---|---|
committer | rcoh <rcoh@mit.edu> | 2011-01-25 14:07:05 -0500 |
commit | ad8ad25072f55413ecfd696eff1e07c1cd08984e (patch) | |
tree | 98eae0d23f8def7765b490d8d37e9716628aed60 | |
parent | 2019fb2895237aa9d86450daaf6d90831189fc13 (diff) |
Fancy param modification
-rw-r--r-- | behaviors/ModifyParam.py | 4 | ||||
-rw-r--r-- | behaviors/XYMove.py | 1 | ||||
-rw-r--r-- | config/6thFloor.xml | 16 |
3 files changed, 18 insertions, 3 deletions
diff --git a/behaviors/ModifyParam.py b/behaviors/ModifyParam.py index f589e05..6e76d05 100644 --- a/behaviors/ModifyParam.py +++ b/behaviors/ModifyParam.py @@ -1,4 +1,5 @@ from operationscore.Behavior import * +import math import pdb #Class to perform a given operation on some element of an argDict. Designed to be used a recursive hook, but can serve sensor-based functions as well. Specify ParamType (Sensor or Recurse), ParamName, and ParamOp, (a valid python statement with the old value represented as {val}) class ModifyParam(Behavior): @@ -16,6 +17,9 @@ class ModifyParam(Behavior): if paramName in behaviorInput: #TODO: copy -> modify instead of just #copying paramOp = paramOp.replace('{val}', 'behaviorInput[paramName]') #convert the {val} marker to something we can execute + #TODO: move elsewhere + paramOp = paramOp.replace('{y}', "behaviorInput['Location'][1]") + paramOp = paramOp.replace('{x}', "behaviorInput['Location'][0]") behaviorInput[paramName] = eval(paramOp) if paramType == 'Sensor': #return accordingly return (searchSet, recursiveInputs) diff --git a/behaviors/XYMove.py b/behaviors/XYMove.py index 8acbba8..1b99ee1 100644 --- a/behaviors/XYMove.py +++ b/behaviors/XYMove.py @@ -6,6 +6,7 @@ class XYMove(Behavior): for loc in sensor: oploc = dict(loc) self.insertStepIfMissing(oploc) + print oploc['YStep'] oploc['Location'] = Geo.addLocations((oploc['XStep'], oploc['YStep']), oploc['Location']) ret.append(oploc) return (ret, []) diff --git a/config/6thFloor.xml b/config/6thFloor.xml index 3f734d9..9f3904a 100644 --- a/config/6thFloor.xml +++ b/config/6thFloor.xml @@ -121,12 +121,22 @@ <Id>movebounce</Id> <ChainedBehaviors> <Id>xymove</Id> - <Id>ybounce</Id> + <!--Id>ybounce</Id--> <Id>xbounce</Id> + <Id>ysin</Id> </ChainedBehaviors> </Args> </Behavior> <Behavior> + <Class>behaviors.ModifyParam</Class> + <Args> + <Id>ysin</Id> + <ParamName>YStep</ParamName> + <ParamType>Sensor</ParamType> + <ParamOp>4*math.sin({x}/float(40))</ParamOp> + </Args> + </Behavior> + <Behavior> <Class>behaviors.BehaviorChain</Class> <Args> <Id>xymover</Id> @@ -182,9 +192,9 @@ <Class>behaviors.BehaviorChain</Class> <Args> <Id>runcolordecay</Id> - <Inputs> + <!--Inputs> <Id>pygame</Id> - </Inputs> + </Inputs--> <ChainedBehaviors> <Id>colorchange</Id> <Id>running</Id> |