Rewrote Spatial Hashing

Author: imMadsen

pymunk/space.py

@@ -554,11 +554,19 @@ def use_spatial_hash(self, dim: float, count: int) -> None:
         """
         cp.cpSpaceUseSpatialHash(self._space, dim, count)
 
-    def get_space_hash_objects_per_cell(self) -> List:
-        cell_counts = ffi.new(f'int[{cp.cpSpaceGetSpatialHashTotalCells(self._space)}]')
-        cp.cpSpaceGetSpatialHashObjectCounts(self._space, cell_counts)
-        return cell_counts
 
+    def get_space_hash_indicies(self, hash_indicies_len, l, r, b, t) -> List:
+        hash_indicies = ffi.new(f'int[{hash_indicies_len}]')
+        cp.cpSpaceGetSpatialHashIndices(self._space, hash_indicies, l, r, b, t)
+        return hash_indicies
+
+    def create_space_hash_objects_count(self, hash_indicies_len) -> List:
+        hash_indicies = ffi.new(f'int[{hash_indicies_len}]')
+        return hash_indicies
+    
+    def get_space_hash_objects_count(self, cell_counts, hash_indicies, hash_indicies_len) -> None:
+        cp.cpSpaceGetSpatialHashObjectCounts(self._space, cell_counts, hash_indicies, hash_indicies_len)
+    
     def step(self, dt: float) -> None:
         """Update the space for the given time step.
 

pymunk_cffi/chipmunk_cdef.h

@@ -1233,11 +1233,11 @@ void cpSpaceReindexShapesForBody(cpSpace *space, cpBody *body);
 /// Switch the space to use a spatial has as it's spatial index.
 void cpSpaceUseSpatialHash(cpSpace *space, cpFloat dim, int count);
 
-// MARK: P7 (Crowd Crushing)
+//MARK: P7 (Crowd Crushing)
 
-int cpSpaceGetSpatialHashTotalCells(cpSpace * space);
+void cpSpaceGetSpatialHashIndices(cpSpace *space, int *hash_indices, int l, int r, int b, int t);
 
-void cpSpaceGetSpatialHashObjectCounts(cpSpace * space, int *cell_counts);
+void cpSpaceGetSpatialHashObjectCounts(cpSpace *space, int *cell_counts, int *hash_indices, int hash_indices_len);
 
 // MARK: Time Stepping