From 19881f9ae5b29969ce3a2d689e386124c4d73a72 Mon Sep 17 00:00:00 2001 From: Damien Date: Fri, 14 May 2021 10:01:17 +0200 Subject: [PATCH 1/5] passage de l'arrow0 en 32x32 --- core/assets/arrow0.png | Bin 6304 -> 783 bytes core/assets/player1.png | Bin 1367 -> 1523 bytes core/src/sagittarius/model/Arrow.java | 6 +++--- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/assets/arrow0.png b/core/assets/arrow0.png index 0e490254f03d49c9689c109615e09312e70efd15..db0a872a282fd149d1223dd99dbad852dbcf106c 100644 GIT binary patch delta 757 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 literal 1367 zcmV-d1*rOoP)Cul9Q+D>5q&zJBR=`y7x2|*^BIm5ggi*Fq-k16 zjYvXhAYwyI=@E@LkmbXk?b+_^HG5{QHD~Wie=otg>^=W8v*xm9Z2@D5s7pjMM6^QH zthoHH^}9_d2-si*l-X#VASdERpnx(rS|LU$qCH~V@ZeZ-`Ip__B~RIzCPj3KXt|%MV;lwdWGqYXGAnzQ*YXpYe%mT(LmZ5=0_N$ZgW*bx8(V%d=Pu`73dG7Hc7A5|?MO z7IHChd3%^yYc+D#T5WvRaNc3uIyc^K0xh|f3LMu zQD;RutW02fB`4qg&QP|UY3J_O3HdnABL-sHAtHxH<9{ zfHFVDJ~YMj`#XT!;Lqc~0Js9+DuAa*_2;-c~xqvV`@%3D^b34hw z3N?1(dhACgdkv9>4(NpVy1&j&`T&kHd25nIRU>2;z>vw~R{k8HP|@X&)`@+O$?gF- z%;X)$Ugver5ZMnD&8Lz|0elAFB$Ia%z-cD$o^-FKHFn=HI1rg$_dG9JA+rGfVeAq1QzEe~Qal?Rf;czx`j7k3!f@wD=)jA?!Q*)NF5Mp&#Zg%G`f-=`os0W@S_!5;v z-6L)|EGr))TFr~J#YWV_%1Vf)A8N&f zUoz#F$nd+w5COi%7peUElZfuu)Y~PZIZE{@pZm39sQmA9Tq8pX_SiS!dD{gOU Zc?ZkT*eydK;$i>*002ovPDHLkV1kr-n7;r3 diff --git a/core/src/sagittarius/model/Arrow.java b/core/src/sagittarius/model/Arrow.java index d3f375e..c112e9c 100644 --- a/core/src/sagittarius/model/Arrow.java +++ b/core/src/sagittarius/model/Arrow.java @@ -43,8 +43,8 @@ public class Arrow extends EntityQuad { super(0, 1, shooter.getColor(), shooter.getPosition()); this.velocity = new Vector2(power, 0).setAngleDeg(angle); this.acceleration = new Vector2(); - this.setOrigin(80, 2); - this.setSize(100, 4); + this.setOrigin(40, 2); + this.setSize(50, 4); this.force = computeForce(); this.landed = false; @@ -108,7 +108,7 @@ public class Arrow extends EntityQuad { @Override public void draw(Batch batch, float parentAlpha) { - batch.draw(texture, getPosition().x - 0.8f * getWidth(), getPosition().y - getHeight()/2 - 10, 0.8f * this.getWidth(), this.getHeight()/2 + 10, getWidth(), 20 + getHeight(), + batch.draw(texture, getPosition().x - getOriginX(), getPosition().y - getWidth()/2, getOriginX(), getWidth()/2, getWidth(), getWidth(), 1, 1, getRotation(), 0, 0, texture.getWidth(), texture.getHeight(), false, false); super.draw(batch, parentAlpha); } From 58eb1f71362ee1613a9f6795831b20c09939d794 Mon Sep 17 00:00:00 2001 From: Damien Date: Fri, 14 May 2021 10:33:03 +0200 Subject: [PATCH 2/5] ajout des textures d'annimation --- core/assets/{arrow0.png => arrow0-0.png} | Bin core/assets/arrow0-1.png | Bin 0 -> 792 bytes core/assets/arrow0-2.png | Bin 0 -> 786 bytes core/assets/arrow0-3.png | Bin 0 -> 777 bytes core/assets/{arrow1.png => arrow1-0.png} | Bin core/assets/{arrow2.png => arrow2-0.png} | Bin core/src/sagittarius/model/Arrow.java | 50 +++++++++++++++-------- 7 files changed, 32 insertions(+), 18 deletions(-) rename core/assets/{arrow0.png => arrow0-0.png} (100%) create mode 100644 core/assets/arrow0-1.png create mode 100644 core/assets/arrow0-2.png create mode 100644 core/assets/arrow0-3.png rename core/assets/{arrow1.png => arrow1-0.png} (100%) rename core/assets/{arrow2.png => arrow2-0.png} (100%) diff --git a/core/assets/arrow0.png b/core/assets/arrow0-0.png similarity index 100% rename from core/assets/arrow0.png rename to core/assets/arrow0-0.png diff --git a/core/assets/arrow0-1.png b/core/assets/arrow0-1.png new file mode 100644 index 0000000000000000000000000000000000000000..c3efdde6799aecc72e1e4b9f46b736e9f5978445 GIT binary patch literal 792 zcmV+z1LypSP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!2kdb!2!6DYwZ940|@HTwGQP|pMGnvY4-1T)@ARt3(k`(_lLR&m+=Mm9oR7A zmHO*tl0_fh;b+`}$JFsRm~aI6d9aXEg&{rC|VGYVy5U3g6aMeHD4!)ZxJl~ok+ z#M)7KuK__J3kltL5Zh5xc!DC%5TghxKv2X+!e(5AD{&d#q=+73Fu?@~invPHgZcj- zpokUL_9kQ(FD6?If+Q+@CTaoB$80V1P~1Ihdl5SVn)BOu1HY)xSZdLmq<}IcS7F@6)0m(4 z4vXFt^2rNe%|F5vXx_C8wk93Uy~K0a!szI6J&r8T?>Ul-m?AQ4>lN`K$u%W4aO(wx z_vuxYEKenwiYOlGbR$Dwt;e52L!)b$*XBkCA6rkA*45pvtM|NJB@AF&+RUwii-$WD zlg?1eW5cfeQ_rLEluBdPs!&N@K?P)3R}f4?5qH^T4cxLhy>l)0=l^IC`X{|l5o-wj*o@j0-$|}FWDv0OQYAnBemO$#p25i*HZ|kvXVC>3U)?K_ftN{bC(Lv<3H~K2}bWJnBR&yw(7T|JjGh zgi}CreVXmW5BLaMt=&ZOx5T>e-USq*FCmSBrr;9E52?RiLe@YF>iBgB&#I$-ocjfq WdGV0*l~=C-0000Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!2kdb!2!6DYwZ940;fqtK~z{r&6iDx zO<@?v-;424SH>VQND`YFWo8y43tyq82!)*#Wu|N_SSVSd+!8ioiKfU-3M-L>GFwFX zTqq(lhPl`8f9`YcJ=aIQ&$$+U_3Jt3ojK=u&iirCdkP_v3%7@Q3Fq-K_U~Rj>6zM_ zWsJobUgJkxj|bK8FNo>^o_-wR5H7|qxC=kvTzaBH%#CLVHWM!6gruR)GK#ow$8MsB zfF#!l3$PC#Vj0C6i@AvIffRZ|3D@Bq?7>BNl>)aB-M9-76mgNT1GCo;Qp6HFj>fYJ z5=gFa2H)Z^YA7@@-N}W!062i^f!V0*zhe2?X{_0r+J#@b&rW z1heaZzC|~#0(eS|_jSC2pVVe7wCE-&paRKR95?YOX2-nCqMJfCc>(P3uP_hB6ISAe zq#=Z-cpTg5A+3f#lIHm}M{?pVB8x4{65gQz4NU{wdM4pr^{h^srKI}7+Pj@hLJb-tffxJ@=c+4&j~wA7{t!%VP+1T+}EX;G613H9pD_Sy@JZaiI|KriTZte4U}96?Pk z?GvXm53<7&g}VSj5i1A-*oImaUr9ch=*Bw)DcTdv!ilJR6e&utXg6amMnfWPN~hyX zRM$^KZAw=W-FR1lwqe=@Ybk1Dq7RkBB+s=Y7SRQeTpuRS@ho;@dhIQXxriD9lIzoK z3%LP_-YlLu(2m-M-N0jNXr2&$0&{Zf>LHnl QV*mgE07*qoM6N<$g4~K;;Q#;t literal 0 HcmV?d00001 diff --git a/core/assets/arrow0-3.png b/core/assets/arrow0-3.png new file mode 100644 index 0000000000000000000000000000000000000000..726a4646476ed2cccf563be901df8a83a7103840 GIT binary patch literal 777 zcmV+k1NQuhP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!2kdb!2!6DYwZ940-i}kK~z{r&6iDx zO<@?v-;3*`lu2pIS0)pi8D&OH%Em`gQ)HB|5m6{*qltwqY$&%ZiJgxWE5!mE--KdC zBa$W-im3T8bFbh3oaf$qu8-zC=UDjFujf7Q+ zQ@~bSf&Dm$YC#JtL&%Qj7%Ft(2u`+G#0o_;5i{Z4gt`aJjfY_(R!_rxi*CFH?8hzm z0+VNdo<%pV0%(K!ejTsiSIrr%7TrVzR3N%a$4xwn$-Z}3bW=zsFMtjI3L8$n*J;rA zg6PBJIExk1E&7jC^Zc44y6_f}#ExMJ?^1wT(*PgcO!ydI)v4yGB~uZly`5ob;G4~) zr%;?4iZj~7aQ_3FsnfQ6edykG!mc7-VtYJH?17VeIuxTxFO|{3P#Mv^>37QIQ5)5$ zC9k0Zs@RkZ+EBtCyKI1uoF0F2BlhS2XcMMME-2s$LEnZ+E|Yw-ja@{0AZ>DEH6Fn) z(N)Ydi*8(ZLjHTbejTdc(==zO4ViEi0H^RGF2dxhy|d`XTfkd<9}mMY4#mTe`6s%! zfQP7G$2#H=8i zTLf*wd#D?Z3g}^F4iPis-2+Qe-+Y}|eeW@fSY~54<1LN}Nwn!U;wQY1Z8mOVbv_U? z;kg5 texture; // ---------- CONSTRUCTORs ---------- @@ -49,24 +51,35 @@ public class Arrow extends EntityQuad { this.landed = false; if (!preview) { - Pixmap pm = new Pixmap(new FileHandle("core/assets/arrow" + MathUtils.random(2) + ".png")); - pm.setBlending(Pixmap.Blending.None); - for (int x = 0; x < pm.getWidth(); x++) { - for (int y = 0; y < pm.getHeight(); y++) { - - Color pc = new Color(); - Color.rgba8888ToColor(pc, pm.getPixel(x, y)); - - if (pc.r == 1 && pc.g == 1 && pc.b == 1) { - pc.r = getColor().r; - pc.g = getColor().g; - pc.b = getColor().b; + texture = new ArrayList<>(); + String path = "core/assets/arrow" + MathUtils.random(0); + + int i = 0; + while (true) { + try { + Pixmap pm = new Pixmap(new FileHandle(path + "-" + i + ".png")); + pm.setBlending(Pixmap.Blending.None); + for (int x = 0; x < pm.getWidth(); x++) { + for (int y = 0; y < pm.getHeight(); y++) { + + Color pc = new Color(); + Color.rgba8888ToColor(pc, pm.getPixel(x, y)); + + if (pc.r == 1 && pc.g == 1 && pc.b == 1) { + pc.r = getColor().r; + pc.g = getColor().g; + pc.b = getColor().b; + } + + pm.drawPixel(x, y, Color.rgba8888(pc)); + } } - - pm.drawPixel(x, y, Color.rgba8888(pc)); + texture.add(new Texture(pm)); + i++; + } catch (com.badlogic.gdx.utils.GdxRuntimeException e) { + break; } } - texture = new Texture(pm); } } @@ -108,8 +121,9 @@ public class Arrow extends EntityQuad { @Override public void draw(Batch batch, float parentAlpha) { - batch.draw(texture, getPosition().x - getOriginX(), getPosition().y - getWidth()/2, getOriginX(), getWidth()/2, getWidth(), getWidth(), - 1, 1, getRotation(), 0, 0, texture.getWidth(), texture.getHeight(), false, false); + int i = (int) (TTL * 3) % 4; + batch.draw(texture.get(i), getPosition().x - getOriginX(), getPosition().y - getWidth()/2, getOriginX(), getWidth()/2, getWidth(), getWidth(), + 1, 1, getRotation(), 0, 0, texture.get(i).getWidth(), texture.get(i).getHeight(), false, false); super.draw(batch, parentAlpha); } From 457dcbf7c2f7e0188fa08ae13aef699bf5b2a282 Mon Sep 17 00:00:00 2001 From: Damien Date: Fri, 14 May 2021 10:37:40 +0200 Subject: [PATCH 3/5] remise des autres fleches --- core/src/sagittarius/model/Arrow.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/sagittarius/model/Arrow.java b/core/src/sagittarius/model/Arrow.java index a790b21..73c0f5a 100644 --- a/core/src/sagittarius/model/Arrow.java +++ b/core/src/sagittarius/model/Arrow.java @@ -52,7 +52,7 @@ public class Arrow extends EntityQuad { if (!preview) { texture = new ArrayList<>(); - String path = "core/assets/arrow" + MathUtils.random(0); + String path = "core/assets/arrow" + MathUtils.random(2); int i = 0; while (true) { @@ -121,7 +121,7 @@ public class Arrow extends EntityQuad { @Override public void draw(Batch batch, float parentAlpha) { - int i = (int) (TTL * 3) % 4; + int i = (int) (TTL * 3) % texture.size(); batch.draw(texture.get(i), getPosition().x - getOriginX(), getPosition().y - getWidth()/2, getOriginX(), getWidth()/2, getWidth(), getWidth(), 1, 1, getRotation(), 0, 0, texture.get(i).getWidth(), texture.get(i).getHeight(), false, false); super.draw(batch, parentAlpha); From 9d9c4dca8ab6f0cb0a2e7fecc7548613e48241ac Mon Sep 17 00:00:00 2001 From: Damien Date: Fri, 14 May 2021 10:44:35 +0200 Subject: [PATCH 4/5] fleche tranpercante --- core/src/sagittarius/model/Arrow.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/core/src/sagittarius/model/Arrow.java b/core/src/sagittarius/model/Arrow.java index 73c0f5a..76d38f6 100644 --- a/core/src/sagittarius/model/Arrow.java +++ b/core/src/sagittarius/model/Arrow.java @@ -199,11 +199,7 @@ public class Arrow extends EntityQuad { Player player = (Player) actor; if (player == GameScreen.playerCurrent && TTL > 19.5) continue; if (Intersector.overlapConvexPolygons(player.hitbox, this.hitbox)) { - landed = true; GameScreen.removePlayer(player); - GameScreen.arrows.removeActor(this); - GameScreen.nextPlayer(); - GameScreen.setFocus(GameScreen.playerCurrent); break; } } From ac0fcfde2c8343127cca2215d40b2aa57d275448 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laure=CE=B7t?= Date: Fri, 14 May 2021 10:45:54 +0200 Subject: [PATCH 5/5] fix: useless imports --- core/src/sagittarius/SagittariusGame.java | 1 - core/src/sagittarius/model/Bow.java | 1 - core/src/sagittarius/view/ResumeScreen.java | 2 -- 3 files changed, 4 deletions(-) diff --git a/core/src/sagittarius/SagittariusGame.java b/core/src/sagittarius/SagittariusGame.java index 175ca40..cd7b1f5 100644 --- a/core/src/sagittarius/SagittariusGame.java +++ b/core/src/sagittarius/SagittariusGame.java @@ -1,7 +1,6 @@ package sagittarius; import com.badlogic.gdx.Game; -import com.badlogic.gdx.Gdx; import com.kotcrab.vis.ui.VisUI; import com.badlogic.gdx.audio.Music; import sagittarius.view.*; diff --git a/core/src/sagittarius/model/Bow.java b/core/src/sagittarius/model/Bow.java index e717617..f358b8e 100644 --- a/core/src/sagittarius/model/Bow.java +++ b/core/src/sagittarius/model/Bow.java @@ -8,7 +8,6 @@ import com.badlogic.gdx.math.MathUtils; import com.badlogic.gdx.math.Vector2; import com.badlogic.gdx.scenes.scene2d.Actor; import com.badlogic.gdx.audio.Sound; -import com.badlogic.gdx.files.*; import sagittarius.view.GameScreen; import sagittarius.SagittariusGame; diff --git a/core/src/sagittarius/view/ResumeScreen.java b/core/src/sagittarius/view/ResumeScreen.java index 8cb0606..5c93f27 100644 --- a/core/src/sagittarius/view/ResumeScreen.java +++ b/core/src/sagittarius/view/ResumeScreen.java @@ -3,7 +3,6 @@ package sagittarius.view; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.scenes.scene2d.InputEvent; import com.badlogic.gdx.scenes.scene2d.utils.ActorGestureListener; -import com.badlogic.gdx.utils.Align; import com.kotcrab.vis.ui.VisUI; import com.kotcrab.vis.ui.widget.VisCheckBox; import com.kotcrab.vis.ui.widget.VisTable; @@ -64,7 +63,6 @@ public class ResumeScreen extends BaseScreen { if (disableMusic.isChecked() && SagittariusGame.music.isPlaying()){ SagittariusGame.music.stop(); } - else if (!disableMusic.isChecked() && ! SagittariusGame.music.isPlaying()){ SagittariusGame.music.play(); }