From bcfb4e751502c3299c3e7b651a7a736dac779cdd Mon Sep 17 00:00:00 2001 From: JanEhehalt Date: Mon, 21 Nov 2022 01:59:10 -0800 Subject: [PATCH] Reimplemented placing sprites --- amulet.png => assets/amulet.png | Bin main.c | 21 +++++++++++++++------ main.o | Bin 5544 -> 0 bytes spiel | Bin 16464 -> 17568 bytes 4 files changed, 15 insertions(+), 6 deletions(-) rename amulet.png => assets/amulet.png (100%) delete mode 100644 main.o diff --git a/amulet.png b/assets/amulet.png similarity index 100% rename from amulet.png rename to assets/amulet.png diff --git a/main.c b/main.c index c24c249..c5c15fc 100644 --- a/main.c +++ b/main.c @@ -19,7 +19,7 @@ int main(){ int pressed = 0; Vector2 rectStart = {0,0}; - texture = LoadTexture("amulet.png"); + texture = LoadTexture("assets/amulet.png"); int j = 0; struct Sprite cursor = {&texture, 450, 225}; @@ -54,7 +54,7 @@ int main(){ cursor.x = GetMousePosition().x - texture.width / 2; cursor.y = GetMousePosition().y - texture.height / 2; -/* + /* if (IsMouseButtonPressed(MOUSE_BUTTON_LEFT)){ printf("Klick\n"); addSprite(sprites, &j, &texture, cursor.x + camera.target.x, cursor.y + camera.target.y); @@ -63,8 +63,8 @@ int main(){ if(IsMouseButtonPressed(MOUSE_BUTTON_LEFT)){ if(pressed == 0){ - rectStart.x = cursor.x; - rectStart.y = cursor.y; + rectStart.x = GetMousePosition().x; + rectStart.y = GetMousePosition().y; pressed = 1; } } @@ -72,14 +72,23 @@ int main(){ if(pressed){ float width = GetMousePosition().x - rectStart.x; float height = GetMousePosition().y - rectStart.y; - - DrawRectangleLines(rectStart.x, rectStart.y, width, height, GREEN); + if(width + height > 1){ + //TODO: Fallunterscheidung für negative width / height? + // Auslagern in eigene Funktion + DrawRectangleLines(rectStart.x, rectStart.y, width, height, GREEN); + } } if(IsMouseButtonReleased(MOUSE_BUTTON_LEFT)){ pressed = 0; + float width = GetMousePosition().x - rectStart.x; + float height = GetMousePosition().y - rectStart.y; + if(width + height <= 1){ + printf("Klick\n"); + addSprite(sprites, &j, &texture, cursor.x + camera.target.x, cursor.y + camera.target.y); + } } if(IsMouseButtonPressed(MOUSE_BUTTON_RIGHT)){ diff --git a/main.o b/main.o deleted file mode 100644 index 6b235b675dac36d4dad1734a7d280be8ac16719e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5544 zcmbtXZ)_Y#6`!-+*pwuDE&&3K#C=G>1oz0FN@=4C&i2`vC{ASJBn?uFyYa1kNAGT} zyS=2TMD55~lzYmqucw-FfqSzxU?7H-GkSdT@BCEf!;{#n{)_`beRS^*ppLr-YbdTiF(Nl6$xL z?41PnzSH1dWtDp;SG=RQ(%#@r?hmf|Y_>5zeKrvJEBxxs4(=_|u)$;KR=C%;p>lb` z_-Ad+*gbe_&FD^b{cp}qa5e{=>PQTN7ypOBs}CSj?$uY&U%q|~(T?&9ceZyjmf?QK zt{$NuT-jS|kr#itNCj9(v@<5m>TcqLW)lwT?#`Cf(~^3n6a?Jurf96>G|9Z`t~Stp z8a}x9M->nE1BE}=fZlVT0o$9)Qs=vj-kv)}@4CB#-om&lIqnD{Yern;N6EXVL*u7t z%D~Fe&1Umb-Mg`i3eeob*j?sb^KOv9 znk4*1&}jR0HLoDZ<`tyTyn?i)>Q{-n`zQ@FWKwtckc2|M{|kEg)fKAy+s%10XbwB##6LAf^E8Pz^^tEff2TRq!Gehz^Vz$i#2Ee>^tJnRd%l@5S+VKb~G2x zUfl%|_n9;?F21Q8wPGftYKmwo$j39b1tMm z)+D%&0u#s!efMb+1O}7YcTf>#T>LAU23OhcRta7wm0C$oveKgnDA605ewbvss|AhI z9>1q7##fil(xQl|Xr7Po#4e+|9oAB*DoQHpOebOX*Mlg8QE-8FyAqR;#a%?Dbcj|& zC0?_uv5Pgs{rP_+I8Sj=U?*2H{43kU7teV>5V`+!UDURik5esbJ=F&$ra0<7VDs6q`yX$bB?xSMr&Gyj`{^L3+!QjE$8YN_A{J`|Q|+ znak6{QhP1v=ssesot_WzW02YpC5}6aeyX+b-%4EZX_-X(v+Tjg8CQOKB|-7GO5Op9 zgO58;@ux$4b=SQd!V}U@ErjF#Lt75v34tGAZ4ae^Z#m}PX)G#kcNU z`-y9~?q|Ei!+s8GeBIB0hUgUc+&wRXhoj(GU+F)lyPW z_*+VmET1np<{6eOJEfq{Dyd}U&7?!OK1*gy$7IPf|ii%7Yg+2j3tYv55o^0UB%8pIoN>(%fUwwkCarMaMYWYe@X;IckDdaV!h77gD zTBcfv6vUqs#%7?ThPw#1xP#HKmS|t32e`aG0EyP7hzgK>cz&EOP{a0dX^*=?Z{hJ? zQo^Uc#^5Xa$1u>EOs9oBP7>_ZepL!C=T9g=_9}kW_Y3ERVG fcwQ_ucpIKH1vQR#{OYIC;eH3CX=*AwgYm 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 F{5Q-(GhqM# literal 16464 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 aY|K?Tx66j~xR>)kf0wdY;Bs(@;{O0o-c{xR