From a146880414a400878937e53e7a77eb3834160892 Mon Sep 17 00:00:00 2001
From: Wiktor Szynaka <w.szynaka.411@studms.ug.edu.pl>
Date: Sat, 11 Mar 2023 08:23:30 +0100
Subject: [PATCH] srodowisko

---
 imgs/a.jpg                    | Bin 0 -> 29310 bytes
 imgs/{house.png => house.jpg} | Bin
 main.py                       |  45 +++++++++++++++++++++++++++-------
 tes.py                        |   0
 4 files changed, 36 insertions(+), 9 deletions(-)
 create mode 100644 imgs/a.jpg
 rename imgs/{house.png => house.jpg} (100%)
 delete mode 100644 tes.py

diff --git a/imgs/a.jpg b/imgs/a.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..8871b54e880aacce984be5ce4990a067c8a98bdb
GIT binary patch
literal 29310
zcmeHL-EovL3_QA^1S+5a9vEI|h5{&nrh_;qK3SG!SzdD=L7BN5{j8*2$&<<C%lDr@
zZug(h^!<rGU+MFUJ|Au$>HBv3_L{#tuU{|k?&o%UcamOG)4y@kyi?xkSsTc=_pHsY
z&CNTl?dw_SywmIE>z|8<F0t8v{Z4gYG2pWH`=_QqM-h7@7kDa2^AIC3`JAR$XM`ry
zsl=+nZ9|$4y+ENUcBDJESgDvF-f5i<Y#6=MeI1fVB^WS7uRw=dvZ0B3pooY*<W_<K
zW4Bte2~Ys;rcB?{1fe6>0-zMzY^~a4v{_zhaASKZ)J*W=?WeY=C3jjf1z>teX4A0+
zAj=SBs57jM<mZtkYhYwN!>5=4yFkg5Mgf3UL(Nt>uHv17?o9mHDN@ih@B&G$0bWgk
zn@O%CIs!L>#o|y+M8QK=V91SeA64P|NyhzTf#?C75ws?vV^bDcayJ$9<wsgd-h8ac
z@f6BFpoypn;)aXT!TUT_6DI<+&uAio#%*c}sDrmUrfDjRv%uQV(1caccRQ(xrqyT0
zjh+QIlA0p><QFP-q{~Xp;X4&7Le>hu2sSlEwnjC1r{LlqW%>3VyI8XF?X~Nw`)I?K
zcj32J)l|b0!g5#DRCREJ@wUtrO|`w%P|MZAVrY;iCh*m5Kx4<PsWx`<;v@aF0?A$8
z(6*zRXqw%aXE`;aP{6p$yG?C3H9n!*)Aj{W@x|z?1c19ecp7nQqE37iw;e+`TpqZ|
zwa&D&3Ruw;memq{XcBSms$`wPMNKhToGjUenh0{&$$bQSn=s0&aXz2hDwu*CW80$+
zOYxAVGC^h64_9Gou&<3pHZ;*d4>c7df-&x+sy$5}S%QA=j;Mv>+nPqQh<hQ`i>Q$>
zYrF7mvW=Q%D^0&K?HLAuG|~Jks3~i}X>!U6Z{J@C)#Q=orxr${H5DSpI}9`R7oO2X
z^GCA$)WXPPnntq1O#Ou?HL0@v)WXQantEAbrvAdz<lof;DSlZz6348(Q)IPyr^wc1
zO};(35s&{LyuB*XvyT|&<lC$C4I{?dt~#U15TT}Qj;q-NnpD=);3{zgkJdEhZU79L
zODU)(gRe8S#C-(DX>zij!bVK}age4d(<OkPzKTpu>RN{XdRV%R0PB-{QN*1D9f<2=
zucNj#K@_M>bi$5kYLZJ*_X`Zlc|L#dPC)u<E1w35N=^Mn)b+xGa-PrMxD$-I*~llO
zL8T_K4s*evWHZv|<ei#5fetZg(~R^vd8cMilLdp)%}Ae<cWU+oI>e++Gt%eeo#dV-
zJ4U4CNQb|1C+dzMZS`;nP#~#EF2&k0A}8nh{JfL0C&W4Q9?CFZXzxxmL+68t`UEJb
zZB2({DOBB|)HGZb;;lV;49EBqh&$1w2Oosxqdr7|Gy!D|sk#$5O%Pdb-WCw5X;YTP
zb0vq?6qdC@dV)QmDIjY?axr~IQz7B`6}U*(1wW~&66nR%)CuFSXgWdM=$V>~<y<J0
hce>Cq3@UjiV>uT}<()2c41-GE$ym;XQt$IlzX1=L(v$!I

literal 0
HcmV?d00001

diff --git a/imgs/house.png b/imgs/house.jpg
similarity index 100%
rename from imgs/house.png
rename to imgs/house.jpg
diff --git a/main.py b/main.py
index b6f72a3..74f4380 100644
--- a/main.py
+++ b/main.py
@@ -1,18 +1,45 @@
-import pygame
 from gameEventHandler import handle_game_event 
 
+import pygame
+from PIL import Image
+
+
 pygame.init()
+window_size = (800, 600)
+screen = pygame.display.set_mode(window_size)
 
-canvas = pygame.display.set_mode((800, 800))
+# wczytanie mapy i ludzika (jezeli chcemy robic to bez przeksztłcania pilem i uzyc samego pygame to trzeba miec img w tym samym
+# folderze co gra)
+mapa_pil = Image.open('imgs/house.jpg')
+mapa_pygame = pygame.image.frombuffer(mapa_pil.tobytes(), mapa_pil.size, 'RGB')
+ludzik_pil = Image.open('imgs/a.jpg')
+ludzik_pygame = pygame.image.frombuffer(ludzik_pil.tobytes(), ludzik_pil.size, 'RGB')
 
-pygame.display.set_caption("Inteligentna śmieciarka")
-exit = False
+# pozycja ludzika
+ludzik_x = 0
+ludzik_y = 0
 
-while not exit:
+# główna pętla gry
+while True:
     for event in pygame.event.get():
         if event.type == pygame.QUIT:
-            exit = True
-        else:
-            handle_game_event(event)
+            pygame.quit()
+            quit()
+        elif event.type == pygame.KEYDOWN:
+            if event.key == pygame.K_LEFT:
+                ludzik_x -= 10
+            elif event.key == pygame.K_RIGHT:
+                ludzik_x += 10
+            elif event.key == pygame.K_UP:
+                ludzik_y -= 10
+            elif event.key == pygame.K_DOWN:
+                ludzik_y += 10
 
-    pygame.display.update()
\ No newline at end of file
+    screen.fill((255, 255, 255))
+
+    # wyświetlenie mapy i ludzika
+    screen.blit(mapa_pygame, (0, 0))
+    screen.blit(ludzik_pygame, (ludzik_x, ludzik_y))
+
+    # odświeżenie ekranu
+    pygame.display.update()
diff --git a/tes.py b/tes.py
deleted file mode 100644
index e69de29..0000000