Merge pull request #204 from nickelpro/fix-make-collision-less-terrible

Significantly faster collision detection

Author: nickelpro

spockbot/plugins/helpers/pathfinding.py

@@ -139,8 +139,7 @@ def raycast_bbox(self, start, end):
         return True
 
     def get_block(self, pos):
-        block_id, meta = self.world.get_block(*pos.vector)
-        return blocks.get_block(block_id, meta)
+        return blocks.get_block(*self.world.get_block(*pos))
 
     def check_for_bbox(self, pos):
         pos = pos.floor()

spockbot/plugins/helpers/physics.py

@@ -106,11 +106,8 @@ def physics_tick(self, _, __):
 
     def get_block_slip(self):
         if self.pos.on_ground:
-            block_pos = self.pos.floor()
-            block_id, meta = self.world.get_block(
-                block_pos.x, block_pos.y - 1, block_pos.z
-            )
-            return blocks.get_block(block_id, meta).slipperiness
+            bpos = self.pos.floor()
+            return blocks.get_block(*self.world.get_block(*bpos)).slipperiness
         return 1
 
     def apply_accel(self):

spockbot/plugins/tools/collision.py

@@ -40,11 +40,9 @@ def check_collision(self, pos, vector):
         return self.block_collision(test_pos)
 
     def block_collision(self, pos):
-        for block_pos in gen_block_set(pos):
-            block_id, meta = self.world.get_block(
-                block_pos.x, block_pos.y, block_pos.z
-            )
-            block = blocks.get_block(block_id, meta)
+        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))
             if not block.bounding_box:
                 continue
             transform_vectors = []

spockbot/vector.py

@@ -94,10 +94,17 @@ def __trunc__(self):
     def zero(self):
         self.vector = [0 for a in self]
 
+    def iceil(self):
+        self.vector = [int(math.ceil(a)) for a in self]
+        return self
+
     def ifloor(self):
         self.vector = [int(math.floor(a)) for a in self]
         return self
 
+    def ceil(self):
+        return self.__class__(*self).iceil()
+
     def floor(self):
         return self.__class__(*self).ifloor()