Expand event core, add comments to collision

Author: nickelpro

spockbot/plugins/core/event.py

@@ -14,21 +14,43 @@
 
 class EventCore(object):
     def __init__(self):
+        self.has_run = False
         self.kill_event = False
         self.event_handlers = defaultdict(list)
         signal.signal(signal.SIGINT, self.kill)
         signal.signal(signal.SIGTERM, self.kill)
 
-    def event_loop(self):
-        self.emit('event_start')
+    def event_loop(self, continuous=True):
+        if continuous:
+            self.run_continuous()
+        else:
+            self.run_once()
+
+    def run_continuous(self):
+        if not self.has_run and not self.kill_event:
+            self.has_run = True
+            self.emit('event_start')
         while not self.kill_event:
             self.emit('event_tick')
         logger.debug('EVENTCORE: Kill called, shutting down')
         self.emit('event_kill')
 
+    def run_once(self):
+        if not self.has_run and not self.kill_event:
+            self.has_run = True
+            self.emit('event_start')
+        if not self.kill_event:
+            self.emit('event_tick')
+        else:
+            logger.debug('EVENTCORE: Kill called, shutting down')
+            self.emit('event_kill')
+
     def reg_event_handler(self, event, handler):
         self.event_handlers[event].append(handler)
 
+    def unreg_event_handler(self, event, handler):
+        self.event_handlers[event].remove(handler)
+
     def emit(self, event, data=None):
         to_remove = []
         # reversed, because handlers can register themselves

spockbot/plugins/tools/collision.py

@@ -30,6 +30,9 @@ def check_axis(axis, min_a, max_a, min_b, max_b):
     return axis*overlap
 
 
+# Terribly named class with terribly named methods mostly useful to physics
+# implementations, rarely useful to other things. Much too clever for its own
+# good but reasonably fast for it.
 class MTVTest(object):
     def __init__(self, world, bbox):
         self.world = world
@@ -40,6 +43,9 @@ def check_collision(self, pos, vector):
         return self.block_collision(test_pos)
 
     def block_collision(self, pos):
+        # This line is confusing. Basically it figures out how many block
+        # coordinates the bounding box currently occupies. It's not clear what
+        # "b" stands for so take your pick: Blocks, Bounds, how-Big-is-the-Box
         b = (pos + self.bbox).ceil() - pos.floor()
         for block_pos in gen_block_set(pos, *zip((0, -1, 0), b)):
             block = blocks.get_block(*self.world.get_block(*block_pos))