From 2b1fda8e86903a071371440a40fe3d8ef6be2b51 Mon Sep 17 00:00:00 2001 From: Jonathan Hager Date: Mon, 21 Nov 2022 14:20:07 +0100 Subject: [PATCH] Struktur angepasst --- Makefile | 9 ++++++--- main.c | 10 +++++----- main.o | Bin 5544 -> 5184 bytes spiel | Bin 16464 -> 16480 bytes sprite.c | 14 ++++++++++++++ sprite.h | 20 ++++++++------------ sprite.o | Bin 0 -> 1648 bytes 7 files changed, 33 insertions(+), 20 deletions(-) create mode 100644 sprite.c create mode 100644 sprite.o diff --git a/Makefile b/Makefile index 2450243..0f0d972 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,11 @@ -spiel: main.o - gcc -o spiel main.o -lraylib -lGL -lm -lpthread -ldl -lrt -lX11 +spiel: main.o sprite.o + gcc -o spiel main.o sprite.o -lraylib -lGL -lm -lpthread -ldl -lrt -lX11 main.o: main.c gcc -c main.c -lraylib -lGL -lm -lpthread -ldl -lrt -lX11 +sprite.o: sprite.c + gcc -c sprite.c -lraylib -lGL -lm -lpthread -ldl -lrt -lX11 + clean: - rm *.o + rm *.o spiel diff --git a/main.c b/main.c index c24c249..e37e162 100644 --- a/main.c +++ b/main.c @@ -10,7 +10,7 @@ int main(){ InitWindow(800, 450, "basic window"); Texture2D texture; - struct Sprite sprites[100]; + Sprite sprites[100]; int destX = 0; int destY = 0; @@ -22,14 +22,14 @@ int main(){ texture = LoadTexture("amulet.png"); int j = 0; - struct Sprite cursor = {&texture, 450, 225}; + Sprite cursor = {&texture, 450, 225}; Camera2D camera = { 0 }; camera.target = (Vector2){400, 225}; camera.rotation = 0.0f; camera.zoom = 1.0f; - addSprite(sprites, &j, &texture, cursor.x + camera.target.x, cursor.y + camera.target.y); + SpriteAdd(sprites, &j, &texture, cursor.x + camera.target.x, cursor.y + camera.target.y); @@ -43,7 +43,7 @@ int main(){ BeginMode2D(camera); int i; - int length = sizeof(sprites)/sizeof(sprites[0]); + //int length = sizeof(sprites)/sizeof(sprites[0]); for(i=0; i < j; i++){ DrawTexture(*sprites[i].texture, sprites[i].x, sprites[i].y, WHITE); } @@ -57,7 +57,7 @@ int main(){ /* if (IsMouseButtonPressed(MOUSE_BUTTON_LEFT)){ printf("Klick\n"); - addSprite(sprites, &j, &texture, cursor.x + camera.target.x, cursor.y + camera.target.y); + SpriteAdd(sprites, &j, &texture, cursor.x + camera.target.x, cursor.y + camera.target.y); } */ diff --git a/main.o b/main.o index 6b235b675dac36d4dad1734a7d280be8ac16719e..8506279a12a778e2e01b1bd9b8ff435b49f657ff 100644 GIT binary patch delta 1699 zcmZ`&UuaWj6wjBNKle6GlP1yI+B$D*gxIw;k!lb{8e2+~!6xfNAFZa-!sd!r1UFV( zz2YSn)MM2LANnNXQ$Y%Q&^55ptZWa90~NLh^+iRUg9%pX%+5KvAAATo@cq7fe&_to zcka30z4>t|bs^;~MK5-(^M9T{{Zha9wg-AeyH>W-Fd#Z}o_E!1erAmaE$`gVJLPBm zShP7%oYg7r*avuy1cVR8A_q+!#dxsmT z^z%Ci#hDd&?`;dNtWdo^u(VFm2LoCM;+VEGL;Rq#RO@B>XKUK-!_uN?(?L7fiJaeB ztyVdsIJ*iJtxc@LD{T;QtIrl`_`#P7rAdY7P2Ww!3*WGK1O0vran!%P?+u>ezV0G5 z#-+}bCL3@xC?jf-w2~hx+uiW1ze6P9m4CfRK`2m3bW>*J%oEJ}BJ#TQZ=}mk!asox z7>)+Bq8swTOX4T^Gq~A2IC^~ikacqWXyNOVp3$#Pd^tARJ8|?dY|(dUD2K!P-VI57 zXvam?5Jbo|MbCN%!h!s>ru`Ry*ZO#?j&#gJoz;x<@G%S(!xSxyNyc8ros4@lrY=r$GQ<#jK8MhI_d`O3KXuUphY1X%zYk6~nc^G5)&(UeqU5~is6|pV+M0053OC>}o;$BZo0aG< z3a{2|hg`(WY@)Ajnq*csH6IxRmD0gsH0k7)sJ;lOLbJc zpb{}#2kG{q$^KI{*HeH@)SQ~C6Lnmkrm+^6oW?zcHx>SY!qc^s`A-$TRpI$Q(w{*G ztb-HH8)3frp=banmNg#HT|)Z|mSb7(z93{`Yawd*pgo>c-RrSNI1+C$KB3EvmIf!D zHNJH{3xpAezff{rsgOu|=Yp^&vD^6F&Fcpzku}oMT8$Q1PGq4!u8VVEtjQYJ=)R*3 P!Cv(8Zq_8%#`FIN@1Nj! delta 2024 zcmaJ>e`p(39KUzDG(XxVxwI}#8`flt7;BW&s_CYT)}`{KOdQ*^h|0>UWUyh;cA}tZ z$xe35!kT_53=wKU(J?kAf>cnJPG=kp*&iZ9P&;X*V!)30M+SrV{l4VzQLP_%pLg%` z{k+e+cX#iKv5)VYiK#Jvp{Fy$v*j>1->PzRa-Ew8*33OCDRXF<=Z4mEO163^bF6;J z&+w&XjhmNoSmlhmHEyc^S-k$T_s?R*+cUIM@#+K4|MNW5Gqg;mmbxkbG@}dC_lK9~ z?FxdMr8Vkju6}iZo2&cybh)GOJxFAH%4Uk-#El{{970F29B;pVSs> zh!a<)uPRDSF~4oa66R1XXCxr4Zet0^sS)J!>Z84+r_67}26*=Ca8`t}oDst89b(`; z^&ln+M{ceRL0cCq!^5@|@|!k;#b>oxa~$0aSIT}FhdymTTY(c=82POB2=cPl86*c9 zluKk2VaJOTPn3)pwAmw3dR7&$FaLbKH%^IuWU1nf7fmCIqf5`iEqessu%By>;ZX4& z{}qE8uh9rYe^WP$!bnq+#bBmsmVFM}9ryZZMGMcoa^wgMJG$VIV+XwN;E#u}LXB{N zXwc((N8R1pq@HbYI29#|(qp6}+8sz%oo8(}hXXyZN8ayaw~`t)G_MK}MUKhnvlT z%tv@dAf*Z09s24J*GNRD*lgIWZU0Ong8cMAEPuRVu>2k}A(9Q9{4Q*kKU3G?^%k9- zhJ}_uu(%;1O4AY7sXAKTP>t1#N{SXlP(GbvEB`4;cT4(+q|=MG{2AzN4Funns&wG2 zY8nbyJxLD&L2G%jS=HNAWh&f4?jsH!B@2Q&9h>F+On7bxei5cU0hWfnoS#>Z7_@Vfpxu%#=L~O> zb5!!TE17?Ga7-%5L2qvo^q1t{g1fVx#GMWP1Z^J?qVtcSCqYM6_%ryyCmRK8$JT^F zX+noJ0sSW>Jt*m?CB0M9=Ow*M(ic&ugCXuH1b6$k>jN}I(5+Cr0E50?*ky?5NtZ&O zC1MIj^`xpgL3eJ!KUd7|qtl3ggf{rV>6`U;xP*XOKScaVl{?`%|1LG%nBb4m<&XYd rt}`?baS$SHN!Jv8t%wAS;;7oF;U5S`7wNnphT$fS8qNt=(7XQz=LA`3 diff --git a/spiel b/spiel index f6c02a60c11d7a331af6a72f5bd29feab543c193..ad1e946f4966d9b26b2dcb92f27c3460f8a2d135 100755 GIT binary patch delta 1732 zcmZ8geNa?Y6u2bqu06jJ#y^L+;i_a=XZYR z+;h*n)Jx}j>5zxc4R5*@R~1kAR|Phj9alj$tpciO5iJh)(L$?mk-)dMARUHs`$pOZ zZ`#-A)JT1I%qBvbq)<$z2VR>xP@dZ%AnkdGAfI3+u^oNB@%Ma zVv~2G?ViPI{05SpIa`CebwIc7)AggMw^;s)u!teu*O&<1&I*r+sx&B{#LXXEVC8fg zvG!8Dm2!GnRc~!URav(T*PNLTM!WGNWTx3*g5fK_$M*P=$jthMkd5%kZj%CPAsc)&I3ayeRr@17d4Y)>SV{4u=3pK+45+i)So*&}MHyX$?JiL`vIwuaGU>Wl!tNyevGG<#)K&H`&{8qI*WoomHNQ1+l>atDLF zr$I86DLmlYCha#vd#dPQqkxo|$}!zuZiW-7;-P|7d!25#n%Qi;GJ~_)emtb^zmUL07NW2Re_*IKMVsXeEpYI&hwzL$g?gaYol$-6Z>`{6 z$Y#l&*^js9p%{nrEn!HDWa)?~4(t}5-ihFxGpp`oclBVX2KpVMZmIb41AOELSvG?S!o@F zl$xi*{y6!QyTk)+9Zh=3DEt7<&nf%w;04-4fZN zVSN+sPVo(x%zcbyqpqVq9R|76Ug7PFl}2+QH>PE{B+OzmI6UU?IM> zj~LnMBaZos%X4tu;G$RHe6EY$S}yOx(fCLSBWTi~KC3%5`{J?k7~wqXBN{q$((!6cfRkO zbMKwGHbUn|=$MzzAKrS^(ws{4ry1PH>tjuJZe6vlh6Ek z1{=&sCPLJ$D2pr7nx?UqFpX8OJF**=Ry9o?&Fs+mzq0z1NR%Uro`{UEvV2%+N1YrV ze+`$2LePel0km-?2kM-nJqP7?t#+jqvAb5A*#=$C(&C$G2KrF~olC@rFy3SRE5;OK ziQM;T@Qbt2n}eY|s!Zb25ME{DoWgNt{5Y~|`CHR&SDVr6zYjiFVf`ofksMk~(WY1x zZHo2Lrbf`JZOD~FKTC0?0>e&}$CXm_*xqlSMiUuTA>zvBRoq`hDTNcRd|C?gt~|7N zT#xz~-WWcoUR^f|g>*TMC~U$SJ+K}s!+z=nG9u%P@N#B0U4(s^jn2h{_SuA1J-QB; zGE2Cjb>Q5Oq`i(64#tMcLq8NjliTYl!kB#r7_$kj2Tx$2F0X;&mbke!IOZ;-x8R~% zLi?w?s^S)w$Ajrc@(ePGT4EGTjVpQqgl1ShwFQaT=<&GXg;pVtN^rrMCB?!@0h6{c z%1wh(sHP%>HZFrEzyH9t1^w}t;+YHPZUz;5SAlttFvdL^;y&AkENvC7y5g8 z$SWOhb-ya@?e6RB-%C1r-|pExR6Nkvg&iSV62UJOnOE*;+7;-PB9G-D{1U#(vZj5F zD{0td`+(b#k<5LS&ZiI}A+#S~Cn{X{AO4q@Lnaf?BPZIB*Od-2j)&vhhp8ORE9OlQ z@OfaYCfR8xepcauCmRNRg6Knpl1y@{?tv7#PB`Kde6{E~$R?sVjI2Hwx&q!g!zb+q zo^LFq5$s6=gq2PWLY`E8fuiiFgqkos4xs=d9|MgCnT2z$LUfy7lU| ziCOV^&N#(#r=irZ72Ou_RSL9?aiG021qLh2EFGPlI|ttE9@-uKyt0wPdpsXqsmkY~ zQcb&w9)qC2#IkXmGEDoQpnjlr@6-8cu texture = texture; + (cursors + *j) -> x = x; + (cursors + *j) -> y = y; + (*j)++; + } + else{ + printf("Voll\n"); + } +} \ No newline at end of file diff --git a/sprite.h b/sprite.h index bf2bf58..cf7d6f5 100644 --- a/sprite.h +++ b/sprite.h @@ -1,17 +1,13 @@ -struct Sprite{ +#ifndef SPRITE_H_ +#define SPRITE_H_ +#include "raylib.h" + +typedef struct Sprite { Texture2D *texture; float x; float y; } Sprite; -void addSprite(struct Sprite *cursors, int *j, Texture2D *texture, int x, int y){ - if(*j < 100){ - (cursors + *j) -> texture = texture; - (cursors + *j) -> x = x; - (cursors + *j) -> y = y; - (*j)++; - } - else{ - printf("Voll\n"); - } -} \ No newline at end of file +void SpriteAdd(struct Sprite *cursors, int *j, Texture2D *texture, int x, int y); + +#endif \ No newline at end of file diff --git a/sprite.o b/sprite.o new file mode 100644 index 0000000000000000000000000000000000000000..8da654dda762e63b0cdf4eeae4f97f5f9057aed3 GIT binary patch literal 1648 zcmbtU&ubG=5S~q9TQzM`^-!sYJ&B5467--RBsIpogNjt*Rnuf^)g&8sHEwA>Os8uC*)8eplBqQ9E3WPok=&#;z0*qX6Ad}{K(8pHVZdz#54^=G`I=} zo}d8z*nyoJnK_t)Stu#*tJ?amEARPGd9A+kN|tBFTbp%e(nxZ=L&m+)O>E{@0>1il0IkWjz)%;{+3cZhp1EKed>|! zeExXPs?`9B`TQ0AOwnw(mZfL2#swpzH!q%Llc)d*JUSlAP`q7&7-+kM$!s+C4jgPvW z#EzhQEWjW2fEe|go}~Jo)3hJCrcr^rBV)N*g=Wijg!-BddJb_szxRE4!#K@|W+u4K zIPn8d2*7YQ>TY=zwQKu&T`b$Il?~TyyI@qyZW)YK#{t8(e5Yd7>$o~F8W#46yIFGF za^(s84;w9`XfAot(UnE@rGF}iS z-&1%4Hgo}4OT6f7h>IPh9*+VexGRWF;|ce_!13X}Wd2g?G3N}&D~`V;MAqSWdWBK@ zf4~W4&$NH~Z;^PxsZ6*wLhyp?cgR6W;-Na>c*+^xJwlM?q$kM<2&Ww*^JqoIw>jP& JGkqf*{|7w`v0DHD literal 0 HcmV?d00001