Merge pull request #8 from PashkovD/seeds_opmiziation

Buffer for seed drawing and collision

Author: BaggerFast

pacman/objects/seed.py

@@ -1,4 +1,6 @@
-from pygame import Rect, Surface, draw, time
+from math import floor
+
+from pygame import SRCALPHA, Rect, Surface, draw, time
 
 from pacman.data_core import Colors, IDrawable
 from pacman.data_core.data_classes import Cell
@@ -12,23 +14,24 @@ def __init__(self, seed_data, energizer_data, anim_step: int) -> None:
         super().__init__()
         self.__timer = time.get_ticks()
         self.__anim_step = anim_step
-        self.__seeds = self.prepare_seeds(seed_data)
+        self.__seeds: list[list[bool]] = self.prepare_seeds(seed_data)
         self.__energizers = self.prepare_energizers(energizer_data)
 
+        self.__buffer = Surface((len(self.__seeds[0]) * 8, len(self.__seeds) * 8 + 20), SRCALPHA)
+
         self.__ram_img = ImgObj("other/ram")
         self.__yandex_img = ImgObj("other/yandex")
 
         self.__show_energizer = True
+        self.__seeds_counts = sum(sum(i) for i in self.__seeds)
         self.__max_seeds = len(self.__seeds)
 
     @staticmethod
-    def prepare_seeds(seed_data) -> list[Cell]:
-        seed = []
-        for i in range(len(seed_data)):
-            for j in range(len(seed_data[i])):
-                if not seed_data[i][j]:
-                    continue
-                seed.append(Cell(j, i))
+    def prepare_seeds(seed_data) -> list[list[bool]]:
+        seed: list[list[bool]] = [[False] * len(seed_data[0]) for _ in range(len(seed_data))]
+        for y in range(len(seed_data)):
+            for x in range(len(seed_data[y])):
+                seed[y][x] = seed_data[y][x]
         return seed
 
     @staticmethod
@@ -37,11 +40,17 @@ def prepare_energizers(energizer_data) -> list[Cell]:
 
     def __draw_seeds(self, screen) -> None:
         if SkinStorage().equals(SkinEnum.CHROME):
-            for seed in self.__seeds:
-                self.__ram_img.move_center(*seed.rect.center).draw(screen)
+            for y in range(len(self.__seeds)):
+                for x in range(len(self.__seeds[y])):
+                    if self.__seeds[y][x]:
+                        cell = Cell(x, y)
+                        self.__ram_img.move_center(*cell.rect.center).draw(screen)
             return
-        for seed in self.__seeds:
-            draw.circle(screen, Colors.WHITE, seed.rect.center, 1)
+        for y in range(len(self.__seeds)):
+            for x in range(len(self.__seeds[y])):
+                if self.__seeds[y][x]:
+                    cell = Cell(x, y)
+                    draw.circle(screen, Colors.WHITE, cell.rect.center, 1)
 
     def __draw_energizers(self, screen) -> None:
         if time.get_ticks() - self.__timer > self.__anim_step:
@@ -56,17 +65,22 @@ def __draw_energizers(self, screen) -> None:
         for energizer in self.__energizers:
             draw.circle(screen, Colors.WHITE, energizer.rect.center, 4)
 
+    def create_buffer(self):
+        self.__draw_seeds(self.__buffer)
+
     def draw(self, screen: Surface) -> None:
-        self.__draw_seeds(screen)
+        screen.blit(self.__buffer, (0, 0))
         self.__draw_energizers(screen)
 
     def seed_collision(self, rect: Rect) -> bool:
         if not len(self.__seeds):
             return False
-        for i, cell in enumerate(self.__seeds):
-            if cell.rect.center == rect.center:
-                del self.__seeds[i]
-                return True
+        cell = Cell(floor(rect.centerx / 8), floor((rect.centery - 20) / 8))
+        if self.__seeds[cell.y][cell.x] and cell.rect.center == rect.center:
+            self.__seeds[cell.y][cell.x] = False
+            draw.rect(self.__buffer, (0, 0, 0, 0), cell)
+            self.__seeds_counts -= 1
+            return True
         return False
 
     def energizer_collision(self, rect: Rect) -> bool:
@@ -77,7 +91,7 @@ def energizer_collision(self, rect: Rect) -> bool:
         return False
 
     def is_field_empty(self) -> bool:
-        return len(self.__seeds) == 0
+        return self.__seeds_counts == 0
 
     def __len__(self):
         return len(self.__seeds)

pacman/scenes/main_scene.py

@@ -50,6 +50,8 @@ def __init__(self, map_color=None):
 
         self.__create_heroes()
 
+        self.__seeds.create_buffer()
+
         self.__update_score_text()
 
     # region Private