Move position sending to Physics plugin

Author: nickelpro

spockbot/plugins/helpers/movement.py

@@ -40,8 +40,6 @@ def final_target(self):
 class MovementPlugin(PluginBase):
     requires = ('ClientInfo', 'Event', 'Net', 'Pathfinding', 'Physics')
     events = {
-        'client_tick': 'client_tick',
-        'client_position_update': 'handle_position_update',
         'client_join_game': 'handle_join_game',
     }
 
@@ -50,25 +48,12 @@ def __init__(self, ploader, settings):
 
         self.flag_pos_reset = False
         self.movement = MovementCore(self)
-        self.connected_to_server = False
-        ploader.provides('Movement', self.movement)
         self.path_nodes = None
-
-    def client_tick(self, name, data):
-        if not self.connected_to_server:
-            return
-        self.net.push_packet('PLAY>Player Position and Look',
-                             self.clientinfo.position.get_dict())
-        if self.flag_pos_reset:
-            self.event.emit('movement_position_reset')
-            self.flag_pos_reset = False
+        ploader.provides('Movement', self.movement)
 
     def handle_join_game(self, name, data):
         self.connected_to_server = True
 
-    def handle_position_update(self, name, data):
-        self.flag_pos_reset = True
-
     def new_path(self, *xyz):
         target = Vector3(*xyz)
         self.pathfinding.pathfind(

spockbot/plugins/helpers/physics.py

@@ -66,11 +66,11 @@ def move_angle(self, angle, radians=False):
 
 @pl_announce('Physics')
 class PhysicsPlugin(PluginBase):
-    requires = ('Event', 'ClientInfo', 'World')
+    requires = ('Event', 'ClientInfo', 'Net', 'World')
     events = {
-        'physics_tick': 'tick',
-        'client_position_update': 'stop_physics',
-        'movement_position_reset': 'start_physics',
+        'physics_tick': 'physics_tick',
+        'client_tick': 'client_tick',
+        'client_position_update': 'pause_physics',
     }
 
     def __init__(self, ploader, settings):
@@ -80,21 +80,23 @@ def __init__(self, ploader, settings):
             self.world, BoundingBox(const.PLAYER_WIDTH, const.PLAYER_HEIGHT)
         )
         self.pos = self.clientinfo.position
-        self.pause_physics = False
+        self.skip_tick = False
         self.pc = PhysicsCore(self.pos, self.vec, self.clientinfo.abilities)
         ploader.provides('Physics', self.pc)
 
-    def stop_physics(self, _=None, __=None):
+    def pause_physics(self, _=None, __=None):
         self.vec.zero()
-        self.pause_physics = True
+        self.skip_tick = True
 
-    def start_physics(self, _=None, __=None):
-        self.pause_physics = False
-        self.event.reg_event_handler('physics_tick', self.tick)
+    def client_tick(self, name, data):
+        self.net.push_packet('PLAY>Player Position and Look',
+                             self.clientinfo.position.get_dict())
+        if self.skip_tick:
+            self.skip_tick = False
 
-    def tick(self, _, __):
-        if self.pause_physics:
-            return self.pause_physics
+    def physics_tick(self, _, __):
+        if self.skip_tick:
+            return
         self.apply_accel()
         mtv = self.get_mtv()
         self.apply_vector(mtv)

spockbot/plugins/tools/collision.py

@@ -13,12 +13,11 @@ def uncenter_position(pos, bbox):
 
 
 def gen_block_set(block_pos, xr=(-1, 2), yr=(0, 3), zr=(-1, 2)):
-    offsets = (
-        (x, y, z)
+    pos = block_pos.floor()
+    return (
+        pos + Vector3(x, y, z)
         for x in range(*xr) for y in range(*yr) for z in range(*zr)
     )
-    pos = block_pos.floor()
-    return (pos + Vector3(*offset) for offset in offsets)
 
 
 # Axis must be a normalized/unit vector