From 1578b7d98eba18ae68222dfb925ef631c55cda29 Mon Sep 17 00:00:00 2001 From: fdai4616 Date: Wed, 8 Feb 2023 20:15:57 +0100 Subject: [PATCH 01/13] update --- src/main/java/PingPong/Score.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/PingPong/Score.java b/src/main/java/PingPong/Score.java index 73b2ee1..7068698 100644 --- a/src/main/java/PingPong/Score.java +++ b/src/main/java/PingPong/Score.java @@ -10,7 +10,10 @@ public class Score extends Rectangle { int player_1; int player_2; - + Score(int FRAME_WIDTH, int FRAME_HEIGHT){ + Score.FRAME_WIDTH = FRAME_WIDTH; + Score.FRAME_HEIGHT = FRAME_HEIGHT; + } public void draw(Graphics g) { g.setColor(Color.white); From 79ea437ef4058bcb0615e8f35ade1852974254f2 Mon Sep 17 00:00:00 2001 From: fdai4616 Date: Wed, 8 Feb 2023 20:23:11 +0100 Subject: [PATCH 02/13] update --- src/main/java/PingPong/GamePanel.java | 6 +++++- target/classes/PingPong/Score.class | Bin 1695 -> 1743 bytes 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/PingPong/GamePanel.java b/src/main/java/PingPong/GamePanel.java index fb3af78..47662f6 100644 --- a/src/main/java/PingPong/GamePanel.java +++ b/src/main/java/PingPong/GamePanel.java @@ -28,6 +28,7 @@ public class GamePanel extends JPanel implements Runnable { + public void run() { @@ -59,7 +60,10 @@ public class GamePanel extends JPanel implements Runnable { ball = new Ball((FRAME_WIDTH/2)-(BALL_DIAMETER/2), ((FRAME_HEIGHT/2)-(BALL_DIAMETER/2)), BALL_DIAMETER, BALL_DIAMETER); } - + public void newPeddle() { + paddle_1 = new Paddle(0, (FRAME_HEIGHT/2)-(PADDLE_HEIGHT/2), PADDLE_WIDTH, PADDLE_HEIGHT, 1 ); + paddle_2 = new Paddle(FRAME_WIDTH-PADDLE_WIDTH, (FRAME_HEIGHT/2)-(PADDLE_HEIGHT/2), PADDLE_WIDTH, PADDLE_HEIGHT, 2 ); + } public class AL extends KeyAdapter { public void keyPressed(KeyEvent e) { diff --git a/target/classes/PingPong/Score.class b/target/classes/PingPong/Score.class index 015b82e0534806c07d0567995db6d5c51c069f1b..727ad8447a258f40ed07f02f9debe1b04d94d511 100644 GIT binary patch delta 648 zcmYL`O-~b16o#KWoifwu6bDLcOKCw=phZRNf{mIeP-#p>5kdR_MnR2f+Jq8VX#DsG zHj}v3xKOr2D2XPn+}Mp9{R8g&2W~W;p+=LLd(U~_^YNZ@Uq-$}tmg0cAA!@{uUijK znRM86Vk^Rh>9eJY#ku16%w!0YE}NK-+bw)@qIiCCCd7Uc21%Q4QuXJ@!f7%Fy*7Ou zsDB>K9#ljgxa;nSyRkM>s8-fY4lB&DYNb{!yETh`25o{2d0EwCrpeh1bHppD-hf5g zd!;h*GztPUL1&4~o?5y`)+iJgIag$pH3pVFi z^j-%(C0vE3l&CLODl4mF(z~`&Gg$T>>pA_dBI7;NGhS1Vhh%tJhe^!)p^rX6#FbE7 z6s(L!K<@6`E-Kf-iye%dW9<-0ZR7N86MZMF#*`mJo177JsT3we2ko-HeI#+XBurnc z5|^14&yV-}sy$2AEL9X&m|6JS`lpoBgxnn7BHo~9_yhg(oriQMzso>_tiVpN9N0Uz zh&DLdLYxcB;s(odi(dH}oMW{Pt(spRP?#uGu6x zqVY58EvclH;FxBNaqop1ITOO-xMl*a2p1PF%oUawXY=J!ThC}F+q&-RrNZo`QrRZq zy;Z~U1X;~#PD-EZQ+IQI!>zSbKh>@@C}@h(?VWMn`(=FUS+cp!ogjBL7rEzs^nF(= zUfqnF4-{iwuPGHxM?Lhm%v?xF Date: Wed, 8 Feb 2023 20:24:31 +0100 Subject: [PATCH 03/13] update --- .idea/hellsgamers.iml | 5 ++--- src/main/java/PingPong/GamePanel.java | 16 ++++++++++++++ src/{test => test_}/java/AIGridGUITest.java | 0 target/classes/classpath.index | Bin 230 -> 0 bytes target/hellsgamers-1.0-SNAPSHOT.jar | Bin 34869 -> 46089 bytes target/maven-archiver/pom.properties | 2 +- .../compile/default-compile/createdFiles.lst | 5 +++++ .../compile/default-compile/inputFiles.lst | 20 ++++++++++-------- target/test-classes/AIGridGUITest.class | Bin 672 -> 1271 bytes target/test-classes/classpath.index | Bin 96 -> 0 bytes 10 files changed, 35 insertions(+), 13 deletions(-) rename src/{test => test_}/java/AIGridGUITest.java (100%) delete mode 100644 target/classes/classpath.index delete mode 100644 target/test-classes/classpath.index diff --git a/.idea/hellsgamers.iml b/.idea/hellsgamers.iml index dc096b4..72c76be 100644 --- a/.idea/hellsgamers.iml +++ b/.idea/hellsgamers.iml @@ -6,9 +6,8 @@ - - - + + diff --git a/src/main/java/PingPong/GamePanel.java b/src/main/java/PingPong/GamePanel.java index 47662f6..4b4db89 100644 --- a/src/main/java/PingPong/GamePanel.java +++ b/src/main/java/PingPong/GamePanel.java @@ -22,6 +22,22 @@ public class GamePanel extends JPanel implements Runnable { Score score; Image image; Graphics graphics; + CollisionChecker collisionChecker; + Thread gameThread; + + + public GamePanel() { + newPeddle(); + newBall(); + score = new Score(FRAME_WIDTH, FRAME_HEIGHT); + collisionChecker = new CollisionChecker(); + this.setFocusable(true); + this.addKeyListener(new AL()); + this.setPreferredSize(SCREEN); + + gameThread = new Thread(this); + gameThread.start(); + } diff --git a/src/test/java/AIGridGUITest.java b/src/test_/java/AIGridGUITest.java similarity index 100% rename from src/test/java/AIGridGUITest.java rename to src/test_/java/AIGridGUITest.java diff --git a/target/classes/classpath.index b/target/classes/classpath.index deleted file mode 100644 index 674a749cb72a387a028a406035bc08a3d7e87b28..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 230 zcmb1OU}0cjU<6_qP-1^jv#RyHMPZbpSdA5L!wg;Cl{2Dqr^Dps_OE*2ciWLW1SY_6 zQ3uXs$e+N#5ac0v1R=t}a7GlF$H4HH)1eU}qET@t0mKsZx^kL<;mTtMhVs+y fDH&lhtAl~TuXAE{(mMu*m2VjsrmZMB$iM&q&L%e( diff --git a/target/hellsgamers-1.0-SNAPSHOT.jar b/target/hellsgamers-1.0-SNAPSHOT.jar index 4191a5593f1af9c9aa1d9531a77eb045a3474443..ea3a2793c7a49987a61de2e59f4e5658ecec00aa 100644 GIT binary patch delta 24443 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 diff --git a/target/maven-archiver/pom.properties b/target/maven-archiver/pom.properties index 22f93c5..e6bd5fe 100644 --- a/target/maven-archiver/pom.properties +++ b/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Tue Feb 07 11:52:01 CET 2023 +#Wed Feb 08 20:10:52 CET 2023 groupId=Hellsgamers artifactId=hellsgamers version=1.0-SNAPSHOT diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst index 2f632ce..3ecedd5 100644 --- a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -2,10 +2,12 @@ MenuPanel.class PingPong\Score.class BattleShip\BSButton.class Snake\Window.class +PingPong\GamePanel$AL.class Snake\Controller$1.class MenuPanel$GameFrame.class BattleShip\Ship.class PingPong\Ball.class +BattleShip\BShip$NewGameListener.class Snake\TextView$AnchorType.class BattleShip\AIGridGUI$SetShipsListener.class MenuPanel$AL.class @@ -22,8 +24,10 @@ Snake\SnakeView.class Snake\AppleView.class Snake\Controller$3.class Snake\TextView.class +BattleShip\GridGUI$MyCellListener.class BattleShip\BShip.class PingPong\GamePanel.class +PingPong\CollisionChecker.class Snake\Controller$MoveAction.class Snake\Snake$1.class Snake\Apple.class @@ -33,3 +37,4 @@ Snake\Drawable.class Snake\Controller$2.class MenuFrame.class Snake\GameView.class +BattleShip\GridGUI.class diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst index 39e231f..32ad707 100644 --- a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -1,3 +1,12 @@ +C:\Users\Laura\IdeaProjects\hellsgamers\src\main\java\BattleShip\BShip.java +C:\Users\Laura\IdeaProjects\hellsgamers\src\main\java\Main.java +C:\Users\Laura\IdeaProjects\hellsgamers\src\main\java\BattleShip\BSButton.java +C:\Users\Laura\IdeaProjects\hellsgamers\src\main\java\Snake\SnakeView.java +C:\Users\Laura\IdeaProjects\hellsgamers\src\main\java\Snake\Apple.java +C:\Users\Laura\IdeaProjects\hellsgamers\src\main\java\Snake\Game.java +C:\Users\Laura\IdeaProjects\hellsgamers\src\main\java\BattleShip\Ship.java +C:\Users\Laura\IdeaProjects\hellsgamers\src\main\java\PingPong\GameFrame.java +C:\Users\Laura\IdeaProjects\hellsgamers\src\main\java\Snake\Window.java C:\Users\Laura\IdeaProjects\hellsgamers\src\main\java\MenuPanel.java C:\Users\Laura\IdeaProjects\hellsgamers\src\main\java\BattleShip\AIGridGUI.java C:\Users\Laura\IdeaProjects\hellsgamers\src\main\java\Snake\AppleView.java @@ -5,19 +14,12 @@ C:\Users\Laura\IdeaProjects\hellsgamers\src\main\java\PingPong\Paddle.java C:\Users\Laura\IdeaProjects\hellsgamers\src\main\java\MenuFrame.java C:\Users\Laura\IdeaProjects\hellsgamers\src\main\java\BattleShip\Direction.java C:\Users\Laura\IdeaProjects\hellsgamers\src\main\java\Snake\Controller.java -C:\Users\Laura\IdeaProjects\hellsgamers\src\main\java\BattleShip\BShip.java C:\Users\Laura\IdeaProjects\hellsgamers\src\main\java\PingPong\GamePanel.java -C:\Users\Laura\IdeaProjects\hellsgamers\src\main\java\Main.java C:\Users\Laura\IdeaProjects\hellsgamers\src\main\java\PingPong\Score.java C:\Users\Laura\IdeaProjects\hellsgamers\src\main\java\Snake\Snake.java C:\Users\Laura\IdeaProjects\hellsgamers\src\main\java\Snake\GameView.java +C:\Users\Laura\IdeaProjects\hellsgamers\src\main\java\PingPong\CollisionChecker.java C:\Users\Laura\IdeaProjects\hellsgamers\src\main\java\Snake\Drawable.java -C:\Users\Laura\IdeaProjects\hellsgamers\src\main\java\BattleShip\BSButton.java -C:\Users\Laura\IdeaProjects\hellsgamers\src\main\java\Snake\SnakeView.java -C:\Users\Laura\IdeaProjects\hellsgamers\src\main\java\Snake\Apple.java -C:\Users\Laura\IdeaProjects\hellsgamers\src\main\java\Snake\Game.java +C:\Users\Laura\IdeaProjects\hellsgamers\src\main\java\BattleShip\GridGUI.java C:\Users\Laura\IdeaProjects\hellsgamers\src\main\java\Snake\TextView.java -C:\Users\Laura\IdeaProjects\hellsgamers\src\main\java\BattleShip\Ship.java -C:\Users\Laura\IdeaProjects\hellsgamers\src\main\java\PingPong\GameFrame.java -C:\Users\Laura\IdeaProjects\hellsgamers\src\main\java\Snake\Window.java C:\Users\Laura\IdeaProjects\hellsgamers\src\main\java\PingPong\Ball.java diff --git a/target/test-classes/AIGridGUITest.class b/target/test-classes/AIGridGUITest.class index cc50bade1ca972ed0bb09ec8cc84cd0cbea744bf..073325ff600470d7b2f75da47b7e4737bf6dd72c 100644 GIT binary patch literal 1271 zcmbVL=}r?-6#i~ox;eB%sbwphEOrs<8h=1ZK!r3J)UY)1=d_G)$uLu=Q+zHH1*3@% z;6oX|J1vD05);$(_TF>P{g!i1fB*UM3qTbwk_aIjLqx+6q5}GboZYn)n5 zUm&_J9qDffgbT%b3~_<%mg)PpwSOX8mCf3YCy#axYe~eAR4DfZh6=S>v7W#%QZb}8 z=ok?g?x!ADZQ>?O*?TIGGwy<1Q<$R~vbawfXYRRm*b;~oYDKb*VLXNj4U>v+&h?Hf zryc6#+LFHIRm_&GY_{8$=S$aV3utC=c=M@a+HD1#*D$Ss;|ln-``J;!Sq*b4m{7qz zd3@rl=mQN4{ZzyHNcE9d?vW*sHl$;{?VL3%@4#%>jARVAY1(zulj__HM*I^=4QXSb z25SOiK5MZXINNr;x@pU!n$zm2vU^s$V{;>F0uy^3$CqbTUA84rHyy|I&7QHmakqI@ zWin`249a5fs3fY_Y|7Pb;Ppm!*JVmwzqie1&}=$L?zH5E>VTV7H9DAQ(?c9B z!7tm+HOf6_i|Zm!TimO=Z0QoB^b@fUdQwkbBJmB{7sf+a;;N<+EPMnBEOV!I-{2t% zJP8zu7Ygup`KxkAN?)PrFE5Z;*H@;#BXM_z^Re z)Rll{wNK+wN`$dVr8pj^UPDh-%lQjTZRqLg0lpk90;A;1k~PQOI41Z}MoL|jKCd1W ziGARwLIojaceR9XX?fh&(jbO%G=8IcMmc(cnQAOQpd=Hp Date: Wed, 8 Feb 2023 20:25:56 +0100 Subject: [PATCH 04/13] refactoring: --- src/main/java/PingPong/GamePanel.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/PingPong/GamePanel.java b/src/main/java/PingPong/GamePanel.java index 4b4db89..040cb36 100644 --- a/src/main/java/PingPong/GamePanel.java +++ b/src/main/java/PingPong/GamePanel.java @@ -4,7 +4,6 @@ import javax.swing.*; import java.awt.*; import java.awt.event.KeyAdapter; import java.awt.event.KeyEvent; -import java.util.Random; public class GamePanel extends JPanel implements Runnable { @@ -27,7 +26,7 @@ public class GamePanel extends JPanel implements Runnable { public GamePanel() { - newPeddle(); + newPaddle(); newBall(); score = new Score(FRAME_WIDTH, FRAME_HEIGHT); collisionChecker = new CollisionChecker(); @@ -76,7 +75,7 @@ public class GamePanel extends JPanel implements Runnable { ball = new Ball((FRAME_WIDTH/2)-(BALL_DIAMETER/2), ((FRAME_HEIGHT/2)-(BALL_DIAMETER/2)), BALL_DIAMETER, BALL_DIAMETER); } - public void newPeddle() { + public void newPaddle() { paddle_1 = new Paddle(0, (FRAME_HEIGHT/2)-(PADDLE_HEIGHT/2), PADDLE_WIDTH, PADDLE_HEIGHT, 1 ); paddle_2 = new Paddle(FRAME_WIDTH-PADDLE_WIDTH, (FRAME_HEIGHT/2)-(PADDLE_HEIGHT/2), PADDLE_WIDTH, PADDLE_HEIGHT, 2 ); } From 74c71e7246d31064bc86c10650a9e85e9a4dc7ae Mon Sep 17 00:00:00 2001 From: fdai4616 Date: Wed, 8 Feb 2023 20:43:07 +0100 Subject: [PATCH 05/13] update --- src/main/java/PingPong/GamePanel.java | 21 +++++++++++++++++++-- target/classes/PingPong/GamePanel$AL.class | Bin 731 -> 731 bytes target/classes/PingPong/GamePanel.class | Bin 2119 -> 2818 bytes 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/src/main/java/PingPong/GamePanel.java b/src/main/java/PingPong/GamePanel.java index 040cb36..0a9304a 100644 --- a/src/main/java/PingPong/GamePanel.java +++ b/src/main/java/PingPong/GamePanel.java @@ -38,16 +38,32 @@ public class GamePanel extends JPanel implements Runnable { gameThread.start(); } + public void checkCollision() { + } public void run() { + long lastTime = System.nanoTime(); + double amountOfTicks = 60.0; + double nanoseconds = 1000000000 / amountOfTicks; + double delta = 0; + while (true) { + long now = System.nanoTime(); + delta += (now - lastTime) / nanoseconds; + lastTime = now; + if (delta >= 1) { + move(); + checkCollision(); + repaint(); + delta--; + } - + } } public void draw(Graphics g) { @@ -57,8 +73,9 @@ public class GamePanel extends JPanel implements Runnable { ball.draw(g); } + public void move() { - + paddle_1.move(); paddle_2.move(); ball.move(); diff --git a/target/classes/PingPong/GamePanel$AL.class b/target/classes/PingPong/GamePanel$AL.class index 3715fadec8a8da8adb96e1535625f31d4610ea35..fb0c3990f47de49b6bb3eaff7afeb3a93692a1d4 100644 GIT binary patch delta 27 icmcc3dYg5FH4|g-WE-Xk&M*dUhHwTkhKR{?nd|^-j|R#B delta 27 icmcc3dYg5FH4~%#WE-XkPA3L#24@B_2A9cmnd|^(_Xc_Z diff --git a/target/classes/PingPong/GamePanel.class b/target/classes/PingPong/GamePanel.class index a08c5bf7e5fee999c6a9b12c7d3b138a184f8422..b5a0ce9db11d0429828a4d21b9b4e7f9e3a1ab51 100644 GIT binary patch literal 2818 zcmZuz*;f;16#oqg2I2?_A_BH`!D6_0z{e6>RCUW`^?%ey`?=HW)eEj+EZ@&XLh93f`QP7mp zjhRf*n28N)b0VV|q7Z~1wE?VC5kMU^E@_L}l~`$sim_9+hJtl{x}jUg75E~Z<3T70 zs#q_z>kYA#5&3*UNa+R@4N@AQ^rTiO1Q1ft;JO^m6;0|jqDlJNsGv5IN_CFc^X4WM zE!a#+N$MyFrSHDg8$g?aHdokREEM#TUNrh=MeedNgJ?yqG<1)OdvPBP`gf&UTImu#-W$?p^S9#?wJ`V3$m2w}Qqn9WC=r<3bsbl67!h0WW~gyFsxYBF)z!s_Nv&27z;7lpG_u5 z6f}Ex68fAlBo=lS`&AskK?1-mGN!mFOjG1X^=r(8(YcPiOES3!sBa$?G**3V))ZPk zh#nl0c^&p{+Q-=i!;sK8p&eDxi$1o*3_GfFm0eWvRAr9A_29UQhh&4)mMqP*WGlo~ zoJ2oS&YRkjf|jZf2Tg5$R?n3jKS>n>7*tRj5U{#$fnWa*mX*;o)Ek83|66T^X zdpplcfUn7he3Bc6;K6eF%;g7tEX((BaL9r><9H|^ZzLfm?KDi%J%P(Lox&mLcjC%gm=q)r(hJClg z%AFO2m(ff?>*NaBm$4=4FJmkDj!E9Qzl=!qXY47Xo1z{mdT<#>qQBxu8OMI2-5Pwr zzx(*wf)AUYko_y`}9Q}Br!bC=Ci z<~dkrEB91gRNRZ)&pegM3Wifdx}52!3-JLC(f4757-uVv zGWI^(QA@>`hru)*C0ivP-^ z4d>W%`~m(E`^9hl?D4squvyU$$=sQpJI~BBbLWr0fBPN40)C1hBrseuty-yJ)iSHb zkt`XOtVhv>?g)A`M9@o*=fuM^W3PeZ_>Df_TC~8>82Gg`< zT^f$83fu^Um#5NlGi&lZuMQlh2ukg-_Qot{9!bkF8&(vXD69BecCgEl z-&!u`^Mo1cp4%=62%U4Z+^`(iu-qM^ zej>v__>F+pax3KZ)xtJy;w>GQ7K_FGoX-2(`7(_dr($)RDw>wuI5|3y_I4|y;bNm=)OQTqRC?Rkr&pj{K#@Gnn$I&D`kP6aLs{~{MIuPanZm=NV;`d9Q#H!(nY zjq)AJ@wS|xoa_Wnpqm%ClwA;aK)pnnCJ-~G~YYGpE{wPq}j9=S~Uz_FEmSeW6iHY=U+}w+c zKjZi-HXa+lK;ac8Iyg};&w19g@V_-Ru+e5~ot~ Date: Wed, 8 Feb 2023 20:44:27 +0100 Subject: [PATCH 06/13] update --- src/main/java/PingPong/GamePanel.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/PingPong/GamePanel.java b/src/main/java/PingPong/GamePanel.java index 0a9304a..c95c098 100644 --- a/src/main/java/PingPong/GamePanel.java +++ b/src/main/java/PingPong/GamePanel.java @@ -39,6 +39,10 @@ public class GamePanel extends JPanel implements Runnable { } public void checkCollision() { + //Reflection of Ball when it touches top and bottom edges! + if(collisionChecker.didTouchTopOrBottomEdge(ball.y, FRAME_HEIGHT-BALL_DIAMETER)) { + ball.setYDirection(-ball.yVelocity); + } } From 753da4443b731424d1688c034535c354624987f0 Mon Sep 17 00:00:00 2001 From: fdai4616 Date: Wed, 8 Feb 2023 20:45:00 +0100 Subject: [PATCH 07/13] update --- src/main/java/PingPong/GamePanel.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/main/java/PingPong/GamePanel.java b/src/main/java/PingPong/GamePanel.java index c95c098..8dbf850 100644 --- a/src/main/java/PingPong/GamePanel.java +++ b/src/main/java/PingPong/GamePanel.java @@ -43,7 +43,16 @@ public class GamePanel extends JPanel implements Runnable { if(collisionChecker.didTouchTopOrBottomEdge(ball.y, FRAME_HEIGHT-BALL_DIAMETER)) { ball.setYDirection(-ball.yVelocity); } - + if(collisionChecker.didTouchPaddle(ball, new Rectangle(paddle_1.x, paddle_1.y1, paddle_1.width, paddle_1.height))) { + ball.xVelocity = Math.abs(ball.xVelocity); + ball.xVelocity++; // increasing ball's speed! + if (ball.yVelocity > 0) + ball.yVelocity++; + else + ball.yVelocity--; + ball.setXDirection(ball.xVelocity); + ball.setYDirection(ball.yVelocity); + } } From 045f1474f6946123edce368c6b7dd5fc6c01f73c Mon Sep 17 00:00:00 2001 From: fdai4616 Date: Wed, 8 Feb 2023 20:46:06 +0100 Subject: [PATCH 08/13] update --- src/main/java/PingPong/GamePanel.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/main/java/PingPong/GamePanel.java b/src/main/java/PingPong/GamePanel.java index 8dbf850..c85e00c 100644 --- a/src/main/java/PingPong/GamePanel.java +++ b/src/main/java/PingPong/GamePanel.java @@ -45,7 +45,7 @@ public class GamePanel extends JPanel implements Runnable { } if(collisionChecker.didTouchPaddle(ball, new Rectangle(paddle_1.x, paddle_1.y1, paddle_1.width, paddle_1.height))) { ball.xVelocity = Math.abs(ball.xVelocity); - ball.xVelocity++; // increasing ball's speed! + ball.xVelocity++; if (ball.yVelocity > 0) ball.yVelocity++; else @@ -53,6 +53,16 @@ public class GamePanel extends JPanel implements Runnable { ball.setXDirection(ball.xVelocity); ball.setYDirection(ball.yVelocity); } + if(collisionChecker.didTouchPaddle(ball, new Rectangle(paddle_2.x, paddle_2.y2, paddle_2.width, paddle_2.height))) { + ball.xVelocity = Math.abs(ball.xVelocity); + ball.xVelocity++; + if (ball.yVelocity > 0) + ball.yVelocity++; + else + ball.yVelocity--; + ball.setXDirection(-ball.xVelocity); + ball.setYDirection(ball.yVelocity); + } } From a68279763df4550d3ae379b330af96a2a50379a3 Mon Sep 17 00:00:00 2001 From: fdai4616 Date: Wed, 8 Feb 2023 20:47:22 +0100 Subject: [PATCH 09/13] update --- src/main/java/PingPong/GamePanel.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/main/java/PingPong/GamePanel.java b/src/main/java/PingPong/GamePanel.java index c85e00c..384db1b 100644 --- a/src/main/java/PingPong/GamePanel.java +++ b/src/main/java/PingPong/GamePanel.java @@ -63,6 +63,14 @@ public class GamePanel extends JPanel implements Runnable { ball.setXDirection(-ball.xVelocity); ball.setYDirection(ball.yVelocity); } + if (paddle_1.y1 <= 0) + paddle_1.y1 = 0; + if (paddle_1.y1 >= (FRAME_HEIGHT-PADDLE_HEIGHT)) + paddle_1.y1 = FRAME_HEIGHT-PADDLE_HEIGHT; + if (paddle_2.y2 <= 0) + paddle_2.y2 = 0; + if (paddle_2.y2 >= (FRAME_HEIGHT-PADDLE_HEIGHT)) + paddle_2.y2 = FRAME_HEIGHT-PADDLE_HEIGHT; } From 9b4ab2a533f58628c0a1f9d5d785da09eb9ffdbe Mon Sep 17 00:00:00 2001 From: fdai4616 Date: Wed, 8 Feb 2023 20:48:21 +0100 Subject: [PATCH 10/13] update --- src/main/java/PingPong/GamePanel.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/main/java/PingPong/GamePanel.java b/src/main/java/PingPong/GamePanel.java index 384db1b..e84d959 100644 --- a/src/main/java/PingPong/GamePanel.java +++ b/src/main/java/PingPong/GamePanel.java @@ -71,6 +71,13 @@ public class GamePanel extends JPanel implements Runnable { paddle_2.y2 = 0; if (paddle_2.y2 >= (FRAME_HEIGHT-PADDLE_HEIGHT)) paddle_2.y2 = FRAME_HEIGHT-PADDLE_HEIGHT; + + if(collisionChecker.didTouchLeftEdge(ball.x)) { + score.player_2++; + newPaddle(); + newBall(); + + } } From aaf0897e8365380292a2e3e3cad91dd2cf1beddf Mon Sep 17 00:00:00 2001 From: fdai4616 Date: Wed, 8 Feb 2023 20:49:08 +0100 Subject: [PATCH 11/13] update --- src/main/java/PingPong/GamePanel.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/java/PingPong/GamePanel.java b/src/main/java/PingPong/GamePanel.java index e84d959..40e0f1f 100644 --- a/src/main/java/PingPong/GamePanel.java +++ b/src/main/java/PingPong/GamePanel.java @@ -78,6 +78,11 @@ public class GamePanel extends JPanel implements Runnable { newBall(); } + if(collisionChecker.didTouchRightEdge(ball.x, FRAME_WIDTH-BALL_DIAMETER)) { + score.player_1++; + newPaddle(); + newBall(); + } } From 41c8babc7583ff778d409b750e0daf36d9cb174a Mon Sep 17 00:00:00 2001 From: fdai4616 Date: Wed, 8 Feb 2023 20:49:40 +0100 Subject: [PATCH 12/13] update --- src/main/java/PingPong/GamePanel.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/java/PingPong/GamePanel.java b/src/main/java/PingPong/GamePanel.java index 40e0f1f..963182a 100644 --- a/src/main/java/PingPong/GamePanel.java +++ b/src/main/java/PingPong/GamePanel.java @@ -83,6 +83,12 @@ public class GamePanel extends JPanel implements Runnable { newPaddle(); newBall(); } + if(score.player_1 == 20){ + score.player_1 = 0; + score.player_2 = 0; + newPaddle(); + newBall(); + } } From 0774a431392b782a5f03d2241c04e1c47103658c Mon Sep 17 00:00:00 2001 From: fdai4616 Date: Wed, 8 Feb 2023 20:50:21 +0100 Subject: [PATCH 13/13] update --- src/main/java/PingPong/GamePanel.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/main/java/PingPong/GamePanel.java b/src/main/java/PingPong/GamePanel.java index 963182a..d731f9b 100644 --- a/src/main/java/PingPong/GamePanel.java +++ b/src/main/java/PingPong/GamePanel.java @@ -89,6 +89,13 @@ public class GamePanel extends JPanel implements Runnable { newPaddle(); newBall(); } + if(score.player_2 == 20) { + score.player_1 = 0; + score.player_2 = 0; + newPaddle(); + newBall(); + + } }