From e3078e876fd52a7f5dd5af3f520c7f0b69f5b62e Mon Sep 17 00:00:00 2001 From: Megamichi Date: Fri, 23 Feb 2024 17:31:58 +0100 Subject: [PATCH 1/2] formatiert --- main.py | 113 ++++++++++++++++++++++++++++++++------------------------ 1 file changed, 64 insertions(+), 49 deletions(-) diff --git a/main.py b/main.py index f702255..9385dd7 100644 --- a/main.py +++ b/main.py @@ -3,43 +3,56 @@ import pygame import pygame.gfxdraw import copy import random + pygame.init() + + ## funktionen def get_debug_text(): - def text(text,line_counter): - debug_text = default_font.render(str(text), True, (255,255,255)) - screen.blit(debug_text,(0,line_counter*default_font.get_height())) + def text(text, line_counter): + debug_text = default_font.render(str(text), True, (255, 255, 255)) + screen.blit(debug_text, (0, line_counter * default_font.get_height())) line_counter = 1 globalvars = globals() for a in globalvars: - text(f"{str(a)} = {str(globalvars[a])}",line_counter) + text(f"{str(a)} = {str(globalvars[a])}", line_counter) line_counter += 1 -def centered_text(text=str,pos=tuple,color=tuple): - text = default_font.render(str(text), True, color,(255,255,255)) - screen.blit(text,(pos[0]-text.get_width()/2,pos[1])) -def draw_feld(feld,color_key,block_size): - #print(feld) +def centered_text(text=str, pos=tuple, color=tuple): + text = default_font.render(str(text), True, color, (255, 255, 255)) + screen.blit(text, (pos[0] - text.get_width() / 2, pos[1])) + + +def draw_feld(feld, color_key, block_size): + # print(feld) for a in range(len(feld[0])): for b in range(len(feld)): if feld[b][a] != " ": - pygame.draw.rect(screen,color_key[feld[b][a]], - (a*block_size, - b*block_size, - block_size, - block_size)) + pygame.draw.rect( + screen, + color_key[feld[b][a]], + (a * block_size, b * block_size, block_size, block_size), + ) + + def get_block_size(): - return 20,20 -def get_meightboars(feld,position): + return 20, 20 + + +def get_meightboars(feld, position): nachtbaren = [] return nachtbaren -def save_list(liste,index1,index2): + + +def save_list(liste, index1, index2): if index2 > len(liste[0]) and index1 > len(liste): return liste[index1][index2] else: return "a" + + def verarbeite_feld(feld): feld2 = copy.deepcopy(feld) for y in range(len(feld)): @@ -47,45 +60,48 @@ def verarbeite_feld(feld): poschar = feld[y][x] if poschar == "a": # uberprüfe unteren block - bellow = feld[(y+1)%feldy][x] - bellowr = feld2[(y+1)%feldy][(x+1)%feldx] - bellowl = feld2[(y+1)%feldy][(x-1)%feldx] + bellow = feld[(y + 1) % feldy][x] + bellowr = feld2[(y + 1) % feldy][(x + 1) % feldx] + bellowl = feld2[(y + 1) % feldy][(x - 1) % feldx] direction = random.choice([-1, 1]) # Zufällige Auswahl der Richtung if bellow == " " and not bellow == "#": - feld2[y][x] = feld[(y+1)%feldy][x] - feld2[(y+1)%feldy][x] = feld[y][x] + feld2[y][x] = feld[(y + 1) % feldy][x] + feld2[(y + 1) % feldy][x] = feld[y][x] elif bellowr == " " and not bellowr == "#": - feld2[y][x] = feld[(y+1)%feldy][(x+direction)%feldx] - feld2[(y+1)%feldy][(x+direction)%feldx] = feld[y][x] + feld2[y][x] = feld[(y + 1) % feldy][(x + direction) % feldx] + feld2[(y + 1) % feldy][(x + direction) % feldx] = feld[y][x] elif bellowl == " " and not bellowl == "#": - feld2[y][x] = feld[(y+1)%feldy][(x+direction)%feldx] - feld2[(y+1)%feldy][(x+direction)%feldx] = feld[y][x] + feld2[y][x] = feld[(y + 1) % feldy][(x + direction) % feldx] + feld2[(y + 1) % feldy][(x + direction) % feldx] = feld[y][x] return feld2 -def make_feld(size,mode): - x = screensize[0]//size - y = screensize[1]//size + +def make_feld(size, mode): + x = screensize[0] // size + y = screensize[1] // size feld = [[" " for _ in range(x)] for _ in range(y)] if mode == "border": for x in range(x): - feld[y-1][x] = "#" - return feld ,x,y + feld[y - 1][x] = "#" + return feld, x, y + + ## klassen - + ## variablen -screen = pygame.display.set_mode((800,500),pygame.RESIZABLE) +screen = pygame.display.set_mode((800, 500), pygame.RESIZABLE) pygame.display.set_caption("SAND") screensize = pygame.display.get_window_size() clock = pygame.time.Clock() default_font = pygame.font.SysFont("sans", 14) display_mode = "border" -feld,feldx,feldy = make_feld(20,display_mode) +feld, feldx, feldy = make_feld(20, display_mode) -acolor = (255,0,0) +acolor = (255, 0, 0) wechselfarbe = "r" using_element = "a" pixelsize = 20 @@ -101,10 +117,10 @@ if __name__ == "__main__": exit() if pressed_keys[pygame.K_PLUS] and not preview_pressed_keys[pygame.K_PLUS]: pixelsize += 2 - feld,feldx,feldy = make_feld(pixelsize,display_mode) + feld, feldx, feldy = make_feld(pixelsize, display_mode) if pressed_keys[pygame.K_MINUS] and not preview_pressed_keys[pygame.K_MINUS]: pixelsize -= 2 - feld,feldx,feldy = make_feld(pixelsize,display_mode) + feld, feldx, feldy = make_feld(pixelsize, display_mode) if pressed_keys[pygame.K_d] and not preview_pressed_keys[pygame.K_d]: show_debug = not show_debug if pressed_keys[pygame.K_SPACE] and not preview_pressed_keys[pygame.K_SPACE]: @@ -117,7 +133,7 @@ if __name__ == "__main__": display_mode = "loop" else: display_mode = "border" - feld,feldx,feldy = make_feld(pixelsize,display_mode) + feld, feldx, feldy = make_feld(pixelsize, display_mode) preview_pressed_keys = pressed_keys ## event managment @@ -126,8 +142,8 @@ if __name__ == "__main__": exit() if event.type == pygame.WINDOWRESIZED: screensize = pygame.display.get_window_size() - feld,feldx,feldy = make_feld(pixelsize,display_mode) - r,g,b = acolor + feld, feldx, feldy = make_feld(pixelsize, display_mode) + r, g, b = acolor if wechselfarbe == "r": r -= 1 g += 1 @@ -143,15 +159,14 @@ if __name__ == "__main__": r += 1 if b == 0: wechselfarbe = "r" - acolor = r,g,b - color_key = {"#":(100,100,100), - "a":acolor} - draw_feld(feld,color_key,pixelsize) - mx,my = pygame.mouse.get_pos() + acolor = r, g, b + color_key = {"#": (100, 100, 100), "a": acolor} + draw_feld(feld, color_key, pixelsize) + mx, my = pygame.mouse.get_pos() mousepressed = pygame.mouse.get_pressed()[0] - if mousepressed : - feld[my//pixelsize][mx//pixelsize] = using_element - + if mousepressed: + feld[my // pixelsize][mx // pixelsize] = using_element + preview_mousepressed = pygame.mouse.get_pressed()[0] feld = verarbeite_feld(feld) @@ -160,4 +175,4 @@ if __name__ == "__main__": ## bildschirm aktuallisierung pygame.display.flip() clock.tick(30) - screen.fill((0,0,0)) \ No newline at end of file + screen.fill((0, 0, 0)) From 9d37e2464cc248c911543c2543f6b06b4df1d1c9 Mon Sep 17 00:00:00 2001 From: Megamichi Date: Fri, 23 Feb 2024 19:35:20 +0100 Subject: [PATCH 2/2] aff --- __pycache__/button.cpython-311.pyc | Bin 0 -> 2460 bytes button.py | 31 +++++++++++++++++++++++++++ main.py | 33 +++++++++++------------------ 3 files changed, 43 insertions(+), 21 deletions(-) create mode 100644 __pycache__/button.cpython-311.pyc create mode 100644 button.py diff --git a/__pycache__/button.cpython-311.pyc b/__pycache__/button.cpython-311.pyc new file mode 100644 index 0000000000000000000000000000000000000000..40e5a34cab3af985e0dc6291445ec40e4880304e GIT binary patch literal 2460 zcmcIlPe>eR6#wS0v%3Ci+~}&?YJ!1IB3W!xLW`6VijfLZQQBgKVVxOw*Q~qdo00fu z1P>lOc#vN7u+S-pP4VI(lpb;@U*<0vokemq0l!o@B7~S z-uJ%u-n`$;kIl`E1n7s~%X*q8nIbH?Pc(LeXxu(a$N@Z6 znqo9&g2?kgjH`E?L?h)%$kOtG4%aU1*;r|}zPiq{0-g2sZ621mTNXqtt* zBU0U5r1>#b3iv~J96aZft~-mf_*vE>if>{Gmgs62Pi5h{7Y4BykkErmRs%?0vXCYO zz>LX)!z~nyiv}=B(`P?F`(AehwU8@NM>JHb>v@Ma^(9l59Ny4#vlQz{BfuPH$zhfq z;ZasIGmeHOf`jcd)Fs~=)^>k`Jt7fvv2{l9Y?2MT;)J#$>XxV%^ zIa{DCsODcCJ zcE8%TU>Yr7?S`ST+>wBxsT_;L5ZQ$595xZvuNVlJja%m!RBnfuXi%d$-_G`{>aF2u zk-2(($(&zZ&(vfs$Xc8d^&G%%KUcfi(*{RC&)>k#RB_TUM)CEZxeQz4tRL8<%(?11lUp2dVHp}- zcX*Aa9yvVKRkMy6ibbVZPlul^h&^5$^(PgMNywX#6Dj^uiu#Ep?B$X)cp?oRc{go`Y}Fuk zu|(Jh=l9@6?jYVks8SG-p!cyK)CceeKY}_wRd$Je;O?N;|D#U`qUK>D&oU(cWynvU zuS2l~^r6@S`nSdwu=y9C_1FYAHdf;&0L$WOp|ore3^<-dIXbmZ6Zr=!pNUkn_5{mqNy(YMp3FQ!XFwe_kk@c+eUd*}9@ zm+kTGkKD$C6u~S6!i3z}5vVy#ceIi0h*Y zW$aq&wXQJ?(z<_DSV8EjkT8q32p?34&)y5K`o`5G&@sds_YR>l&Ja58>93`sYQ&$? jo1nukH$DRfAY_;_X None: + self.pos = x,y + self.größe = width,height + self.color = color + self.screen = screen + self.text = text + def draw(self): + pygame.draw.rect(self.screen, + self.color, + (self.pos[0]-self.größe[0]//2, + self.pos[1]-self.größe[1]//2, + self.größe[0], + self.größe[1]) + ) + + font = pygame.font.Font(None, 36) + text_surface = font.render(self.text, True, (0,0,0)) + text_rect = text_surface.get_rect() + text_rect.center = (self.pos[0], + self.pos[1]) + self.screen.blit(text_surface, text_rect) + def check_press(self, mouse): + if (self.pos[0] - self.größe[0]//2 <= mouse[0] <= self.pos[0] + self.größe[0]//2 and + self.pos[1] - self.größe[1]//2 <= mouse[1] <= self.pos[1] + self.größe[1]//2): + return True + else: + return False + diff --git a/main.py b/main.py index 9385dd7..4dfafb6 100644 --- a/main.py +++ b/main.py @@ -1,6 +1,6 @@ #!/usr/bin/python3 import pygame -import pygame.gfxdraw +from button import * import copy import random @@ -26,7 +26,6 @@ def centered_text(text=str, pos=tuple, color=tuple): def draw_feld(feld, color_key, block_size): - # print(feld) for a in range(len(feld[0])): for b in range(len(feld)): if feld[b][a] != " ": @@ -36,24 +35,8 @@ def draw_feld(feld, color_key, block_size): (a * block_size, b * block_size, block_size, block_size), ) - -def get_block_size(): - return 20, 20 - - -def get_meightboars(feld, position): - nachtbaren = [] - return nachtbaren - - -def save_list(liste, index1, index2): - if index2 > len(liste[0]) and index1 > len(liste): - return liste[index1][index2] - else: - return "a" - - def verarbeite_feld(feld): + feldx,feldy = len(feld[0]),len(feld) feld2 = copy.deepcopy(feld) for y in range(len(feld)): for x in range(len(feld[0])): @@ -106,6 +89,7 @@ wechselfarbe = "r" using_element = "a" pixelsize = 20 +buttons = [Button(screen,(200,200,200),100,100,30,30,"*")] show_debug = False running = True if __name__ == "__main__": @@ -162,14 +146,21 @@ if __name__ == "__main__": acolor = r, g, b color_key = {"#": (100, 100, 100), "a": acolor} draw_feld(feld, color_key, pixelsize) + mx, my = pygame.mouse.get_pos() mousepressed = pygame.mouse.get_pressed()[0] + for button in buttons: + button.draw() + if mousepressed: - feld[my // pixelsize][mx // pixelsize] = using_element + for button in buttons: + if button.check_press((mx,my)): + show_debug = not show_debug + else: + feld[my // pixelsize][mx // pixelsize] = using_element preview_mousepressed = pygame.mouse.get_pressed()[0] feld = verarbeite_feld(feld) - if show_debug: get_debug_text() ## bildschirm aktuallisierung