From 57eba3c089bf883f83b99ea30d6ffe6052186d07 Mon Sep 17 00:00:00 2001
From: nemo <n3m0o7@hotmail.com>
Date: Tue, 8 Oct 2024 10:41:21 +0200
Subject: [PATCH] minigun player

---
 Makefile              |   2 +-
 bullet.c              |   9 ++++++++-
 bullet.h              |   1 +
 data/bullet.aseprite  | Bin 961 -> 917 bytes
 data/bullet.png       | Bin 215 -> 204 bytes
 data/minigun.aseprite | Bin 0 -> 1090 bytes
 data/minigun.png      | Bin 0 -> 880 bytes
 main.c                |  20 ++++++++++++++++++--
 minigun.c             |  38 ++++++++++++++++++++++++++++++++++++++
 minigun.h             |  12 ++++++++++++
 10 files changed, 78 insertions(+), 4 deletions(-)
 create mode 100644 data/minigun.aseprite
 create mode 100644 data/minigun.png
 create mode 100644 minigun.c
 create mode 100644 minigun.h

diff --git a/Makefile b/Makefile
index 38b9291..89916cb 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-SRC=main.c ninja.c keys.c bullet.c
+SRC=main.c ninja.c keys.c bullet.c minigun.c
 EXE=voleur
 CC=gcc
 
diff --git a/bullet.c b/bullet.c
index 4d066f1..cc4b797 100644
--- a/bullet.c
+++ b/bullet.c
@@ -20,6 +20,7 @@ Texture textures[BULLET_COUNT];
 void bullet_load()
 {
     textures[BULLET_SHURIKEN] = LoadTexture("data/shuriken.png");
+    textures[BULLET_MINIGUN] = LoadTexture("data/bullet.png");
 }
 
 void bullet_spawn(BulletType type, Vector2 pos, float angle)
@@ -47,6 +48,12 @@ void draw_bullets()
         Vector2 toward = Vector2Normalize((Vector2) {cos(angle), sin(angle)});
         bullets[i].pos = Vector2Add(bullets[i].pos, Vector2Scale(toward, speed));
         bullets[i].time -= GetFrameTime();
-        DrawTexture(textures[bullets[i].type], bullets[i].pos.x, bullets[i].pos.y, WHITE);
+
+        Texture t = textures[bullets[i].type];
+        Rectangle source = {0, 0, t.width, t.height};
+        Rectangle dest = {bullets[i].pos.x, bullets[i].pos.y, t.width, t.height};
+        Vector2 origin = {t.width/2, t.height/2};
+
+        DrawTexturePro(t, source, dest, origin, bullets[i].angle + 90, WHITE);
     }
 }
diff --git a/bullet.h b/bullet.h
index 2cb06c9..0d2445d 100644
--- a/bullet.h
+++ b/bullet.h
@@ -3,6 +3,7 @@
 
 typedef enum BulletType {
     BULLET_SHURIKEN,
+    BULLET_MINIGUN,
     BULLET_COUNT,
 } BulletType;
 
diff --git a/data/bullet.aseprite b/data/bullet.aseprite
index a4470859c608dc9ebfe88b6913e2025e6dda6de6..dd2cbc34afa929f324238c3edef624edcc049b95 100644
GIT binary patch
delta 139
zcmX@eK9!wu>O{tRM$w6lQyG~ji!(Y-7Go5coWUrNnaRMwz^cH&zyhTIGXV)O;9(GD
zsF;(SaDd_eMFYDJ|G%>ui}*P3YrZnP()8i)+pHa5E(HCpSGw|FJ;lt&R?Pats-?4j
p`J0%{zxGbj<(;~au#a`dv&SLb>*QkjH%c&UKDjq%GcVH?MgXpaGB5xD

delta 184
zcmV;p07w6o2f+sc!I1%f0YQ<0l>q{i7Xd+&76A~GXaNv^l>h($1t0(b000O8{{jF2
z00000001fg8UT2l?bfjkfG`Y1(VK=5Se-T4fE{QlK%(P>MTAWhhqLq>7tu=*1b`j)
zwKl1o+dQ7Zc1I>>V@~$+-jmbbpL3<yV(oo*=+{{>%PnWDSI&Prmua|U?Q3PdBRPF8
m{?5x;WGVg@56R|yI4i0*lgb%%)|Vq^;2f_)<H)n&0ki?o$x7M)

diff --git a/data/bullet.png b/data/bullet.png
index c7ec0903ddc96ae4f7478b5c17a7d9bb9434d28d..43942230b36cb5ef344078bf440e1794cbcbce6f 100644
GIT binary patch
literal 204
zcmeAS@N?(olHy`uVBq!ia0vp^JU}eU!3HFY*6?ouQjEnx?oJHr&dIz4a@ssy978O6
zlT!|`{J;34$HJ0_hv$ENyn(Y|f~iI8qCU=U-U`M|Y&@4GB_t%?<%c^Ls=1m?Si)$V
zvZ3+6hFL<fJ&(g*#~Ysh^Xd=0R9VEhicK}h^p0{UvtWah`otV&-9HT8&yT3^vH^jc
y+l-_fPiD(yqPF>pb6WIe4>IW39?Vq`V_=wSsU(!BDtiLxA_h-aKbLh*2~7YYn>_~r

literal 215
zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc1|)ksWqE-VV{wqX6T`Z5GB1IgiJmTwAr`%F
zCt33~C<w65XX9JcYC5(2!;yQ9r*1Jx3rAOT=fuQzW|&E6t1E7(N&CrYzcPiPMnHWc
z^MOlOMXDV;-%n_{6`|L^sFzpP`c;wZ&Z~V#-$^|4+`4hO_HMCV?K2Mgvmbc=aix*R
zpIH+E7!3SA-#d6)sB4*hi{^w3<xd(;o)+)gw@s>f@w~rw`rGH#VfWtI99m{5bqnY?
N22WQ%mvv4FO#rQ^Q~>}0

diff --git a/data/minigun.aseprite b/data/minigun.aseprite
new file mode 100644
index 0000000000000000000000000000000000000000..d24830954f1e46397100189fd835db875197774e
GIT binary patch
literal 1090
zcmZ=_VPJT$l##&|2o)F@85kH+fEWRQVjw{V0U)FWIK<4r@arQ7*j5gp1!6$Vt^l?Y
z$+|2cn+4=L1t3F7!NgU=Ce6~YKg{}mq1w#_Y3~lt`u)jl=F@<zeFo-J^1L(kgS=IY
zY%J~VOAHd4qVpam&;B2O_Q~nnfBygfKYQ)=mb&)LtgOhepfabfHAY4^!;`O9@9LlK
z)s=4`53)%C=qNb&4`i`3_#{@Q7AY7~CS4CSidBJuL6Cuu;Xf1127U%PhKf1K2?|nw
z+LMB=CLezC;^5Nx5w<U?PF{6i6_@p6qEKzi7a^u6uMRJr9^o);-?Uw2o8HP~R&9JC
z?XkDw>;Hc#Y{!ngYF+7mtmRA6W#{C*|Jzr_?Rn_h7PsePm$QCgRe}V=LgVC1Kf%^B
zGKd0cg!NJkszB@CUOmWp*no#M;OrFV@RJO87cX~ef5G*3=jM{$xay3J2VFQ$PkWNj
zrOM`5aHu};k%dcTjf?Nh-MZfEzQ3N3eeBM=BeIdtFSA-5KYw=3-Jf%d_u8NFE2&jc
z7R^nz2sYlc_e@2ca^Keej^ItUKjn_kj^DlRsmr_g-C}!>|DAlfYM;jP?|g#QEiu|J
zY>!`ZU-jvKpT)GVai47Y{!iQUQ%rr+`71rot6Ki~Z;hMKm!>dxUSomIv5w29rn?>a
zm=Z3tNn#1lJ9k;#XsfOBx+nHkPE+5VUg)3Z#{2pQla}|@v$4RG!>YgpOv1cK9@l0t
z2YLM3Zr(!%0&EX@Tv)9G4VXlQxDEK7F9xx+h&+k-`14-5+n-CCCYJRUeRDIpPV!9g
zn%Dn#IZI<t(&tCFwUV`OaZ7Hl*y!f|dfD}ZE1#7X746ko9eCkdg8E767r~pY+H-xM
z<wP+zZHha0y^`Vem+k+yi2jY^P57(!vu^7tj&#u!*9y;MgKCd8Gwwy0zqV_cnw`^o
z_FuoBUvK)vvmRUBtR1r#{mik_&fX$e64qIkwD!rq<G=ZIl+{n(GUht7&~H)r*;A!L
zd$ht<7Oy<~)@7B(^J!oA#;;p9bFHoZ(N!;7)-2upXKk+T@uzDVrx{P)TK7#ZyCHe)
z^G);a=e#yeic@_bmTe~;7OuY~J$1X#`KEQDm$hw@@9vrVZ%V?x<~4IdR?obC!1Ghm
gnG<%C7OeGBJ*(lTzuwi&AgaPvIID)ylI>?M0Q;<w!T<mO

literal 0
HcmV?d00001

diff --git a/data/minigun.png b/data/minigun.png
new file mode 100644
index 0000000000000000000000000000000000000000..de32f6762ad1ef3ef54380e5a5a70026b3eda510
GIT binary patch
literal 880
zcmV-$1CRWPP)<h;3K|Lk000e1NJLTq002b*002b@1^@s69E~d}00001b5ch_0Itp)
z=>Px&DoI2^RCt{2oWE{UF%-tXqO!8)2`ZsVRnl}}s2JFo7|7g>1@Qt%C_@z~I|C2U
zm5$5^RUHZvDX0=lpMa+bL+j|~;$9!y-#PY;@<~@oZxhG<<@53JpLPd&TDE@PQMjif
zt%8^5<1ql>)wf*$z~d)Bz`mzd|3?~y_FY>j9&Mo*YT3SK(>e7X{tvt~sRi2EbgoqN
zoj#nt2eyIMPFpA*ZJ~HnC6vK%RP^)J0_{V;2nApV<jw1su5MkUj7t4gp~Q|r4#?l%
zzdB!cKk@)d_21PfG)EyIE%{uO4XO$#2@dI!1C<P?7?fr(jdX`pOC*9ZAAJVH(V8<t
zK$`FpvgD+xfQD1N6-jZ%U^rs9DB3Y>r#$%0I9KF0GI357<(Mjyx6-O&^zlj9b(-CR
zwv@nh3awI!u_P2X#PwrlgrX0Xruhy^AUA2(KU4=%d)1(%1Vo8Lo__fZ0GKQmfD)7{
zVu~cAbuc<a>%K*xw3h}lVbDc^GMmnql6i@AjuX<s-XU<;ePSdI6{b#!g;ByKK*h;h
zDIh?lP`ZE|>>c`UQ}=+XgOUJ5qNvn^5>teWKb;D77b_q@1$hd=8T9SbVo*ZvIv<a5
zb9)^Eqq3iD3MHnSO<W$bSga20I6ybI*V1B=rZKF!kM|pM^B+dc0kDEIktc3yN5CZV
z9+l`gLSb<wOVufbmE5-K@{}61sZg?dz$QY;4hbwMMWZ}hMKjvBU%Stte0o7&ytXUk
zUg8lb1f#78IF$CVx{n%=)c54bG|=WW&Jv7S^2Tb^&p*$jUjO~w$LKaPoMHyVr^}P8
zwMT|}pQjw3J;UY6)#{NUbtqP`z=3hkb5wlg4Oov8NBb91?{xs0K-}|G^}74C0Wg37
zJ%-`~!crAbj`lBBmsIV*%5aEN6;M*81%?5oGdW6_)J2Ku5T{-{1pqxq0gRw%y2Uw#
z=@`?cgWN<e0GHMl)9#bw812~96nhy_w63DC$V6?2#@Z@v!Aa;2dK-#DA*mNo06Q?f
z`Wr$(A58E5e@atqIO=t_+QedkF{!Wh&R!~<joN|irTzhjCsMJKw~p%o0000<MNUMn
GLSTY2bCnAK

literal 0
HcmV?d00001

diff --git a/main.c b/main.c
index 909f1ff..796e0ba 100644
--- a/main.c
+++ b/main.c
@@ -6,6 +6,13 @@
 #include "bullet.h"
 #include "keys.h"
 #include "ninja.h"
+#include "minigun.h"
+
+typedef enum PlayerType {
+    PLAYER_NINJA,
+    PLAYER_MINIGUN,
+    PLAYER_COUNT,
+} PlayerType;
 
 #define SCREEN_MIDDLE ((Vector2) {window_size.x/2, window_size.y/2})
 
@@ -70,7 +77,13 @@ int main(void)
 
     change_layout_azerty();
 
-    load_ninja();
+    PlayerType player_type = PLAYER_MINIGUN;
+
+    if (player_type == PLAYER_NINJA)
+        load_ninja();
+    else if (player_type == PLAYER_MINIGUN)
+        load_minigun();
+
     bullet_load();
 
     while (!WindowShouldClose()) {
@@ -114,7 +127,10 @@ int main(void)
                 draw_bullets();
             }
             EndMode2D();
-            draw_ninja(Vector2Add(SCREEN_MIDDLE, cam_shake), &camera);
+            if (player_type == PLAYER_NINJA)
+                draw_ninja(Vector2Add(SCREEN_MIDDLE, cam_shake), &camera);
+            else if (player_type == PLAYER_MINIGUN)
+                draw_minigun(Vector2Add(SCREEN_MIDDLE, cam_shake), &camera);
         }
         EndDrawing();
     }
diff --git a/minigun.c b/minigun.c
new file mode 100644
index 0000000..ae5b2c1
--- /dev/null
+++ b/minigun.c
@@ -0,0 +1,38 @@
+#include "raylib.h"
+#include "raymath.h"
+
+#include "keys.h"
+#include "bullet.h"
+
+Texture minigun_texture;
+
+void load_minigun()
+{
+    minigun_texture = LoadTexture("data/minigun.png");
+}
+
+float minigun_radius()
+{
+    return fmax(minigun_texture.width, minigun_texture.height)/2;
+}
+
+void draw_minigun(Vector2 pos, Camera2D *cam)
+{
+
+    Texture m = minigun_texture;
+    Rectangle source = {0, 0, m.width, m.height};
+    Rectangle dest = {pos.x, pos.y, m.width, m.height};
+    Vector2 origin = {m.width/2, m.height/2};
+    float angle = -Vector2LineAngle(pos, GetMousePosition());
+    angle *= 180/PI;
+
+    if (key_down(KC_SHOOT)) {
+        bullet_spawn(BULLET_MINIGUN, GetScreenToWorld2D(pos, *cam), angle);
+
+        int speed = 5;
+        Vector2 toward = Vector2Normalize((Vector2) {cos(angle * PI/180), sin(angle * PI/180)});
+        cam->target = Vector2Subtract(GetScreenToWorld2D(pos, *cam), Vector2Scale(toward, speed));
+    }
+
+    DrawTexturePro(m, source, dest, origin, angle + 90, WHITE);
+}
diff --git a/minigun.h b/minigun.h
new file mode 100644
index 0000000..359bac3
--- /dev/null
+++ b/minigun.h
@@ -0,0 +1,12 @@
+#ifndef MINIGUN_H
+#define MINIGUN_H
+
+void load_minigun();
+
+float minigun_radius();
+
+void draw_minigun(Vector2 pos, Camera2D *cam);
+
+float minigun_dash_time();
+
+#endif // MINIGUN_H