From a4caadbfc49ef676cc62728f6a6e58c6d7c622ee Mon Sep 17 00:00:00 2001 From: JanEhehalt Date: Mon, 21 Nov 2022 05:41:05 -0800 Subject: [PATCH] working Merge --- inputHandling.h | 2 +- main.c | 10 +++------- main.o | Bin 0 -> 6296 bytes spiel | Bin 0 -> 17728 bytes sprite.c | 17 +++++++++++------ sprite.h | 4 +++- sprite.o | Bin 1648 -> 2104 bytes 7 files changed, 18 insertions(+), 15 deletions(-) create mode 100644 main.o create mode 100755 spiel diff --git a/inputHandling.h b/inputHandling.h index 8642c82..a0d3da7 100644 --- a/inputHandling.h +++ b/inputHandling.h @@ -41,7 +41,7 @@ void mouseInput(struct InputHandler *inputHandler, struct Sprite *sprites, int * float height = GetMousePosition().y - inputHandler->rectStart.y; if(width + height <= 1){ //printf("Klick\n"); - addSprite(sprites, spriteAmount, texture, inputHandler->cursorPos.x + (*camera).target.x - (texture->width)/2, inputHandler->cursorPos.y + (*camera).target.y - (texture->height)/2); + SpriteAdd(sprites, spriteAmount, texture, inputHandler->cursorPos.x + (*camera).target.x - (texture->width)/2, inputHandler->cursorPos.y + (*camera).target.y - (texture->height)/2); } } diff --git a/main.c b/main.c index a8f8f3d..07f47f1 100644 --- a/main.c +++ b/main.c @@ -14,12 +14,8 @@ int main(){ texture = LoadTexture("assets/amulet.png"); int spriteAmount = 0; - struct Sprite cursorSprite = {&texture, 450, 225}; + Sprite cursorSprite = {&texture, 450, 225}; - texture = LoadTexture("amulet.png"); - - int j = 0; - Sprite cursor = {&texture, 450, 225}; struct InputHandler inputHandler; Camera2D camera = { 0 }; @@ -27,7 +23,7 @@ int main(){ camera.rotation = 0.0f; camera.zoom = 1.0f; - SpriteAdd(sprites, &j, &texture, cursor.x + camera.target.x, cursor.y + camera.target.y); + SpriteAdd(sprites, &spriteAmount, &texture, 400, 400); SetTargetFPS(60); while(!WindowShouldClose()){ @@ -39,7 +35,7 @@ int main(){ BeginMode2D(camera); int i; //int length = sizeof(sprites)/sizeof(sprites[0]); - for(i=0; i < j; i++){ + for(i=0; i < spriteAmount; i++){ DrawTexture(*sprites[i].texture, sprites[i].x, sprites[i].y, WHITE); } EndMode2D(); diff --git a/main.o b/main.o new file mode 100644 index 0000000000000000000000000000000000000000..3d96a59404320b1a1ebf31be8a04639280e29e21 GIT binary patch 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 literal 0 HcmV?d00001 diff --git a/spiel b/spiel new file mode 100755 index 0000000000000000000000000000000000000000..9259a8fca727cbfc587a82b3a7f994c43c991922 GIT binary patch literal 17728 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 Ch{wJF literal 0 HcmV?d00001 diff --git a/sprite.c b/sprite.c index 894a25f..14f3f9a 100644 --- a/sprite.c +++ b/sprite.c @@ -1,14 +1,19 @@ #include "sprite.h" #include "raylib.h" +#include -void SpriteAdd(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)++; +void SpriteAdd(struct Sprite *sprites, int *spriteAmount, Texture2D *texture, int x, int y){ + if(*spriteAmount < 100){ + (sprites + *spriteAmount) -> texture = texture; + (sprites + *spriteAmount) -> x = x; + (sprites + *spriteAmount) -> y = y; + (*spriteAmount)++; } else{ printf("Voll\n"); } } + +void DrawSprite(struct Sprite *sprite){ + DrawTexture(*sprite->texture, sprite->x, sprite->y, WHITE); +} diff --git a/sprite.h b/sprite.h index 44e32ad..f060300 100644 --- a/sprite.h +++ b/sprite.h @@ -11,6 +11,8 @@ typedef struct Sprite { int hasDestination; } Sprite; -void SpriteAdd(struct Sprite *cursors, int *j, Texture2D *texture, int x, int y); +void SpriteAdd(struct Sprite *sprites, int *spriteAmount, Texture2D *texture, int x, int y); + +void DrawSprite(struct Sprite *sprite); #endif diff --git a/sprite.o b/sprite.o index 459c435f0cbd1398b24105320d341f37a4ab4ac3..673167db801c0beb7a81bb932eba3dc71cbfec40 100644 GIT binary patch delta 785 zcmX|8O=uHA6rS1Lq`M_Qo1~E-YPO&dZH!5+1dB@kGe~HuNqSH;t&*Y;YK#erpj86m zvIt%0BKU*1Tq_W9 z5*AA!7jmM$`@kPFaR{%PE62?jn)!C`nu9z(%`$rISl`}aDP^MnD3bQC0MYOEHU@77 zfJa}P2o0bIoWv;i`ffGl=x5yF%~2%x-Qisp5W@?_^02{AVvG~xyi9Z#(J#ryIaOa& z^>-QlgZ1JC(tfY46XW9U_SWL{S`DFmIz6j}%9mTK&6ajDG82g&jkT;Oc5gZwiOxh~ zhle_w7{GQ_!E9jpxiS(E+GLtYlX&Vx2N=q_)Q3XaX%}8P#$<#Jf^>@MfII9M-DlgP zP=ge@BLwM^DADJ58jJJ+_KPBtn5Uoc1l_=PJjPX-dxd*D{fsAZhwk8@?Fh71LHF%H z2F!~vvZeuUy$XJoXG~C!;9INY3-hUDp)#M#6|<#EDVZu{E2!RT-b9(k@~vXMajjXk zXsLR;*=kgw`WYAlY;ApkzwBoLUNI5CzJvp8q=NY@aeR|LN&0U87A$E-td z2;ZEOyo%i*`daeQx)@MCidKvWHO08FjA7M1^t%`uQBAVwS?P?j!W)FCDaC~+JXH!Q zPx*yLJ+`>g<lfxu>71H1_pO$XDbB__td|n zu&QtxKtsY{awMxcSSGJwRYBst0jhilHHj6XmraH9GgL$YERw^f!YDj> zBAY#@1k_^&lW($_b9z8|7Lz5}%{ddG_DM{RWH%RWfXYpPn#2R7Stc)K*X9&}s*?np Q{f1qIvjQqo0(CnN08sB&QUCw|