X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=tabakrolletjie%2Fobstacles.py;h=071ca9f935c1d4cd87fec3de82e13bf6ca0f82e9;hb=923e068edb27b9b6d35359e496668038a1db6fa4;hp=9adb80308180f40a76accc528492d7fe9026c35c;hpb=466429edf04d36e1eeb667e79d55c40f29afbf91;p=tabakrolletjie.git

diff --git a/tabakrolletjie/obstacles.py b/tabakrolletjie/obstacles.py
index 9adb803..071ca9f 100644
--- a/tabakrolletjie/obstacles.py
+++ b/tabakrolletjie/obstacles.py
@@ -6,6 +6,7 @@ import pymunk
 import pymunk.pygame_util
 import pygame.draw
 import pygame.surface
+from pygame.math import Vector2
 
 from .constants import (SCREEN_SIZE, OBSTACLE_CATEGORY)
 from .loader import loader
@@ -85,22 +86,31 @@ class Shrub(BaseObstacle):
 
     def __init__(self, shrublets):
         super(Shrub, self).__init__()
-        for [x, y, r] in shrublets:
-            self.shapes.append(pymunk.Circle(self.body, r, offset=(x, y)))
+        for (x, y, r) in shrublets:
+            vec = Vector2(0, int(r))
+            STEPS = 18
+            vertices = [
+                vec.rotate(angle) + (x, y)
+                for angle in range(0, 360, 360/STEPS)]
+            vertices = [(v.x, v.y) for v in vertices]
+
+            self.shapes.append(pymunk.Poly(self.body, vertices))
+        self.shrublets = shrublets
         self._image = None
 
     def get_image(self):
         if self._image is None:
             self._image = pygame.surface.Surface(SCREEN_SIZE).convert_alpha()
-            self._image.fill((0,0,0,0))
-                
-            for shape in self.shapes:
-                centre = pymunk.pygame_util.to_pygame(shape.offset, self._image)
-                pygame.draw.circle(self._image, (255, 255, 255), centre, int(shape.radius))
-                
-            shrub_texture = loader.load_image("textures", "shrub.png").convert_alpha()
+            self._image.fill((0, 0, 0, 0))
+
+            for (x, y, r) in self.shrublets:
+                centre = pymunk.pygame_util.to_pygame((x, y), self._image)
+                pygame.draw.circle(self._image, (255, 255, 255), centre, r)
+
+            shrub_texture = loader.load_image(
+                "textures", "shrub.png").convert_alpha()
             self._image.blit(shrub_texture, (0, 0), None, pgl.BLEND_RGBA_MULT)
-            
+
         return self._image
 
     def render(self, surface):