From 2f1fc1e4ae45b7e53b3166fec25dda59981030c3 Mon Sep 17 00:00:00 2001 From: nemo Date: Mon, 30 Sep 2024 11:57:08 +0200 Subject: [PATCH] attaque animation --- data/ninja.aseprite | Bin 1015 -> 1633 bytes data/ninja_attaque.png | Bin 0 -> 958 bytes ninja.c | 19 +++++++++++++------ 3 files changed, 13 insertions(+), 6 deletions(-) create mode 100644 data/ninja_attaque.png diff --git a/data/ninja.aseprite b/data/ninja.aseprite index ace405993ed5dc6d7179c654867edcd2498bb26b..4c26fb699a65c56724e418dce6767900029e8825 100644 GIT binary patch delta 667 zcmV;M0%ZO72jL6?VFr-`ehuLT008>&2moXN000P)jjNLu0T3(&0B&h+YGEY+000Ca z0{{R30000000000{{R304FGOwZfap5VRUq1adl<0PXVX`e?C{hqb%hYe)$@%Fln>)W^Yhb7_a2lvrAKa&e@=!bl=p@6ZgJ+621tt`*GN8%xHeSRh{d(}9LBu={bC)+ zJ;cSMLN){zEzXE6}e_Z}IYh<$Z*m`~B^CIzjq3B^@aaM!s{fQn; zz9XWGf0+ld4o{1`mR&Cw_Biav*~8u7te>;KYWyh4|Y3 z8^vOJAUr7NNEY)QEl3{No;c@ofjo95l5`X9y74@jP5R9xc zJ&-PWZ$Lfb{UoRd*juHR>KtW{){)de-WP*gXoUNF5#b%N$n-eQG=LMf|33s9n^cxW BFvI`= delta 44 zcmaFJ^PQdPJM%=QI^J?-28LfB*%(q77#P?l_O6~B$|%6j%8-|tmzB7=gmDEE06Y{8 AivR!s diff --git a/data/ninja_attaque.png b/data/ninja_attaque.png new file mode 100644 index 0000000000000000000000000000000000000000..df5c63bd349c5d76737fa955a5c39725893d9008 GIT binary patch literal 958 zcmV;v13~Px&cu7P-RCt{2n>}vaFc5_w7Y1^T#kOu2ZgPQm%lHa$nZkF-4N@i-h=HVZasfAi zTepS}ktUT=#1ts*keuNRrIoA)EU-VMNPe0bkwdOSpfBHlc1Y;M`*%m*ef{wZ*H@P= zRcEepKpF-G0{9Ojr@4c26p)lvXf+pD11K>J3lNliJI=Y2gw%Jc>$)C}6^xYo#q#Z) ziY1Yq$OYV#xBw`nZo*WM*o{hqaY<5ZWC9BNSPj(lPJ}M#WgV9YI614X8sFqTT;r-h z4@Xj$J=S7DfA`0JQsiL$`Sz)Qe{*}!y`(J^E)Ypst|&Mml*8d1cXy8ffX~1G;_3Mz zbt!hg&SYJ*R|#YoLt;Q7ki+2|z$0++Hf22>m|!-XLR0{?C@ZaVeRb)mr%(t-;7&;u zEyX$KxSf`i)zrDUy_W`AFP62K$BLS`QW?y<-FDx9_;~RKKryZWQ$YdbPpirxJpkjS zg~Ey{QWxTsqf`@*VgLmo0K@HAQ2MJi47e7Lat08V*id|@IfIpyjq7Qwg>t1Di7X`? zY^n2FFwAv31|62ql&hJuB-@;PmCRKE zPSr{qiSf?{Ngv`K*o<6TdD-=RYai3b(@p8!znFdZBo)!uajM2YoIeVnkqCGQf zIf^Nn^@FC-E_zApjG?}rv+x6BLB-B<#tkWDvdP6&Zz)zQ%$chLUZ6Ar(#q_q>zcMz zv&E5fp|SnHi7OoiTE+5vEFjr7ciX+%@|Q599e}aOsaWk0PGKck#nuwT^1o9M`%R@> zAwpL9j3$!0Pc&w?$^4j8mv}#SIUtBBR{71jDH!))?W0M~oV1m2-RSB0VGs@`KZ-G> zUaaJ3uCr)MDJYxGpYy=D63u*b&h3; zP}EwX5Za)@lV|Qp@T8?^2jPrB+QO2UQvEiT%RlL9}uKkpFV`RCz*2lLdEoh z)?&uC6zxX2cvGwfkj0-RB`RH1bN)@dd=LiSW`}oLp9*S~(QDf8HP8|o>nNz{kU`|jM^r`n2dWF1<`w$|X8-^I07*qoM6N<$g1{xeng9R* literal 0 HcmV?d00001 diff --git a/ninja.c b/ninja.c index 20dd201..2a0659e 100644 --- a/ninja.c +++ b/ninja.c @@ -5,12 +5,14 @@ #include "keys.h" Texture ninja_texture; +Texture ninja_attack_texture; float dash_time = 0; void load_ninja() { ninja_texture = LoadTexture("data/ninja.png"); + ninja_attack_texture = LoadTexture("data/ninja_attaque.png"); } float ninja_radius() @@ -64,11 +66,11 @@ void hit_hitbox(Vector2 pos, float angle) coll[i] = Vector2Rotate(coll[i], angle * PI/180); } DrawTriangle((Vector2){ pos.x + coll[0].x, pos.y + coll[0].y }, - (Vector2){ pos.x + coll[1].x, pos.y + coll[1].y }, - (Vector2){ pos.x + coll[2].x, pos.y + coll[2].y }, VIOLET); + (Vector2){ pos.x + coll[1].x, pos.y + coll[1].y }, + (Vector2){ pos.x + coll[2].x, pos.y + coll[2].y }, VIOLET); DrawTriangle((Vector2){ pos.x + coll[3].x, pos.y + coll[3].y }, - (Vector2){ pos.x + coll[4].x, pos.y + coll[4].y }, - (Vector2){ pos.x + coll[5].x, pos.y + coll[5].y }, VIOLET); + (Vector2){ pos.x + coll[4].x, pos.y + coll[4].y }, + (Vector2){ pos.x + coll[5].x, pos.y + coll[5].y }, VIOLET); } } @@ -77,7 +79,12 @@ void draw_ninja(Vector2 pos, Camera2D *cam) Vector2 dash = ninja_dash(GetScreenToWorld2D(pos, *cam), GetScreenToWorld2D(GetMousePosition(), *cam), 0.12); cam->target = Vector2Add(cam->target, dash); - Texture n = ninja_texture; + Texture n; + if (dash_time >= EPSILON) + n= ninja_attack_texture; + else + n = ninja_texture; + Rectangle source = {0, 0, n.width, n.height}; Rectangle dest = {pos.x, pos.y, n.width, n.height}; Vector2 origin = {n.width/2, n.height/2}; @@ -86,5 +93,5 @@ void draw_ninja(Vector2 pos, Camera2D *cam) angle += 90; DrawTexturePro(n, source, dest, origin, angle, WHITE); - hit_hitbox(pos, angle); + // hit_hitbox(pos, angle); }