From 613ade1a0ea297bfb895ec1cac68a76f8757eed0 Mon Sep 17 00:00:00 2001 From: JanEhehalt Date: Mon, 21 Nov 2022 06:08:18 -0800 Subject: [PATCH] laeuft wieder mit neuer guter Struktur :) --- Makefile | 7 +++++-- inputHandling.h => inputHandler.c | 18 ++++++------------ inputHandler.h | 16 ++++++++++++++++ inputHandler.o | Bin 0 -> 3608 bytes main.c | 4 ++-- main.o | Bin 6296 -> 4256 bytes spiel | Bin 17728 -> 17728 bytes sprite.c | 4 ++-- sprite.h | 4 ++-- 9 files changed, 33 insertions(+), 20 deletions(-) rename inputHandling.h => inputHandler.c (83%) create mode 100644 inputHandler.h create mode 100644 inputHandler.o diff --git a/Makefile b/Makefile index 0f0d972..044400c 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ -spiel: main.o sprite.o - gcc -o spiel main.o sprite.o -lraylib -lGL -lm -lpthread -ldl -lrt -lX11 +spiel: main.o sprite.o inputHandler.o + gcc -o spiel main.o sprite.o inputHandler.o -lraylib -lGL -lm -lpthread -ldl -lrt -lX11 main.o: main.c gcc -c main.c -lraylib -lGL -lm -lpthread -ldl -lrt -lX11 @@ -7,5 +7,8 @@ main.o: main.c sprite.o: sprite.c gcc -c sprite.c -lraylib -lGL -lm -lpthread -ldl -lrt -lX11 +inputHandler.o: inputHandler.c + gcc -c inputHandler.c -lraylib -lGL -lm -lpthread -ldl -lrt -lX11 + clean: rm *.o spiel diff --git a/inputHandling.h b/inputHandler.c similarity index 83% rename from inputHandling.h rename to inputHandler.c index a0d3da7..7ad9785 100644 --- a/inputHandling.h +++ b/inputHandler.c @@ -1,18 +1,12 @@ -struct InputHandler{ - int pressed; - Vector2 rectStart; - Vector2 cursorPos; -} InputHandler; +#include "inputHandler.h" +#include "raylib.h" +#include "sprite.h" +#include //TODO: Macht es Sinn ein einzelnes "Game" struct zu haben, das alle möglichen Pointer hat zu allen arrays, camera, textures etc? // Man hat einen Übergabeparameter mit dem man dann alles verändern kann, man muss nicht alles was man verändern will einzeln übergeben -/* - cursor.x = GetMousePosition().x - texture.width / 2; - cursor.y = GetMousePosition().y - texture.height / 2; -*/ - -void mouseInput(struct InputHandler *inputHandler, struct Sprite *sprites, int *spriteAmount, Texture2D *texture, Camera2D *camera){ +void mouseInput(InputHandler *inputHandler, Sprite *sprites, int *spriteAmount, Texture2D *texture, Camera2D *camera){ inputHandler->cursorPos.x = GetMousePosition().x; inputHandler->cursorPos.y = GetMousePosition().y; @@ -54,7 +48,7 @@ void mouseInput(struct InputHandler *inputHandler, struct Sprite *sprites, int * } -void keyboardInput(struct InputHandler *inputHandler, Camera2D *camera){ +void keyboardInput(InputHandler *inputHandler, Camera2D *camera){ if(IsKeyDown(KEY_W)){ (*camera).target.y -= 100.0f * GetFrameTime(); } diff --git a/inputHandler.h b/inputHandler.h new file mode 100644 index 0000000..5cda884 --- /dev/null +++ b/inputHandler.h @@ -0,0 +1,16 @@ +#ifndef INPUTHANDLER_H_ +#define INPUTHANDLER_H_ +#include "raylib.h" +#include "sprite.h" + +typedef struct InputHandler{ + int pressed; + Vector2 rectStart; + Vector2 cursorPos; +} InputHandler; + +void mouseInput(InputHandler *inputHandler, Sprite *sprites, int *spriteAmount, Texture2D *texture, Camera2D *camera); + +void keyboardInput(InputHandler *inputHandler, Camera2D *camera); + +#endif \ No newline at end of file diff --git a/inputHandler.o b/inputHandler.o new file mode 100644 index 0000000000000000000000000000000000000000..ebae5d74d9f844251e68bbc9f1e7c0d1d6d480cd GIT binary patch literal 3608 zcmbtXT}&KR6u!%1yDBi-+J~AN-5P(;Y)3GCsWCdcFfhcWZTP7)V%CAZl(pRov>yV$ieaP#+Swb*-(2$bqc0-y_@vRdR zmtI-_;L4Yz@}Svl-l@6u=bKH^1WgZdH{3d!G~ErP0VBQ1_~|X41b9#H@(pB^u4df2 zTl3Np8zU|M0^aPP1G`b=!=yS;|=GH@rMjp;qk=-><}k2BiC7|`W$7!n7&y_IqIG+sK+q*nmU z#3Cwd%4x*@T?8cJ_+bSwhsh(B!fB^gwWV*gcix5X=TAKheG-Nq(sXv$-WF1P(aRMg zcr($Eu3|yEtY?$hGuXf}SQ|Ym$!i-U^&g4Ed+m`DYnh{xTInTLzuf>9A-CToWHUb&pRuhV7&-$mivrbG?qY>%H}AkKA)!?tRI}NjtET@Zj_eUK}TFgj5lW!-I0l zUr6lc2#GBuV`n;!CsyHurT~A6>HYu`QM;0#w)J%$QeRNPaMPDVxdVFAWTgs$==FOg5+H$so0d(dKg5D%!=eL53`EpLJ}zY+N>} zWzhoZH}xAMblTR9YjZSLG^lmZZiLQJ9Suk4&7w^+g#x)w7pKa)S@44oS#QzB{_+h2 z0}hyaiH;RZl#pkk4ir2C9q{}GKMyDu5CjS0SAE#S@ebkka{?~{H@T+H)}2>d682jfm70D^IG{&+qm0T=s|WJeY4PYU)= z3iuNOewN`pE~q?F1$)uYMFAK6T#4{=Q?M8PED5;iXC=bVJ;7e|QxR~{Pc_0%iq(hp zvKD$se*ov_lgQR$$=0V}wM~DWgP(`B13*hDVqwoc?J%ObK__BYezQi&R%Gs-rV z;Wyx%W$V+|+5Vd0$n$1-o|^U|aL^N-&ClS0VVV5DB?WXGso+hi0EY4d>yN+lZTUN{ zcyHniDe#Cg%dYS{ta*=v665e2{4_Iuf#HELDKFQd89 zdo%9yQ~JIRE}yb~Twts!@}0<=^HAX%;WT4x61b6vmZ8If@zow8am>WCAX zMm>#MK)r~11$7OziMoq=3$=&(5cP>va7`WRBeBpMWS>yKqy9wwi^}0~^kj0gy53~o za(SgxEPE?UOIH^wUZq$nFM80jCL*ov^>(9JufuI?HLy1urtGZoB z2j8q~WpR-ybt_GbVUdG>eq6?&=QB(m*Af|AqoyWEK1%ooq>eaUAl0L!`i$@~!rSsZBIIi0B7$ literal 6296 zcmbtYeQX>@6`!-6^a@V)915f)ZLc4pF0wCnND)C5oIlQ<2s=%4cIt`*ckNr-NA7m5 zy}ddPO-W@h%4&P6C1eSqBK03cg(`tmOx;SY&rRq#5`Va&LPjDYg@BwU2-8!LRaG4C z&CdA7=UZgpNqaN%o8No$-kY~GYkx1+(^V4)5Fr8bby6M)l#sojE%&3W8zsBRE>cwP z{kWexe~HtnTa-HISE!R+rcVD7b$atXPHcV^$s<&GE#^l4wOoy1T!tfx#X-MrQ}>f zHPC2U;`&X?!U?e6v?d1NQB%InS#b)?9XT<|^bIhD!~(ABj%ngpM`I0)U#B#K}T*FJk}Q3aE(XhY>&>hPD}sP`hh}PF<$o zIt}~hRXr4a2#Oxu%&sjwDY^JC^A%QLHBnTa!hqIz&Q4*@U;wYdLVUYQENxt=b6ZLx z*Gwt6(6(KrvU|aqD;uH4>GQY7Aesbq>kc%6E$YNpTk|x>4u-eifz4P5*YZuGIs4_0 zN+p_m6o|m|>X*76>dwA`la76jHM6VGxb`pL*Rj{&w_yJUewk*$jutn%wA?*j?hc4< zj@x4@kZM-AkYyY7%(c%1&DL~}~OLMq*X%5{h z&0#ov>TnU0dM?fLN5@OX!8sZs2fC|;n_=_zfw0q-6w+7 z*-4#~LANdBbcNhmbga{PcO!}^=1;(7^>Bm@lowhc2F3uV?0N{=wXcI-mD6Nn=j{-q zVVzZ_v4Y64x)EDLb8lfnX)fpOLu9++(u|>ikZakt^eUSYFzf zJ}89E+2RR53)ynX)OtX%AKAj;DZj9h@=$IJeDMz4273k8*ld(ca(D8PG( zdT@K_d6C&1daE2aoV#%E6e#l1G@jAgd#Hv=ykN(B0g#|XX7MRW}_76Vc;5>#!-P5ZH z`sMxXRI_$?)#sjGzj6sChty1RI6RTm6UGElGa1dw98}ZUlx9W7^-)y6@C`zi+6nof zgAf&-C3wPZq`RZzYvIQJp{#CY!$%^ABQ4FXSvG2Y?odml<#43+5f4Wrqz;}CJa}kz zAL}PIgya#cg$Ly>uOWeRCrIFID6p^ojvyW-VZitExqpHZiR})3zoui?&e&9K?P?9M zy!j~S+{9LJYW~FL!vH-E56UOFsFu*oVv-~#ym4^|(Q)3sH67C6#$Uok8d!)En&H)RAr zkgq_m8s6=LpYp*CAKdoAUj!We6#lV&2kgf_{Ga;ZzvOm4;9JJ(1F$!I_?La~Wgq;i z5B{MK{;?0f6AH0fp7;3R`+e|-eeg$p@Gc)b?t_2Z2OsyrpY_2>T21PaVRBR-&stQ~ z6DiFkX(OA_7(xcSdme9Z>lu8!t1BMs8|-Uq?}-hPZq4dN&T%7?w33ESj%L`nJ!@Hp ze%#dHfJ=~0Q=K@W4O^-{n$mibx|Z3@JE5gC6^Ze2GihmUi3B;LO%55VneY}rn)#+S z*=bDZxL}v5rnSCgT4OGQ!%6E&?>Ox-)I^_l*2hPIS)5z)xZ?e}&XootPr@}%^Pe`ce8aWAJ80MiKO&_(!#ORn|rqxvPoF;(y zu$s~c7!YfE4#vlfY%0-_GBO%?0l(bu!NH6L{tOO}of#ZalPM@k@&NvT;PHuHRB*#E zIf5WaCH|BLGkiDn1)mwK!k?1(vi)EA;J^35cR@X&;8lTljkr6;IF5cQ@CbiQ3CH(K z;EsgL{=Djg|C!^J>kcCTg6lTGBkZRoT+UC3pF_z1jKsfN!ttyYcJAl6ST_uFC^3mI z+c_rTvYnGYcFswB+0K-N%XVBJJ3p8BvYmMem+jkDfGquS6drZ8b9SJ v&hU+`hap0h`e?Iq?@@CeFME)jNVGR(vGOi!@Qkje|1$UAlF87oFh~9k`8;p1 diff --git a/spiel b/spiel index 9259a8fca727cbfc587a82b3a7f994c43c991922..0c1b6ad80eeb5ddf2de2734b3e0d9d00a4302347 100755 GIT binary patch delta 1744 zcmZuxYfKbZ6u$Se%X`^fc5!wVlwGKRjq*mY1zBOY8Iq@-=!_aQv#SKMY(K-am)OXS-QJG&5%YYIr{wFt)C73wC`+W+X6_(w z`1S^r$y?d!4R}kI*&C0cL%zmtuYSR@95mXE zs{av8rhOhW5sfFw4#CmQEoL7UPm2nd`h0QB6EE-Jq)XS1`AP)f(WJl&-`Rc-JX>l|((T z4Es0vZ67a-BW0^sP{Ai>lA|C|%COZ(_z!jdPX>FC-yY#>b^dDx$B|!ssMpz|^BoMv zr1ZeO&6VubY&9YEC^t~LD+zJ!+1K3IC=M#@8&xzl>g5I`a4yKqyrzAEs4Qw)5OF`^ z4B};+xNby04$1=Jd3P6enmD(Gm9q6Hvh!x#-G}^RZ4I zx4bbH4lke-qm;p{E4#3JLDK}yUAXKh?I|8z7V|RcE)qlg`IQO;Z66Z zB(#W^3sRwVxbLnq4x{P{6l6@rf4jqCqzYIIB|46KN?>>4SxQG?wormQg^sxIFp=V& zUWLV??6Xyd6hdqy@=xHE`I>=(VoCl-=qV(&LMTr+4eHUGj4dgVh~+u&7@R?GDteQN zg>3Lgg6r=vkPNtr-fgIHX+L~Dh9SnO?L@8`Q*#49i> zIjUFC3lI=7ez6C|eoNH32iBbuUEz!&n*S@Tg*GQ~p=Kd6A)ZKn7J%*VwRQ3B=)(iK^`NIpqJnLt|MGa%mJ!?C@7WaHzHS`|HrFEJ4GN_!A!nP;4YKoHPkG`NgN)|JzJUFON&L!ZmhuXXz@JrbIm7W z_KUqiM7HX^=4|1}4MP}@b1&Q}8%=ztspVL^Qs30jc(^Ulw`-h%DaI6dy}X$Qf)#ZJ zoI7__UR-3F6gW^-Y8`ilt3>cZz+ZKW(pZ?SNC%I%k>4@?5&R>@JsGUU#89N+@p%wO|)m>XN95NyRi;1*F8ZNU>QO(^jDJ zuz)7Q(bUHN5J;6D#e$nOMoHP2#-gT4O^h^E1E`IcU{VkYl-Kpl>|H{mlg#<%eBU`| z&YhWEZ#VUJ(-8*^aR`JD2UO4kS_tRqiqR?gxNU?kVaohsM)8Ime!F;g@2Ba-e@qYF zJ`ra2oC_Gz3j-QRHr)n;Ey~)vr6_eSeY3Yt-{5uil;2&{8y!0N%odc`;?lb}6{X$l zKE#9`(&23?lArp&1dW`<5=0oV*@Vqa=#7roOw0E+VaAptq=kVc`bgpltToR1l(TtN zefumrtnw}1y`0AK>_QOBN`%Si2;p!j%tbfrP6rY)PFd#Zb!dv|H+j~1TPgBATrBDh z;kFRi6PsXa_VZU%{(dmLjC_TkZ&dk_U;yOJe*S>UpACkI*m#&VC8U^x3AynN?m8|7 z;LdbSQC#nJeDV*2d<}}Ou3PfgYmj3;6)_k@2%cMqYmv93y%+@7&6yd;RXSCrD^))o z{W|>vFH6Z%wTvJzSqgR1BSo1#$~Np=g%>PI!nIXswpa!CBe-O_DQvC4E0K~gwgTrP zyAsz{Su-C>SOQxk47z@1ZB6<!_{+Cu65<8@LSYi&?G)S`Op%)V{HttUBdm^ zZc6WC?5gK}Y>Cj)dXSKbQbK0R2&u+7fm14}JXv4QYSQR{167D&IDdVhC?6m`y`U&# zh%X`jggA!hdk*mme$3y9A1^D40WYC*MNzU4-^MNvBksW`#n(Z1(ganY}bvSOf1)8yk;dSV?$AvmE zqX^yL4Op|6YTI#{AdEKGsJZQ~3d2`I@S}uBvBL z^((IafU1Gm{U@sA&(CMa`Fzn2wtuW&(2&pRa K1>2zdVEn&I;0zrA diff --git a/sprite.c b/sprite.c index 14f3f9a..e15d1f7 100644 --- a/sprite.c +++ b/sprite.c @@ -2,7 +2,7 @@ #include "raylib.h" #include -void SpriteAdd(struct Sprite *sprites, int *spriteAmount, Texture2D *texture, int x, int y){ +void SpriteAdd(Sprite *sprites, int *spriteAmount, Texture2D *texture, int x, int y){ if(*spriteAmount < 100){ (sprites + *spriteAmount) -> texture = texture; (sprites + *spriteAmount) -> x = x; @@ -14,6 +14,6 @@ void SpriteAdd(struct Sprite *sprites, int *spriteAmount, Texture2D *texture, in } } -void DrawSprite(struct Sprite *sprite){ +void DrawSprite(Sprite *sprite){ DrawTexture(*sprite->texture, sprite->x, sprite->y, WHITE); } diff --git a/sprite.h b/sprite.h index f060300..1365b4b 100644 --- a/sprite.h +++ b/sprite.h @@ -11,8 +11,8 @@ typedef struct Sprite { int hasDestination; } Sprite; -void SpriteAdd(struct Sprite *sprites, int *spriteAmount, Texture2D *texture, int x, int y); +void SpriteAdd(Sprite *sprites, int *spriteAmount, Texture2D *texture, int x, int y); -void DrawSprite(struct Sprite *sprite); +void DrawSprite(Sprite *sprite); #endif