From e01d187ea5beafdd6668de5b2f25f55764a9cf41 Mon Sep 17 00:00:00 2001
From: administrator <webmaster@r6-gaming.de>
Date: Mon, 15 Jan 2024 22:01:13 +0100
Subject: [PATCH] Code cleanup Added testmodel bitmap Added Prototype for
 imagemodels

---
 data/models/testmodel.bmp | Bin 0 -> 33586 bytes
 modules/GameObject.py     |  10 +++++++++-
 pygame-test.py            |  19 ++++++++++---------
 3 files changed, 19 insertions(+), 10 deletions(-)
 create mode 100644 data/models/testmodel.bmp

diff --git a/data/models/testmodel.bmp b/data/models/testmodel.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..dabcf9de55bed1ee761ba1e5e98f76ba6db7038b
GIT binary patch
literal 33586
zcmeH|O^y^X426qZuwco8H46^Fo@21(5O7{@fCN@YL~h%0Y$r}tO=m<miGQA-zpBxE
z{r36S@%Z@y-=E;~13us3^X_;L-^cOi=i|SpufNy+`S{^C|94Hx$8k+x;EE$8k*hhs
zBum0fzg~yv#aQatl<XCVUWTQ@sieBU^{3;!21^|zf#fPCy{Xr;S%$$Vjj6yC@l#oj
z^B7l9*mzSXv7E?YqLddNsXv2d#`YPS1XcICmSy(FE&VQrDFq8zwibo>lvRqznkk~;
zRV-U8ilzpGtyyy)8aJ8G@~q8Tb2)=qkz|(Z7s6l`PtRnzcoj?$pG6zEVAeT}rMLkE
zXBl_ttTB_rQuOZHetNNJY3{R4U@5wu&L$uz8k>l7D$8uM0e++<)!{srsWu6c!K-L>
zP!rlGu@v1waNJ;$f@pYfRwm0qYuWA7an4{l-BdQksz2BHFw41i>Xyq66a9~|oM>bj
zJU)nT!D}p$0hZhXL@YBeSi^S-n2fUI!|w~SVB;HkafVp(v3Cav*v6OgvmBr4ecsFJ
z2UnZHa@np6263GBp-z?~qwJ>6tqkwzVHqBBE}Ovg*ruDMgqpL2h*bC#GqdFKPdabz
z64=+qG9dg0;Ci>-EY*kZ!f9aX(o>z?FX`I7$I>NsKUN0Eb^@Da59cJ7cA1``d*_WD
z)c2BT+#AT4dkcy-OVSP3F*o<_w$L!Myf=y&?g>sV*<eZfUi_sj*t$$?Ecr8d%?QCs
zAV@4p$9^d*Go6fqWmVb-AV6?pCX6Mi-7h7k#aUuLJ(fgiUpdaoWV5U&%m?zTTl=0_
zk}CWH*N%N?QBqlMY%Kx=XDQn(Te#GCk0r^&Rh4_`q{s@rmn8qvtPIO@T$`l<n^@9j
zNiuL11$M9!;KcsFmn2g=_CX;)ply~4t6ple>=Cl(H%mLKUgc)lBV^A@EJ@5Rwkt8Z
z$KM_tfb%9~CxFpymUeDZ<z^{SiN!X{7&obFvy`aBVw+`*o78nfmesPf&zZ4m3=Vhr
zJC6Or`Al?dHuknzGCZ!ptyp5S_3T<VwYXY>!{fb#X*dSw)cG!PVys+U3VFrE+qGE|
zv-O&X$E95Tl*2t)f_K-_NyYbJNu2U)5+S=RvDA1kp~^0qR7srjYtmf1EV1;TB?yp=
zT{5GRn1L&ISb`bTEt=fnO<0!YxP8mgNj1a_Olh+`@u?G=*ol%#VkXLpHV{i_A|;|s
zc93|0E1B3WAoUqn;-QRCS@JzHd|^%Ev0QNhoOul?$iB7=T%M%}rnQY&JU!T&{>&1_
zwhE^^;)1Txu3|nb98u;nmN0~rhsU}a$xyiJ?YzF*q6-?cWG?P9uw3Ag7%W$8Q#{AI
zL@8sCPsEK9OUUa@SYZ6jXF<d$JJM?$QOo$Onkt6|OGtKGiBjOoN0f+5N)&M^Sc)xE
zJS+o?DmF!T5L8-PsfkkJ2vMI`wpl{0s1aKiPj1PMD7Q56+`!o-tFlyZ#`bPmEAhat
zxJ41iWyW(rt;Z53E2>5Y;|k*dj8?n*DozY6OLvz?xIl3iONE_u8+AWsmLSs|<t@;y
zjbyz}y7d+_9+pL~JJwiWaW`0FbfTBpJ@{D;617{KRjH#=vR(sGmUWKe1*dBLi3jXQ
VIfoq%vkXsudySjryk~kG{{Vmn%%%VU

literal 0
HcmV?d00001

diff --git a/modules/GameObject.py b/modules/GameObject.py
index 22fd82d..817cda1 100644
--- a/modules/GameObject.py
+++ b/modules/GameObject.py
@@ -19,7 +19,7 @@ class GameObject():
 
     __movedirection = {"up":False, "down":False, "left":False, "right":False}
     
-    def __init__(self, name:str, surface, mainscreensize:tuple, posx_init:int=0, posy_init:int=0, move_speed:int=0, is_player:bool = False, is_rect:bool = True, rect_size:tuple = (10,10)) -> None:
+    def __init__(self, name:str, surface, mainscreensize:tuple, posx_init:int=0, posy_init:int=0, move_speed:int=0, is_player:bool = False, is_rect:bool = True, rect_size:tuple = (10,10), image = str()) -> None:
         self.__name = name
         self.__pos_x = posx_init
         self.__pos_y = posy_init
@@ -37,6 +37,14 @@ class GameObject():
         self.__surface = surface
         self.__mainscreensize = mainscreensize
         self.__score = 0
+        self.__imagepath = image
+        self.__imageloaded = 0
+        if(len(self.__imagepath) > 0):
+            print(self.__imagepath)
+            test = pygame.image.load(self.__imagepath).convert()
+            self.__surface.blit(test, (10,10))
+
+            
 
         #self.__rectobjekt = rect
 
diff --git a/pygame-test.py b/pygame-test.py
index 9293dcf..4213e5c 100644
--- a/pygame-test.py
+++ b/pygame-test.py
@@ -22,8 +22,6 @@ clock = pygame.time.Clock()
             Actually buggy if player logsin the first time, because there is no playerselected before there was an insterquery!!!
 """
 
-
-
 #Behandelt später die Hauptschleife und Klassenobjekte
 class Game():
     __state = {"win":False, "lose":False, "paused":False}
@@ -77,6 +75,9 @@ def spawn_entities(x:int, list_of_objects:list):
 
 player = Player("Player", MAINSCREEN, MAINSCREEN_SIZE, 10, 10, 10, is_player=False, is_rect=True, rect_size=(50,50))
 
+testobj = GameObject("TESTOBJEKT", MAINSCREEN, MAINSCREEN_SIZE, 0,0,0,image="data/models/testmodel.bmp")
+test = pygame.image.load("data/models/testmodel.bmp").convert()
+
 background = pygame.surface.Surface((640,480))
 
 
@@ -89,6 +90,9 @@ count_hidden_entities = 0
 count_spawend_enities = len(spawned_entities)
 print("Es wurden " + str(count_spawend_enities)+ " Objekte gespawnt")
 
+testx = 10
+testy = 10
+
 #Fenster-Hauptschleife
 while active == True:   
     MAINSCREEN.fill((255,255,255))
@@ -110,6 +114,10 @@ while active == True:
             elif (event.key == pygame.K_LEFT):
                 print("Keydown")
                 player.change_direction("left")
+    if(x > 0):            
+        testx += 1
+        if(testx >= MAINSCREEN_SIZE[0]): testx = (0 - test.get_size()[0])
+    MAINSCREEN.blit(test, (testx,testy))
 
     player.draw()
     player.update_pos_lastframe(player.get_position()[0], player.get_position()[1], False)
@@ -173,13 +181,6 @@ while active == True:
             y.hide()
         pass
     x -= 1
-
-    """Drawing Lines test
-    pos = 0
-    for x in range(20): 
-        pos += 60
-        pygame.draw.line(MAINSCREEN, (0,0,0), (pos,0),(pos,MAINSCREEN_SIZE[1]))"""
-
     #print("Objekt-Koordinaten= X: "+str(rect1.x)+" Y: "+str(rect1.y)+"", end="\r")
     
     #Displayflip sorgt dafür, dass das Fenster entsprechend der Tickrate aktualisiert wird