Code for the demo. Everything works afaik. Contains a couple more optimizations. Contains modify param behavior. Improved support for recursive hooks. Modifications to SmootCoreObject to get us closer to a fully multi-threaded system. This should be the last commit directly to master. All further commits should be on subranches and get merged.

1 files changed, 7 insertions, 4 deletions

diff --git a/behaviors/BehaviorChain.py b/behaviors/BehaviorChain.py
index 8b5cb1d..fe50573 100644
--- a/behaviors/BehaviorChain.py
+++ b/behaviors/BehaviorChain.py
@@ -20,8 +20,11 @@ class BehaviorChain(Behavior):
 
             if behaviorId in self.hooks: #process recursive hook if there is one
                 hookBehavior = Util.getComponentById(self.hooks[behaviorId])
-                (response, recurrence) = \
-                hookBehavior.immediateProcessInput(response,
-                        recurrence)
-            self.feedback[behaviorId] = recurrence
+#we feed its recurrence in as input to the behavior.  
+                (recurrence, hookRecurrence) = \
+                hookBehavior.immediateProcessInput(recurrence, \
+                        [])
+                if hookRecurrence != []:
+                    print 'Hook recurrences are not currently supported.  Implement it yourself or bug russell'
+            self.feedback[behaviorId] = recurrence 
         return response