From 8ed50b14c80f852e7a165407f536ea13f8a9d652 Mon Sep 17 00:00:00 2001
From: Jean Luo <luoj3@mcmaster.ca>
Date: Fri, 21 Oct 2016 00:26:50 -0400
Subject: [PATCH] comments added to the model
---
Game_Code/src/Game.java | 155 ----------------------------------------
Game_Code/src/View.java | 2 +-
2 files changed, 1 insertion(+), 156 deletions(-)
delete mode 100644 Game_Code/src/Game.java
diff --git a/Game_Code/src/Game.java b/Game_Code/src/Game.java
deleted file mode 100644
index 441db3e..0000000
--- a/Game_Code/src/Game.java
+++ /dev/null
@@ -1,155 +0,0 @@
-
-import java.awt.*;
-import java.awt.event.*;
-import java.awt.geom.Ellipse2D;
-import java.awt.geom.Rectangle2D;
-import java.util.HashMap;
-import java.util.HashSet;
-
-import javax.swing.*;
-
-
-public class Game extends JPanel implements KeyListener, ActionListener {
-
- private int height, width;
- private Timer t = new Timer(5, this);
- private boolean first;
-
- private HashSet<String> keys = new HashSet<String>();
-
- // pad
- private final int SPEED = 1;
- private int padH = 10, padW = 40;
- private int bottomPadX, topPadX;
- private int inset = 10;
-
- // ball
- private double ballX, ballY, velX = 1, velY = 1, ballSize = 20;
-
- // score
- private int scoreTop, scoreBottom;
-
- public Game() {
- addKeyListener(this);
- setFocusable(true);
- setFocusTraversalKeysEnabled(false);
- first = true;
- t.setInitialDelay(100);
- t.start();
- }
-
- @Override
- protected void paintComponent(Graphics g) {
- super.paintComponent(g);
- Graphics2D g2d = (Graphics2D) g;
- height = getHeight();
- width = getWidth();
-
- // initial positioning
- if (first) {
- bottomPadX = width / 2 - padW / 2;
- topPadX = bottomPadX;
- ballX = width / 2 - ballSize / 2;
- ballY = height / 2 - ballSize / 2;
- first = false;
- }
-
- // bottom pad
- Rectangle2D bottomPad = new Rectangle(bottomPadX, height - padH - inset, padW, padH);
- g2d.fill(bottomPad);
-
- // top pad
- Rectangle2D topPad = new Rectangle(topPadX, inset, padW, padH);
- g2d.fill(topPad);
-
- // ball
- Ellipse2D ball = new Ellipse2D.Double(ballX, ballY, ballSize, ballSize);
- g2d.fill(ball);
-
- // scores
- String scoreB = "Bottom: " + new Integer(scoreBottom).toString();
- String scoreT = "Top: " + new Integer(scoreTop).toString();
- g2d.drawString(scoreB, 10, height / 2);
- g2d.drawString(scoreT, width - 50, height / 2);
- }
-
- @Override
- public void actionPerformed(ActionEvent e) {
- // side walls
- if (ballX < 0 || ballX > width - ballSize) {
- velX = -velX;
- }
- // top / down walls
- if (ballY < 0) {
- velY = -velY;
- ++ scoreBottom;
- }
-
- if (ballY + ballSize > height) {
- velY = -velY;
- ++ scoreTop;
- }
- // bottom pad
- if (ballY + ballSize >= height - padH - inset && velY > 0)
- if (ballX + ballSize >= bottomPadX && ballX <= bottomPadX + padW)
- velY = -velY;
-
- // top pad
- if (ballY <= padH + inset && velY < 0)
- if (ballX + ballSize >= topPadX && ballX <= topPadX + padW)
- velY = -velY;
-
- ballX += velX;
- ballY += velY;
-
- // pressed keys
- if (keys.size() == 1) {
- if (keys.contains("LEFT")) {
- bottomPadX -= (bottomPadX > 0) ? SPEED : 0;
- }
- else if (keys.contains("RIGHT")) {
- bottomPadX += (bottomPadX < width - padW) ? SPEED : 0;
- }
- }
-
- // AI
- double delta = ballX - topPadX;
- if (delta > 0) {
- topPadX += (topPadX < width - padW) ? SPEED : 0;
- }
- else if (delta < 0) {
- topPadX -= (topPadX > 0) ? SPEED : 0;
- }
-
- repaint();
- }
-
- @Override
- public void keyTyped(KeyEvent e) {}
-
- @Override
- public void keyPressed(KeyEvent e) {
- int code = e.getKeyCode();
- switch (code) {
- case KeyEvent.VK_LEFT:
- keys.add("LEFT");
- break;
- case KeyEvent.VK_RIGHT:
- keys.add("RIGHT");
- break;
- }
- }
-
- @Override
- public void keyReleased(KeyEvent e) {
- int code = e.getKeyCode();
- switch (code) {
- case KeyEvent.VK_LEFT:
- keys.remove("LEFT");
- break;
- case KeyEvent.VK_RIGHT:
- keys.remove("RIGHT");
- break;
- }
- }
-}
diff --git a/Game_Code/src/View.java b/Game_Code/src/View.java
index 0cc8692..09812a7 100644
--- a/Game_Code/src/View.java
+++ b/Game_Code/src/View.java
@@ -107,7 +107,7 @@ public class View extends JFrame{
}
public void single() {
- Pong_viewAndController view_controller = new Pong_viewAndController(this);
+ Pong_viewAndController view_controller = new Pong_viewAndController();
this.setVisible(false);
}
--
GitLab