From f90eedcfacde8860b5a66f8919bb47f496c305e0 Mon Sep 17 00:00:00 2001
From: bosskkev <kossivikevin29@gmail.com>
Date: Sat, 4 Nov 2023 14:32:53 +0100
Subject: [PATCH] Ajout des raquettes
---
src/main/java/pong/PongApp.java | 14 ++++++++------
src/main/java/pong/PongRacket.java | 17 ++++++++++++++---
src/main/resources/pong/raquette1.png | Bin 0 -> 674 bytes
src/main/resources/pong/raquette2.png | Bin 0 -> 603 bytes
4 files changed, 22 insertions(+), 9 deletions(-)
create mode 100644 src/main/resources/pong/raquette1.png
create mode 100644 src/main/resources/pong/raquette2.png
diff --git a/src/main/java/pong/PongApp.java b/src/main/java/pong/PongApp.java
index 4e2ed8e..7b57252 100644
--- a/src/main/java/pong/PongApp.java
+++ b/src/main/java/pong/PongApp.java
@@ -17,14 +17,16 @@ public class PongApp {
}
public static void main(String[] args) throws IOException {
- // TODO: Add rackets
- PongBall pongBall = new PongBall("Ball", "src/main/resources/sprint2_demo/asteroid.png", new Coordinates2D(10, 10), 64, 64);
- PongBall pongBall2 = new PongBall("Ball2", "src/main/resources/sprint2_demo/asteroid.png", new Coordinates2D(40, 40), 64, 64);
- PongBall pongBall3 = new PongBall("Ball3", "src/main/resources/sprint2_demo/asteroid.png", new Coordinates2D(70, 70), 64, 64);
+ PongRacket leftRacket = new PongRacket("Left racket", "src/main/resources/pong/raquette1.png", new Coordinates2D(5, 100), 30, 120);
+ components.add(leftRacket);
+
+ PongRacket rightRacket = new PongRacket("Right racket", "src/main/resources/pong/raquette2.png", new Coordinates2D(815, 100), 30, 120);
+ components.add(rightRacket);
+
+ // TODO: Add rackets
+ PongBall pongBall = new PongBall("Ball", "src/main/resources/sprint2_demo/asteroid.png", new Coordinates2D(100, 10), 64, 64);
components.add(pongBall);
- components.add(pongBall2);
- components.add(pongBall3);
Grid grid = new Grid(); // Will create a new grid and a new kernel
grid.init("Pong", 850, 500); // Will start the kernel and set the keys listeners
diff --git a/src/main/java/pong/PongRacket.java b/src/main/java/pong/PongRacket.java
index 84a1a32..af33d90 100644
--- a/src/main/java/pong/PongRacket.java
+++ b/src/main/java/pong/PongRacket.java
@@ -6,7 +6,18 @@ import java.awt.*;
public class PongRacket implements PongObject {
+ public String name;
+ private final int width;
+ private final int height;
private Coordinates2D position;
+ private final Image image;
+ PongRacket(String name, String imagePath, Coordinates2D position, int width, int height) {
+ this.name = name;
+ this.width = width;
+ this.height = height;
+ this.image = Toolkit.getDefaultToolkit().getImage(imagePath);
+ this.position = position;
+ }
@Override
public Coordinates2D getPosition() {
@@ -15,17 +26,17 @@ public class PongRacket implements PongObject {
@Override
public Image getImage() {
- return null;
+ return this.image;
}
@Override
public int getWidth() {
- return 0;
+ return width;
}
@Override
public int getHeight() {
- return 0;
+ return height;
}
@Override
diff --git a/src/main/resources/pong/raquette1.png b/src/main/resources/pong/raquette1.png
new file mode 100644
index 0000000000000000000000000000000000000000..cbbffa0a904a783f3d869393fc5d8c1cad2f2982
GIT binary patch
literal 674
zcmeAS@N?(olHy`uVBq!ia0y~yV31>AV5s0=Vqjp%`hRs30|R4orn7T^r?ay{K~a8M
zW=<*tgT}<#iMAex9b}HiU-oj1mRY0lXu?9Po35@_S)yG5idVSSTFr>DU+C#P>Cq#N
z9bz(nBGy>#uz3CIffh%Tyuvy?zb?I?NB<`|bxZK~{r>pw-s5+&3MQ+4Oqn+~tcrBA
znkle(XQ<(it~wThV*-zijK5lXdL1mTxqJBd_1zNZKiPeM&heaEjk!kYqt0dC?uzD$
zw9A()-wV4(M4l6#FYGT-;`qpYownZoLOn~J4`(_idY%_{?>HJHt{r>kRGXKLuguxi
zQct-fr+=Qa-D34stL*!e_Zx&<2%EOkuUN!WCy7(YMPtR{CM}&K8CN|FCocQj(q4b$
zqxX}b6QPXC$C<JM6s_w%*#Ee@Hge9alF3e-3!Wd{W`C^Vf!>9z8{fWf%-!zC@ZY##
zY3ZM>Y6AaN_FlZW$o;?pvx36A7pK@hC}NkWyOio®2AFoNaY`4_W`4m{Aku>IM$
zYxj=7WS+2aU6A>KgNg=mi{6y>mwzw&{_XwDvU>Z4=0!X8(;8keFfecyctjR6Fz6|R
zFk{71`!WUw2KEw9Usv|$+$_8j=Dd-eHyIchBuiW)N}Tg^b5rw57@Uhz6H8K46v{J8
zG8EiBeFMT9`NSC*7<xTj978hhy}h`Rx50tOIZ$08(3m-T!+!^#2F<=lY#v+}{GYz^
zEIXvNi{tI?b>7>y`97CS-Lk~z?)TaKi>J(!_Q+=cRi?2l*Y(7-Slbf??m0KBBB$JR
w-kxJyyJ^<BkY^X{zaLw-b|EpK-pPLJEXl)%*D*X~U|?YIboFyt=akR{03xz15dZ)H
literal 0
HcmV?d00001
diff --git a/src/main/resources/pong/raquette2.png b/src/main/resources/pong/raquette2.png
new file mode 100644
index 0000000000000000000000000000000000000000..5365975a11328ac9cd1c68a6284510fc006f132c
GIT binary patch
literal 603
zcmeAS@N?(olHy`uVBq!ia0y~yV31>AV5s0=Vqjp%`hRs30|R4orn7T^r?ay{K~a8M
zW=<*tgT}<#iMAex9b}HiU-oj1mRY0lXu?9Po35@_S)yG5idVSSTFr>DU+C#P>Cq#N
z9bz(nBGy>#uz3CIffh%Tyuvy?zb?I?NB<`|bxZK~{r>pw-s5+&3MQ+4Oqn+~tcrBA
znkle(XQ<(it~wThV*-zijK5lXdL1mTxqJBd_1zNZKiPeM&heaEjk!kYqt0dC?uzD$
zw9A()-wV4(M4l6#FYGT-;`qpYownZoLOn~J4`(_idY%_{?>HJHt{r>kRGXKLuguxi
zQct-fr+=Qa-D34stL*!e_Zx&<2%EOkuUN!WCy7(YMPtR{CM}&K8CN|FCocQj(q4b$
zqxX}b6QPXC$C<JM6s_w%*#Ee@Hge9alF3e-3!Wd{W`C^Vf!>9z8{fWf%-!zC@ZY##
zY3ZM>Y6AaN_FlZW$o;?pvx36A7pK@hC}NkWyOio®2AFoNaY`4_W`4m{Aku>IM$
zYxj=7WS+2aU6A>KgNg=mi{6y>mwzw&{_XwDvU>Z4=0!X8(;8keFfecyctjR6Fz6|R
zFk{71`!WUw2KEw9Usv|$+$_A3x-S(RA2Bd6NS3%plsM<-=BDPAFgO>bCYGe8D3oWG
zWGJ|M`UZqI@`*DrFt~ZTIEG~0dwXUhFM|RP^M(T#{@d$?yCiMk|8UaJDlh9w*4C)C
hVXLp=qxN6tUlGXoHQoE)Lk0#022WQ%mvv4FO#nrN1<?Qi
literal 0
HcmV?d00001
--
GitLab