ff

Reviewed-on: 24_PetrovIA/2#3

1.code-workspace

@@ -0,0 +1,8 @@
+{
+	"folders": [
+		{
+			"path": "../1"
+		}
+	],
+	"settings": {}
+}

originalTASK1.py

@@ -0,0 +1,59 @@
+import pygame
+from pygame.draw import*
+
+pygame.init()
+
+FPS = 30
+screen = pygame.display.set_mode((400,400))
+
+WHITE = (255, 255, 255)
+GRAY = (200, 200, 200)
+BLACK = (0, 0, 0)
+BROWN = (139, 69, 19)
+
+#Рисунок
+def draw_body(surface, x, y, width, height, color):
+    ''' Рисует тело '''
+    ellipse(surface, color, (x - width // 2, y - height // 2, width, height))
+def draw_head(surface, x, y, size, color):
+    ''' Рисует голову '''
+    circle(surface, color, (x, y), size // 2)
+def draw_ear(surface, x, y, width, height, color):
+    ''' Рисует ухо '''
+    ellipse(surface, color, (x - width // 2, y - height // 2, width, height))
+def draw_leg(surface, x, y, width, height, color):
+    ''' Рисует ногу '''
+    ellipse(surface, color, (x - width // 2, y - height // 2, width, height))
+def draw_hare( surface, x, y, width, height, color):
+    ''' Рисует зайца '''
+    body_width = width // 2
+    body_height = height // 2
+    body_y = y + body_height // 2
+    draw_body(surface, x, body_y, body_width, body_height, color)
+    
+    head_size = height // 4
+    draw_head(surface, x, y-head_size // 2, head_size, color)
+
+    ear_height = height // 3
+    ear_y = y - height // 2 + ear_height // 2
+    for ear_x in (x-head_size // 4, x + head_size // 4):
+        draw_ear (surface, ear_x, ear_y, width // 8, ear_height, color)
+    
+    leg_height = height // 16
+    leg_y =y + height // 2 - leg_height // 2
+    for leg_x in (x - width // 4, x + width // 4):
+        draw_leg(surface, leg_x, leg_y, width // 4, leg_height, color)
+
+draw_hare(screen, 200, 200, 200, 400, BROWN)
+
+pygame.display.update()
+clock = pygame.time.Clock()
+finished = False
+
+while not finished:
+    clock.tick(FPS)
+    for event in pygame.event.get():
+        if event.type == pygame.QUIT:
+            finished = True
+
+pygame.quit()

task1.py

@@ -6,62 +6,46 @@ pygame.init()
 FPS = 30
 screen = pygame.display.set_mode((400,400))
 
-# Цвета
 WHITE = (255, 255, 255)
 GRAY = (200, 200, 200)
 BLACK = (0, 0, 0)
 BROWN = (139, 69, 19)
 
+#Рисунок
 def draw_body(surface, x, y, width, height, color):
-    """Рисует тело зайца."""
+    ''' Рисует тело '''
     ellipse(surface, color, (x - width // 2, y - height // 2, width, height))
-
 def draw_head(surface, x, y, size, color):
-    """Рисует голову зайца."""
+    ''' Рисует голову '''
     circle(surface, color, (x, y), size // 2)
-
 def draw_ear(surface, x, y, width, height, color):
-    """Рисует ухо зайца."""
+    ''' Рисует ухо '''
     ellipse(surface, color, (x - width // 2, y - height // 2, width, height))
-
 def draw_leg(surface, x, y, width, height, color):
-    """Рисует ногу зайца."""
-def draw_hare(surface, center_x, center_y, total_width, total_height, color):
-    """
-    Рисует зайца на экране.
+    ''' Рисует ногу '''
+    ellipse(surface, color, (x - width // 2, y - height // 2, width, height))
+def draw_hare(srf, cx, cy, w, h, clr):
+    ''' Рисует зайца '''
+    bw = w // 2
+    bh = h // 2
+    by = cy + bh // 2
+    draw_body(srf, cx, by, bw, bh, clr)
     
-    Параметры:
-        surface: поверхность для рисования
-        center_x, center_y: координаты центра изображения
-        total_width, total_height: ширина и высота изображения
-        color: цвет зайца
-    """
-    # Тело
-    body_width = total_width // 2
-    body_height = total_height // 2
-    body_y = center_y + body_height // 2
-    draw_body(surface, center_x, body_y, body_width, body_height, color)
+    hs = h // 4
+    hy = cy - hs // 2
+    draw_head(srf, cx, hy, hs, clr)
 
-    # Голова
-    head_size = total_height // 4
-    head_y = center_y - head_size // 2
-    draw_head(surface, center_x, head_y, head_size, color)
+    eh = h // 3
+    ey = cy - h // 2 + eh // 2
+    for ex in (cx - hs // 4, cx + hs // 4):
+        draw_ear(srf, ex, ey, w // 8, eh, clr)
     
-    # Уши
-    ear_height = total_height // 3
-    ear_y = center_y - total_height // 2 + ear_height // 2
-    ear_width = total_width // 8
-    draw_ear(surface, center_x - head_size // 4, ear_y, ear_width, ear_height, color)
-    draw_ear(surface, center_x + head_size // 4, ear_y, ear_width, ear_height, color)
+    lh = h // 16
+    ly = cy + h // 2 - lh // 2
+    coords = [cx - w // 4, cx + w // 4]
+    for lx in coords:
+        draw_leg(srf, lx, ly, w // 4, lh, clr)
 
-    # Ноги
-    leg_height = total_height // 16
-    leg_y = center_y + total_height // 2 - leg_height // 2
-    leg_width = total_width // 4
-    draw_leg(surface, center_x - total_width // 4, leg_y, leg_width, leg_height, color)
-    draw_leg(surface, center_x + total_width // 4, leg_y, leg_width, leg_height, color)
-
-# Рисуем зайца
 draw_hare(screen, 200, 200, 200, 400, BROWN)
 
 pygame.display.update()