From 92bf42cf937690aa98f3091aabe0add137832505 Mon Sep 17 00:00:00 2001 From: S Date: Tue, 6 Jun 2017 14:41:10 +0100 Subject: [PATCH 001/140] {"types":"A","runs":1} --- Breakout.java | 132 +++++++++++++++++++++++++------------------------- 1 file changed, 66 insertions(+), 66 deletions(-) diff --git a/Breakout.java b/Breakout.java index 3f7c84d..21afe9e 100755 --- a/Breakout.java +++ b/Breakout.java @@ -1,66 +1,66 @@ -/* - * File: Breakout.java - * ------------------- - * Name: - * Section Leader: - * - * This file will eventually implement the game of Breakout. - */ - -import acm.graphics.*; -import acm.program.*; -import acm.util.*; - -import java.applet.*; -import java.awt.*; -import java.awt.event.*; - -public class Breakout extends GraphicsProgram { - -/** Width and height of application window in pixels */ - public static final int APPLICATION_WIDTH = 400; - public static final int APPLICATION_HEIGHT = 600; - -/** Dimensions of game board (usually the same) */ - private static final int WIDTH = APPLICATION_WIDTH; - private static final int HEIGHT = APPLICATION_HEIGHT; - -/** Dimensions of the paddle */ - private static final int PADDLE_WIDTH = 60; - private static final int PADDLE_HEIGHT = 10; - -/** Offset of the paddle up from the bottom */ - private static final int PADDLE_Y_OFFSET = 30; - -/** Number of bricks per row */ - private static final int NBRICKS_PER_ROW = 10; - -/** Number of rows of bricks */ - private static final int NBRICK_ROWS = 10; - -/** Separation between bricks */ - private static final int BRICK_SEP = 4; - -/** Width of a brick */ - private static final int BRICK_WIDTH = - (WIDTH - (NBRICKS_PER_ROW - 1) * BRICK_SEP) / NBRICKS_PER_ROW; - -/** Height of a brick */ - private static final int BRICK_HEIGHT = 8; - -/** Radius of the ball in pixels */ - private static final int BALL_RADIUS = 10; - -/** Offset of the top brick row from the top */ - private static final int BRICK_Y_OFFSET = 70; - -/** Number of turns */ - private static final int NTURNS = 3; - -/* Method: run() */ -/** Runs the Breakout program. */ - public void run() { - /* You fill this in, along with any subsidiary methods */ - } - -} +/* + * File: Breakout.java + * ------------------- + * Name: + * Section Leader: + * + * This file will eventually implement the game of Breakout. + */ + +import acm.graphics.*; +import acm.program.*; +import acm.util.*; + +import java.applet.*; +import java.awt.*; +import java.awt.event.*; + +public class Breakout extends GraphicsProgram { + +/** Width and height of application window in pixels */ + public static final int APPLICATION_WIDTH = 400; + public static final int APPLICATION_HEIGHT = 600; + +/** Dimensions of game board (usually the same) */ + private static final int WIDTH = APPLICATION_WIDTH; + private static final int HEIGHT = APPLICATION_HEIGHT; + +/** Dimensions of the paddle */ + private static final int PADDLE_WIDTH = 60; + private static final int PADDLE_HEIGHT = 10; + +/** Offset of the paddle up from the bottom */ + private static final int PADDLE_Y_OFFSET = 30; + +/** Number of bricks per row */ + private static final int NBRICKS_PER_ROW = 10; + +/** Number of rows of bricks */ + private static final int NBRICK_ROWS = 10; + +/** Separation between bricks */ + private static final int BRICK_SEP = 4; + +/** Width of a brick */ + private static final int BRICK_WIDTH = + (WIDTH - (NBRICKS_PER_ROW - 1) * BRICK_SEP) / NBRICKS_PER_ROW; + +/** Height of a brick */ + private static final int BRICK_HEIGHT = 8; + +/** Radius of the ball in pixels */ + private static final int BALL_RADIUS = 10; + +/** Offset of the top brick row from the top */ + private static final int BRICK_Y_OFFSET = 70; + +/** Number of turns */ + private static final int NTURNS = 3; + +/* Method: run() */ +/** Runs the Breakout program. */ + public void run() { + /* You fill this in, along with any subsidiary methods */ + } + +} From b3d6bf7368362f815a50cc1b3e968e66bf7277fa Mon Sep 17 00:00:00 2001 From: S Date: Tue, 6 Jun 2017 21:59:27 +0100 Subject: [PATCH 002/140] {"types":"C","runs":44} --- Breakout.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Breakout.java b/Breakout.java index 21afe9e..7b63ec8 100755 --- a/Breakout.java +++ b/Breakout.java @@ -60,7 +60,15 @@ public class Breakout extends GraphicsProgram { /* Method: run() */ /** Runs the Breakout program. */ public void run() { + int i = 0; + int j = 0; + for (i = 0; i < NBRICK_ROWS; i++){ + for (j = 0; j < NBRICKS_PER_ROW; j++){ + } + GRect firstrow = new GRect (getWidth() / 2, getHeight() /2, BRICK_WIDTH * BRICK_SEP, BRICK_HEIGHT * BRICK_SEP ); + /* You fill this in, along with any subsidiary methods */ + } } } From b290fbd8305248eef99dd5021f086bde6a3a0de5 Mon Sep 17 00:00:00 2001 From: S Date: Tue, 6 Jun 2017 22:01:19 +0100 Subject: [PATCH 003/140] {"types":"C","runs":45} --- Breakout.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Breakout.java b/Breakout.java index 7b63ec8..54db2dd 100755 --- a/Breakout.java +++ b/Breakout.java @@ -66,7 +66,7 @@ public void run() { for (j = 0; j < NBRICKS_PER_ROW; j++){ } GRect firstrow = new GRect (getWidth() / 2, getHeight() /2, BRICK_WIDTH * BRICK_SEP, BRICK_HEIGHT * BRICK_SEP ); - + add (firstrow); /* You fill this in, along with any subsidiary methods */ } } From 641f781a176ac14d7681e1e8c0ed41923df3b657 Mon Sep 17 00:00:00 2001 From: S Date: Tue, 6 Jun 2017 22:05:29 +0100 Subject: [PATCH 004/140] {"types":"C","runs":46} --- Breakout.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Breakout.java b/Breakout.java index 54db2dd..6fd096c 100755 --- a/Breakout.java +++ b/Breakout.java @@ -65,7 +65,7 @@ public void run() { for (i = 0; i < NBRICK_ROWS; i++){ for (j = 0; j < NBRICKS_PER_ROW; j++){ } - GRect firstrow = new GRect (getWidth() / 2, getHeight() /2, BRICK_WIDTH * BRICK_SEP, BRICK_HEIGHT * BRICK_SEP ); + GRect firstrow = new GRect (getWidth() / 2, getHeight() /2, BRICK_WIDTH, BRICK_HEIGHT); add (firstrow); /* You fill this in, along with any subsidiary methods */ } From a21dcd4451d8633e475a65699de9538f9c7a6125 Mon Sep 17 00:00:00 2001 From: S Date: Tue, 6 Jun 2017 22:07:23 +0100 Subject: [PATCH 005/140] {"types":"C","runs":48} --- Breakout.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Breakout.java b/Breakout.java index 6fd096c..21137f3 100755 --- a/Breakout.java +++ b/Breakout.java @@ -64,11 +64,12 @@ public void run() { int j = 0; for (i = 0; i < NBRICK_ROWS; i++){ for (j = 0; j < NBRICKS_PER_ROW; j++){ - } + GRect firstrow = new GRect (getWidth() / 2, getHeight() /2, BRICK_WIDTH, BRICK_HEIGHT); add (firstrow); /* You fill this in, along with any subsidiary methods */ - } + } + } } } From b840b426005faf24c2b4ee68ab6c3c474080da72 Mon Sep 17 00:00:00 2001 From: S Date: Tue, 6 Jun 2017 22:07:51 +0100 Subject: [PATCH 006/140] {"types":"C","runs":49} --- Breakout.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Breakout.java b/Breakout.java index 21137f3..ca370a6 100755 --- a/Breakout.java +++ b/Breakout.java @@ -63,12 +63,12 @@ public void run() { int i = 0; int j = 0; for (i = 0; i < NBRICK_ROWS; i++){ - for (j = 0; j < NBRICKS_PER_ROW; j++){ + GRect firstrow = new GRect (getWidth() / 2, getHeight() /2, BRICK_WIDTH, BRICK_HEIGHT); add (firstrow); /* You fill this in, along with any subsidiary methods */ - } + } } From 18a63a780aa2ca05ca09c32d4f63281025826168 Mon Sep 17 00:00:00 2001 From: S Date: Tue, 6 Jun 2017 22:08:19 +0100 Subject: [PATCH 007/140] {"types":"C","runs":50} --- Breakout.java | 1 - 1 file changed, 1 deletion(-) diff --git a/Breakout.java b/Breakout.java index ca370a6..96d3dfa 100755 --- a/Breakout.java +++ b/Breakout.java @@ -61,7 +61,6 @@ public class Breakout extends GraphicsProgram { /** Runs the Breakout program. */ public void run() { int i = 0; - int j = 0; for (i = 0; i < NBRICK_ROWS; i++){ From b6f58021a30fc85c093e09c9256f2a7d7ecc61ba Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 06:37:40 +0100 Subject: [PATCH 008/140] {"types":"C","runs":1} --- Breakout.java | 78 ++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 71 insertions(+), 7 deletions(-) diff --git a/Breakout.java b/Breakout.java index 96d3dfa..0dd784b 100755 --- a/Breakout.java +++ b/Breakout.java @@ -60,15 +60,79 @@ public class Breakout extends GraphicsProgram { /* Method: run() */ /** Runs the Breakout program. */ public void run() { - int i = 0; - for (i = 0; i < NBRICK_ROWS; i++){ - +double x = 0.5; + + double y = (BRICK_Y_OFFSET); - GRect firstrow = new GRect (getWidth() / 2, getHeight() /2, BRICK_WIDTH, BRICK_HEIGHT); - add (firstrow); - /* You fill this in, along with any subsidiary methods */ + for (int row = 0; row Date: Thu, 8 Jun 2017 06:54:50 +0100 Subject: [PATCH 009/140] {"types":"C","runs":8} --- Breakout.java | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/Breakout.java b/Breakout.java index 0dd784b..77e3a65 100755 --- a/Breakout.java +++ b/Breakout.java @@ -58,6 +58,11 @@ public class Breakout extends GraphicsProgram { private static final int NTURNS = 3; /* Method: run() */ + + private GObject gobj; + private GPoint last; + private RandomGenerator rgen = RandomGenerator.getInstance(); + /** Runs the Breakout program. */ public void run() { double x = 0.5; @@ -77,23 +82,23 @@ public void run() { } else { color = Color.CYAN; } - drawRow(x, y, (NBRICK_ROWS ), color); + getRow(x, y, (NBRICK_ROWS ), color); y += BRICK_HEIGHT + BRICK_SEP; } } - private void drawRow(double x, double y, int bricks, Color color) { + private void getRow(double x, double y, int bricks, Color color) { for (int i = 0; i < bricks; i++) { - drawBrick((x + i * BRICK_WIDTH), y, color); + getBrick((x + i * BRICK_WIDTH), y, color); x += BRICK_SEP; } } - private void drawBrick(double x, double y, Color color) { + private void getBrick(double x, double y, Color color) { GRect rect = new GRect(x, y, BRICK_WIDTH, BRICK_HEIGHT); rect.setFilled(true); rect.setColor(color); @@ -102,13 +107,13 @@ private void drawBrick(double x, double y, Color color) { } - public void init() { + public void main() { double x = (getWidth()-PADDLE_WIDTH)/2; double y = (getHeight()-PADDLE_HEIGHT *10); - GRect paddle = new GRect(x, y, PADDLE_WIDTH, PADDLE_HEIGHT); - paddle.setFilled(true); - add(paddle); + GRect mousePaddle = new GRect(x, y, PADDLE_WIDTH, PADDLE_HEIGHT); + mousePaddle.setFilled(true); + add(mousePaddle); addMouseListeners(); } @@ -125,14 +130,14 @@ public void mouseDragged (MouseEvent e) { last = new GPoint(e.getPoint()); } } - + } +} + + - private GObject gobj; - private GPoint last; - private RandomGenerator rgen = RandomGenerator.getInstance(); - } + From 5aa1b03517155c49b3655da394588cdb7723546b Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 06:57:38 +0100 Subject: [PATCH 010/140] {"types":"C","runs":8} From 78b91d9d6297e777cfbc52b11f466bf2c577567a Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 07:09:19 +0100 Subject: [PATCH 011/140] {"types":"C","runs":11} --- Breakout.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Breakout.java b/Breakout.java index 77e3a65..416fafa 100755 --- a/Breakout.java +++ b/Breakout.java @@ -107,7 +107,7 @@ private void getBrick(double x, double y, Color color) { } - public void main() { + public void run1() { double x = (getWidth()-PADDLE_WIDTH)/2; double y = (getHeight()-PADDLE_HEIGHT *10); From 66ccfd979153158fcbeaaff473a406f7eede5b75 Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 07:09:33 +0100 Subject: [PATCH 012/140] {"types":"C","runs":11} --- Breakout.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Breakout.java b/Breakout.java index 416fafa..c557e96 100755 --- a/Breakout.java +++ b/Breakout.java @@ -107,7 +107,7 @@ private void getBrick(double x, double y, Color color) { } - public void run1() { + public void init() { double x = (getWidth()-PADDLE_WIDTH)/2; double y = (getHeight()-PADDLE_HEIGHT *10); From b9b8498ad398a19723d693a077eed1d012a8af35 Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 07:10:15 +0100 Subject: [PATCH 013/140] {"types":"C","runs":14} --- Breakout.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Breakout.java b/Breakout.java index c557e96..1c7764a 100755 --- a/Breakout.java +++ b/Breakout.java @@ -59,9 +59,7 @@ public class Breakout extends GraphicsProgram { /* Method: run() */ - private GObject gobj; - private GPoint last; - private RandomGenerator rgen = RandomGenerator.getInstance(); + /** Runs the Breakout program. */ public void run() { @@ -132,6 +130,9 @@ public void mouseDragged (MouseEvent e) { } } + private GObject gobj; + private GPoint last; + private RandomGenerator rgen = RandomGenerator.getInstance(); } From 2e788e6c967375eead7ae6ba83af8dc94ead0b92 Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 07:11:30 +0100 Subject: [PATCH 014/140] {"types":"C","runs":15} --- Breakout.java | 1 + 1 file changed, 1 insertion(+) diff --git a/Breakout.java b/Breakout.java index 1c7764a..61e33d3 100755 --- a/Breakout.java +++ b/Breakout.java @@ -110,6 +110,7 @@ public void init() { double x = (getWidth()-PADDLE_WIDTH)/2; double y = (getHeight()-PADDLE_HEIGHT *10); GRect mousePaddle = new GRect(x, y, PADDLE_WIDTH, PADDLE_HEIGHT); + mousePaddle.setFillColor(Color.GRAY); mousePaddle.setFilled(true); add(mousePaddle); addMouseListeners(); From 8699e29202dca6421666e1e4797f8fc5621f41b8 Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 07:14:17 +0100 Subject: [PATCH 015/140] {"types":"C","runs":16} --- Breakout.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Breakout.java b/Breakout.java index 61e33d3..7b69e23 100755 --- a/Breakout.java +++ b/Breakout.java @@ -133,7 +133,7 @@ public void mouseDragged (MouseEvent e) { } private GObject gobj; private GPoint last; - private RandomGenerator rgen = RandomGenerator.getInstance(); + } From 6b69927f4ba3154ad33e765a51082a8c5fcfa413 Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 07:23:10 +0100 Subject: [PATCH 016/140] {"types":"C","runs":17} --- Breakout.java | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/Breakout.java b/Breakout.java index 7b69e23..8a406dc 100755 --- a/Breakout.java +++ b/Breakout.java @@ -23,15 +23,10 @@ public class Breakout extends GraphicsProgram { /** Dimensions of game board (usually the same) */ private static final int WIDTH = APPLICATION_WIDTH; - private static final int HEIGHT = APPLICATION_HEIGHT; - -/** Dimensions of the paddle */ + /** Dimensions of the paddle */ private static final int PADDLE_WIDTH = 60; private static final int PADDLE_HEIGHT = 10; -/** Offset of the paddle up from the bottom */ - private static final int PADDLE_Y_OFFSET = 30; - /** Number of bricks per row */ private static final int NBRICKS_PER_ROW = 10; @@ -48,14 +43,10 @@ public class Breakout extends GraphicsProgram { /** Height of a brick */ private static final int BRICK_HEIGHT = 8; -/** Radius of the ball in pixels */ - private static final int BALL_RADIUS = 10; - /** Offset of the top brick row from the top */ private static final int BRICK_Y_OFFSET = 70; -/** Number of turns */ - private static final int NTURNS = 3; + /* Method: run() */ @@ -133,7 +124,7 @@ public void mouseDragged (MouseEvent e) { } private GObject gobj; private GPoint last; - + private RandomGenerator rgen = RandomGenerator.getInstance(); } From fecb4b12eee6112c07ca1b57fd17a02b2508633d Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 07:39:14 +0100 Subject: [PATCH 017/140] {"types":"C","runs":19} --- Breakout.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Breakout.java b/Breakout.java index 8a406dc..17f015f 100755 --- a/Breakout.java +++ b/Breakout.java @@ -97,14 +97,14 @@ private void getBrick(double x, double y, Color color) { } public void init() { - + addMouseListeners(); double x = (getWidth()-PADDLE_WIDTH)/2; double y = (getHeight()-PADDLE_HEIGHT *10); GRect mousePaddle = new GRect(x, y, PADDLE_WIDTH, PADDLE_HEIGHT); mousePaddle.setFillColor(Color.GRAY); mousePaddle.setFilled(true); add(mousePaddle); - addMouseListeners(); + } From f17d7be39e7e38330b043125165e78c646594760 Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 07:41:45 +0100 Subject: [PATCH 018/140] {"types":"C","runs":21} --- Breakout.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Breakout.java b/Breakout.java index 17f015f..89fdf74 100755 --- a/Breakout.java +++ b/Breakout.java @@ -100,7 +100,7 @@ public void init() { addMouseListeners(); double x = (getWidth()-PADDLE_WIDTH)/2; double y = (getHeight()-PADDLE_HEIGHT *10); - GRect mousePaddle = new GRect(x, y, PADDLE_WIDTH, PADDLE_HEIGHT); + GRect mousePaddle = new GRect(x, y,(getWidth() - PADDLE_WIDTH), (getHeight() - PADDLE_HEIGHT)); mousePaddle.setFillColor(Color.GRAY); mousePaddle.setFilled(true); add(mousePaddle); From b18efa226dae3d409767d6048e5b34db0d70c6e9 Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 07:42:47 +0100 Subject: [PATCH 019/140] {"types":"C","runs":23} --- Breakout.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Breakout.java b/Breakout.java index 89fdf74..17f015f 100755 --- a/Breakout.java +++ b/Breakout.java @@ -100,7 +100,7 @@ public void init() { addMouseListeners(); double x = (getWidth()-PADDLE_WIDTH)/2; double y = (getHeight()-PADDLE_HEIGHT *10); - GRect mousePaddle = new GRect(x, y,(getWidth() - PADDLE_WIDTH), (getHeight() - PADDLE_HEIGHT)); + GRect mousePaddle = new GRect(x, y, PADDLE_WIDTH, PADDLE_HEIGHT); mousePaddle.setFillColor(Color.GRAY); mousePaddle.setFilled(true); add(mousePaddle); From 96369b97a36c2fc7532b0c6b0cbfb696e8fe81f6 Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 07:52:38 +0100 Subject: [PATCH 020/140] {"types":"C","runs":27} --- Breakout.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Breakout.java b/Breakout.java index 17f015f..8868354 100755 --- a/Breakout.java +++ b/Breakout.java @@ -115,7 +115,7 @@ public void mousePressed (MouseEvent e) { public void mouseDragged (MouseEvent e) { if (e.getX() <= (getWidth() - PADDLE_WIDTH)){ - if (gobj != null) { + if (gobj == null) { gobj.move(e.getX() - last.getX(), 0); last = new GPoint(e.getPoint()); } From 1ea052eec2a6eac69c42d66d8762dfd4e07f0af4 Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 07:52:57 +0100 Subject: [PATCH 021/140] {"types":"C","runs":27} --- Breakout.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Breakout.java b/Breakout.java index 8868354..17f015f 100755 --- a/Breakout.java +++ b/Breakout.java @@ -115,7 +115,7 @@ public void mousePressed (MouseEvent e) { public void mouseDragged (MouseEvent e) { if (e.getX() <= (getWidth() - PADDLE_WIDTH)){ - if (gobj == null) { + if (gobj != null) { gobj.move(e.getX() - last.getX(), 0); last = new GPoint(e.getPoint()); } From 61eca74b2a03fbd5adef79f2045edf3f22bcaecb Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 07:55:31 +0100 Subject: [PATCH 022/140] {"types":"C","runs":28} --- Breakout.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Breakout.java b/Breakout.java index 17f015f..ec3a577 100755 --- a/Breakout.java +++ b/Breakout.java @@ -98,8 +98,8 @@ private void getBrick(double x, double y, Color color) { public void init() { addMouseListeners(); - double x = (getWidth()-PADDLE_WIDTH)/2; - double y = (getHeight()-PADDLE_HEIGHT *10); + double x = ((getWidth() /2)-PADDLE_WIDTH); + double y = ((getHeight() /2)-PADDLE_HEIGHT *10); GRect mousePaddle = new GRect(x, y, PADDLE_WIDTH, PADDLE_HEIGHT); mousePaddle.setFillColor(Color.GRAY); mousePaddle.setFilled(true); From be681d8c77c91bb5e7e44336b0405b7a217a696f Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 07:55:57 +0100 Subject: [PATCH 023/140] {"types":"C","runs":29} --- Breakout.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Breakout.java b/Breakout.java index ec3a577..8d285c9 100755 --- a/Breakout.java +++ b/Breakout.java @@ -99,7 +99,7 @@ private void getBrick(double x, double y, Color color) { public void init() { addMouseListeners(); double x = ((getWidth() /2)-PADDLE_WIDTH); - double y = ((getHeight() /2)-PADDLE_HEIGHT *10); + double y = ((getHeight() /2)-PADDLE_HEIGHT *5); GRect mousePaddle = new GRect(x, y, PADDLE_WIDTH, PADDLE_HEIGHT); mousePaddle.setFillColor(Color.GRAY); mousePaddle.setFilled(true); From ecfd4283eca2725a976576344e8d7ebb1116d799 Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 07:56:18 +0100 Subject: [PATCH 024/140] {"types":"C","runs":31} --- Breakout.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Breakout.java b/Breakout.java index 8d285c9..da2602f 100755 --- a/Breakout.java +++ b/Breakout.java @@ -99,7 +99,7 @@ private void getBrick(double x, double y, Color color) { public void init() { addMouseListeners(); double x = ((getWidth() /2)-PADDLE_WIDTH); - double y = ((getHeight() /2)-PADDLE_HEIGHT *5); + double y = ((getHeight() /2)-PADDLE_HEIGHT *15); GRect mousePaddle = new GRect(x, y, PADDLE_WIDTH, PADDLE_HEIGHT); mousePaddle.setFillColor(Color.GRAY); mousePaddle.setFilled(true); From 0afd58697c8adbc6efb94275b0f6e8a0a0de04db Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 07:56:36 +0100 Subject: [PATCH 025/140] {"types":"C","runs":32} --- Breakout.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Breakout.java b/Breakout.java index da2602f..0f0755e 100755 --- a/Breakout.java +++ b/Breakout.java @@ -99,7 +99,7 @@ private void getBrick(double x, double y, Color color) { public void init() { addMouseListeners(); double x = ((getWidth() /2)-PADDLE_WIDTH); - double y = ((getHeight() /2)-PADDLE_HEIGHT *15); + double y = ((getHeight() /2)-PADDLE_HEIGHT); GRect mousePaddle = new GRect(x, y, PADDLE_WIDTH, PADDLE_HEIGHT); mousePaddle.setFillColor(Color.GRAY); mousePaddle.setFilled(true); From dc32110d0e7d28247e3ce5650e48d888388fba73 Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 07:57:16 +0100 Subject: [PATCH 026/140] {"types":"C","runs":34} --- Breakout.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Breakout.java b/Breakout.java index 0f0755e..656d94d 100755 --- a/Breakout.java +++ b/Breakout.java @@ -99,7 +99,7 @@ private void getBrick(double x, double y, Color color) { public void init() { addMouseListeners(); double x = ((getWidth() /2)-PADDLE_WIDTH); - double y = ((getHeight() /2)-PADDLE_HEIGHT); + double y = ((getHeight() /2)-PADDLE_HEIGHT * 0.1); GRect mousePaddle = new GRect(x, y, PADDLE_WIDTH, PADDLE_HEIGHT); mousePaddle.setFillColor(Color.GRAY); mousePaddle.setFilled(true); From 3f249022e6a938bc9afe62507c32c3b6e6d5c022 Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 07:57:52 +0100 Subject: [PATCH 027/140] {"types":"C","runs":36} --- Breakout.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Breakout.java b/Breakout.java index 656d94d..6ec53f5 100755 --- a/Breakout.java +++ b/Breakout.java @@ -99,7 +99,7 @@ private void getBrick(double x, double y, Color color) { public void init() { addMouseListeners(); double x = ((getWidth() /2)-PADDLE_WIDTH); - double y = ((getHeight() /2)-PADDLE_HEIGHT * 0.1); + double y = ((getHeight() /2)-PADDLE_HEIGHT * (-5)); GRect mousePaddle = new GRect(x, y, PADDLE_WIDTH, PADDLE_HEIGHT); mousePaddle.setFillColor(Color.GRAY); mousePaddle.setFilled(true); From c840706d3d92950b40fa07c6c02c2a9c1471eeb7 Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 07:58:03 +0100 Subject: [PATCH 028/140] {"types":"C","runs":37} --- Breakout.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Breakout.java b/Breakout.java index 6ec53f5..24bcd09 100755 --- a/Breakout.java +++ b/Breakout.java @@ -99,7 +99,7 @@ private void getBrick(double x, double y, Color color) { public void init() { addMouseListeners(); double x = ((getWidth() /2)-PADDLE_WIDTH); - double y = ((getHeight() /2)-PADDLE_HEIGHT * (-5)); + double y = ((getHeight() /2)-PADDLE_HEIGHT * (-15)); GRect mousePaddle = new GRect(x, y, PADDLE_WIDTH, PADDLE_HEIGHT); mousePaddle.setFillColor(Color.GRAY); mousePaddle.setFilled(true); From 6d70192a50a722093e53e115a01b267b913c8e88 Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 07:58:20 +0100 Subject: [PATCH 029/140] {"types":"C","runs":39} --- Breakout.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Breakout.java b/Breakout.java index 24bcd09..8fccd4f 100755 --- a/Breakout.java +++ b/Breakout.java @@ -99,7 +99,7 @@ private void getBrick(double x, double y, Color color) { public void init() { addMouseListeners(); double x = ((getWidth() /2)-PADDLE_WIDTH); - double y = ((getHeight() /2)-PADDLE_HEIGHT * (-15)); + double y = ((getHeight() /2)-PADDLE_HEIGHT * (-20)); GRect mousePaddle = new GRect(x, y, PADDLE_WIDTH, PADDLE_HEIGHT); mousePaddle.setFillColor(Color.GRAY); mousePaddle.setFilled(true); From 7801be0fd664a094da11156881d408fc72fd9d0b Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 07:58:31 +0100 Subject: [PATCH 030/140] {"types":"C","runs":40} --- Breakout.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Breakout.java b/Breakout.java index 8fccd4f..c15f95b 100755 --- a/Breakout.java +++ b/Breakout.java @@ -99,7 +99,7 @@ private void getBrick(double x, double y, Color color) { public void init() { addMouseListeners(); double x = ((getWidth() /2)-PADDLE_WIDTH); - double y = ((getHeight() /2)-PADDLE_HEIGHT * (-20)); + double y = ((getHeight() /2)-PADDLE_HEIGHT * (-23)); GRect mousePaddle = new GRect(x, y, PADDLE_WIDTH, PADDLE_HEIGHT); mousePaddle.setFillColor(Color.GRAY); mousePaddle.setFilled(true); From fc7bf1fa6417e2e8dd08eaf48220387afd505d9e Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 08:09:55 +0100 Subject: [PATCH 031/140] {"types":"C","runs":40} --- Breakout.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/Breakout.java b/Breakout.java index c15f95b..3c5155f 100755 --- a/Breakout.java +++ b/Breakout.java @@ -97,6 +97,7 @@ private void getBrick(double x, double y, Color color) { } public void init() { + addMouseListeners(); double x = ((getWidth() /2)-PADDLE_WIDTH); double y = ((getHeight() /2)-PADDLE_HEIGHT * (-23)); @@ -104,6 +105,7 @@ public void init() { mousePaddle.setFillColor(Color.GRAY); mousePaddle.setFilled(true); add(mousePaddle); + MouseMotionListener(null); } @@ -111,6 +113,7 @@ public void init() { public void mousePressed (MouseEvent e) { last = new GPoint(e.getPoint()); gobj = getElementAt(last); + } public void mouseDragged (MouseEvent e) { @@ -118,9 +121,20 @@ public void mouseDragged (MouseEvent e) { if (gobj != null) { gobj.move(e.getX() - last.getX(), 0); last = new GPoint(e.getPoint()); + } } + } + + public void MouseMotionListener(MouseEvent e){ + if (gobj != null) { + gobj.move(e.getX() - last.getX(), 0); + last = new GPoint(e.getPoint()); + + + } + } private GObject gobj; private GPoint last; From d793d3a6b1c1b0b57dd2ff998c08144ef519479e Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 08:12:02 +0100 Subject: [PATCH 032/140] {"types":"C","runs":42} --- Breakout.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Breakout.java b/Breakout.java index 3c5155f..14264c4 100755 --- a/Breakout.java +++ b/Breakout.java @@ -98,14 +98,14 @@ private void getBrick(double x, double y, Color color) { public void init() { - addMouseListeners(); + addMouseListeners(null); double x = ((getWidth() /2)-PADDLE_WIDTH); double y = ((getHeight() /2)-PADDLE_HEIGHT * (-23)); GRect mousePaddle = new GRect(x, y, PADDLE_WIDTH, PADDLE_HEIGHT); mousePaddle.setFillColor(Color.GRAY); mousePaddle.setFilled(true); add(mousePaddle); - MouseMotionListener(null); + } From 384528360330ca7231e7633640b9a3324e92e8ef Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 08:12:56 +0100 Subject: [PATCH 033/140] {"types":"C","runs":43} --- Breakout.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Breakout.java b/Breakout.java index 14264c4..c6327fa 100755 --- a/Breakout.java +++ b/Breakout.java @@ -98,7 +98,7 @@ private void getBrick(double x, double y, Color color) { public void init() { - addMouseListeners(null); + addMouseListeners(); double x = ((getWidth() /2)-PADDLE_WIDTH); double y = ((getHeight() /2)-PADDLE_HEIGHT * (-23)); GRect mousePaddle = new GRect(x, y, PADDLE_WIDTH, PADDLE_HEIGHT); From e43f213b1eeff644e6c15ef003489e926d972419 Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 08:14:11 +0100 Subject: [PATCH 034/140] {"types":"C","runs":45} --- Breakout.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Breakout.java b/Breakout.java index c6327fa..0327cff 100755 --- a/Breakout.java +++ b/Breakout.java @@ -105,7 +105,7 @@ public void init() { mousePaddle.setFillColor(Color.GRAY); mousePaddle.setFilled(true); add(mousePaddle); - + MouseMotionListener(null); } @@ -127,8 +127,8 @@ public void mouseDragged (MouseEvent e) { } - public void MouseMotionListener(MouseEvent e){ - if (gobj != null) { + private void MouseMotionListener (MouseEvent e){ + if (gobj == null) { gobj.move(e.getX() - last.getX(), 0); last = new GPoint(e.getPoint()); From f8d3f24fc495857ca01894a7073af2708230051d Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 08:18:38 +0100 Subject: [PATCH 035/140] {"types":"C","runs":46} --- Breakout.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Breakout.java b/Breakout.java index 0327cff..55e0153 100755 --- a/Breakout.java +++ b/Breakout.java @@ -108,6 +108,7 @@ public void init() { MouseMotionListener(null); + } public void mousePressed (MouseEvent e) { @@ -127,7 +128,7 @@ public void mouseDragged (MouseEvent e) { } - private void MouseMotionListener (MouseEvent e){ + public void MouseMotionListener (MouseEvent e){ if (gobj == null) { gobj.move(e.getX() - last.getX(), 0); last = new GPoint(e.getPoint()); From 4b871ef61ae490326b5ebdae5454361e5e3c2728 Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 08:34:31 +0100 Subject: [PATCH 036/140] {"types":"C","runs":48} --- Breakout.java | 1 - 1 file changed, 1 deletion(-) diff --git a/Breakout.java b/Breakout.java index 55e0153..4a1ba3e 100755 --- a/Breakout.java +++ b/Breakout.java @@ -105,7 +105,6 @@ public void init() { mousePaddle.setFillColor(Color.GRAY); mousePaddle.setFilled(true); add(mousePaddle); - MouseMotionListener(null); From f8a5c973275ebafb62eeef001cfec71751e8e29e Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 08:34:48 +0100 Subject: [PATCH 037/140] {"types":"C","runs":49} --- Breakout.java | 1 + 1 file changed, 1 insertion(+) diff --git a/Breakout.java b/Breakout.java index 4a1ba3e..55e0153 100755 --- a/Breakout.java +++ b/Breakout.java @@ -105,6 +105,7 @@ public void init() { mousePaddle.setFillColor(Color.GRAY); mousePaddle.setFilled(true); add(mousePaddle); + MouseMotionListener(null); From a5e14b24d460b66dcb9664dcda7c1db0674a224d Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 11:14:50 +0100 Subject: [PATCH 038/140] {"types":"C","runs":49} --- Breakout.java | 102 ++++++++++++++------------------------------------ 1 file changed, 29 insertions(+), 73 deletions(-) diff --git a/Breakout.java b/Breakout.java index 55e0153..7b9fdfd 100755 --- a/Breakout.java +++ b/Breakout.java @@ -54,92 +54,48 @@ public class Breakout extends GraphicsProgram { /** Runs the Breakout program. */ public void run() { -double x = 0.5; + // + double x = 0; double y = (BRICK_Y_OFFSET); - for (int row = 0; row Date: Thu, 8 Jun 2017 11:18:43 +0100 Subject: [PATCH 039/140] {"types":"C","runs":51} --- Breakout.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Breakout.java b/Breakout.java index 7b9fdfd..3d177ee 100755 --- a/Breakout.java +++ b/Breakout.java @@ -56,7 +56,7 @@ public class Breakout extends GraphicsProgram { public void run() { // - double x = 0; + double x = 0.5; double y = (BRICK_Y_OFFSET); @@ -82,8 +82,8 @@ private void getRow(double x, double y, int bricks) { // private void getBrick(double d, double y) { - GRect rect = new GRect(getX(), y, BRICK_WIDTH, BRICK_HEIGHT); - rect.setFilled (true);; + GRect rect = new GRect(WIDTH, y, BRICK_WIDTH, BRICK_HEIGHT); + rect.setFilled (false);; add (rect); // TODO Auto-generated method stub From acef4f6dbd8953860c1ca8a38fab871b4e22905e Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 11:20:14 +0100 Subject: [PATCH 040/140] {"types":"C","runs":52} --- Breakout.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Breakout.java b/Breakout.java index 3d177ee..50784b4 100755 --- a/Breakout.java +++ b/Breakout.java @@ -73,7 +73,7 @@ public void run() { private void getRow(double x, double y, int bricks) { for (int i = 0; i < bricks; i++) { getBrick((x + i * BRICK_WIDTH), y); - x += BRICK_SEP; + x += NBRICKS_PER_ROW + BRICK_SEP; } } From 3646d98d0b3b6eaabe7f041d09079094849af539 Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 11:21:16 +0100 Subject: [PATCH 041/140] {"types":"C","runs":54} --- Breakout.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Breakout.java b/Breakout.java index 50784b4..1268ba6 100755 --- a/Breakout.java +++ b/Breakout.java @@ -73,7 +73,7 @@ public void run() { private void getRow(double x, double y, int bricks) { for (int i = 0; i < bricks; i++) { getBrick((x + i * BRICK_WIDTH), y); - x += NBRICKS_PER_ROW + BRICK_SEP; + x += BRICK_SEP; } } @@ -82,7 +82,7 @@ private void getRow(double x, double y, int bricks) { // private void getBrick(double d, double y) { - GRect rect = new GRect(WIDTH, y, BRICK_WIDTH, BRICK_HEIGHT); + GRect rect = new GRect(WIDTH, BRICK_Y_OFFSET, BRICK_WIDTH, BRICK_HEIGHT); rect.setFilled (false);; add (rect); // TODO Auto-generated method stub From 03e29c45da044d702ce22c4a0e1d0a14226bb09f Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 11:22:27 +0100 Subject: [PATCH 042/140] {"types":"C","runs":55} --- Breakout.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Breakout.java b/Breakout.java index 1268ba6..268b11e 100755 --- a/Breakout.java +++ b/Breakout.java @@ -82,7 +82,7 @@ private void getRow(double x, double y, int bricks) { // private void getBrick(double d, double y) { - GRect rect = new GRect(WIDTH, BRICK_Y_OFFSET, BRICK_WIDTH, BRICK_HEIGHT); + GRect rect = new GRect(NBRICK_ROWS, y, BRICK_WIDTH, BRICK_HEIGHT); rect.setFilled (false);; add (rect); // TODO Auto-generated method stub From b3a8b138045cec8a308414dca9ec79446720e42b Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 11:24:04 +0100 Subject: [PATCH 043/140] {"types":"C","runs":56} --- Breakout.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Breakout.java b/Breakout.java index 268b11e..f9dbbaa 100755 --- a/Breakout.java +++ b/Breakout.java @@ -71,7 +71,7 @@ public void run() { private void getRow(double x, double y, int bricks) { - for (int i = 0; i < bricks; i++) { + for (int i = 0; i < NBRICK_ROWS; i++) { getBrick((x + i * BRICK_WIDTH), y); x += BRICK_SEP; From 06bc6e394884ad5b4a88b718ec523f4467cadb0e Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 11:24:51 +0100 Subject: [PATCH 044/140] {"types":"C","runs":56} --- Breakout.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Breakout.java b/Breakout.java index f9dbbaa..c70245c 100755 --- a/Breakout.java +++ b/Breakout.java @@ -61,7 +61,7 @@ public void run() { for (int row = 0; row < NBRICK_ROWS; row++ ){ - getRow(x, y, (NBRICK_ROWS)); + getRow(x, y, (NBRICKS_PER_ROW)); y += NBRICKS_PER_ROW + BRICK_SEP; } From 6d79935f7644a7160d376952d2aaa16347abce3e Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 12:32:01 +0100 Subject: [PATCH 045/140] {"types":"C","runs":58} --- Breakout.java | 60 ++++++++++++++++++++------------------------------- 1 file changed, 23 insertions(+), 37 deletions(-) diff --git a/Breakout.java b/Breakout.java index c70245c..debe049 100755 --- a/Breakout.java +++ b/Breakout.java @@ -55,46 +55,32 @@ public class Breakout extends GraphicsProgram { /** Runs the Breakout program. */ public void run() { // + //to setup x and y cordinates + int x = BRICK_SEP / 2; + int y = BRICK_Y_OFFSET; - double x = 0.5; - double y = (BRICK_Y_OFFSET); - - - for (int row = 0; row < NBRICK_ROWS; row++ ){ - getRow(x, y, (NBRICKS_PER_ROW)); - y += NBRICKS_PER_ROW + BRICK_SEP; - - } - } - - - - - private void getRow(double x, double y, int bricks) { - for (int i = 0; i < NBRICK_ROWS; i++) { - getBrick((x + i * BRICK_WIDTH), y); - x += BRICK_SEP; - + //to set up bricks and the placement + //creating a loop for row and nested the loop to create column + for (int row = 0; row < NBRICK_ROWS; row++) { + //create another loop for column + for (int column = 0; column < NBRICKS_PER_ROW; column++) { + //add bricks + GRect bricks = new GRect (BRICK_WIDTH, BRICK_HEIGHT); + bricks.setFilled(true); + add (bricks, x, y); + //state the width of brick and distance between individual brick to the other along the x-axis + x += BRICK_WIDTH + BRICK_SEP; } - } - - - - // - private void getBrick(double d, double y) { - GRect rect = new GRect(NBRICK_ROWS, y, BRICK_WIDTH, BRICK_HEIGHT); - rect.setFilled (false);; - add (rect); - // TODO Auto-generated method stub - + /*state the height of brick and distance + *between individual brick to the other along the x-axis + *and also returning to the first loop + */ + y += BRICK_HEIGHT + BRICK_SEP; + x = BRICK_SEP / 2; + } + + } - - - - - - - } From ea96467c9095dba79f314a781a1cb993f8e2f5ac Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 12:35:01 +0100 Subject: [PATCH 046/140] {"types":"C","runs":61} --- Breakout.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Breakout.java b/Breakout.java index debe049..771a428 100755 --- a/Breakout.java +++ b/Breakout.java @@ -60,7 +60,7 @@ public void run() { int y = BRICK_Y_OFFSET; //to set up bricks and the placement - //creating a loop for row and nested the loop to create column + //creating a loop for row and nesting the loop to create column for (int row = 0; row < NBRICK_ROWS; row++) { //create another loop for column for (int column = 0; column < NBRICKS_PER_ROW; column++) { @@ -69,7 +69,7 @@ public void run() { bricks.setFilled(true); add (bricks, x, y); //state the width of brick and distance between individual brick to the other along the x-axis - x += BRICK_WIDTH + BRICK_SEP; + } /*state the height of brick and distance *between individual brick to the other along the x-axis From 5218ac8249e65d8818b2f4e48b690e1b2c991be9 Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 12:35:20 +0100 Subject: [PATCH 047/140] {"types":"C","runs":62} --- Breakout.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Breakout.java b/Breakout.java index 771a428..32736f3 100755 --- a/Breakout.java +++ b/Breakout.java @@ -69,13 +69,13 @@ public void run() { bricks.setFilled(true); add (bricks, x, y); //state the width of brick and distance between individual brick to the other along the x-axis - + x += BRICK_WIDTH + BRICK_SEP; } /*state the height of brick and distance *between individual brick to the other along the x-axis *and also returning to the first loop */ - y += BRICK_HEIGHT + BRICK_SEP; + x = BRICK_SEP / 2; } From 6d55dd8bada43b950a08cc0c29397c60a5a12b9a Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 12:35:52 +0100 Subject: [PATCH 048/140] {"types":"C","runs":63} --- Breakout.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Breakout.java b/Breakout.java index 32736f3..6f57ed5 100755 --- a/Breakout.java +++ b/Breakout.java @@ -75,7 +75,7 @@ public void run() { *between individual brick to the other along the x-axis *and also returning to the first loop */ - + y += BRICK_HEIGHT + BRICK_SEP; x = BRICK_SEP / 2; } From 8783788098cc99e438243d853605cc6b50d19b5d Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 12:37:00 +0100 Subject: [PATCH 049/140] {"types":"C","runs":64} --- Breakout.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Breakout.java b/Breakout.java index 6f57ed5..05b9729 100755 --- a/Breakout.java +++ b/Breakout.java @@ -75,7 +75,7 @@ public void run() { *between individual brick to the other along the x-axis *and also returning to the first loop */ - y += BRICK_HEIGHT + BRICK_SEP; + y -= BRICK_HEIGHT + BRICK_SEP; x = BRICK_SEP / 2; } From 4bd19aeb209dd72b8c9d2c1d02c4439221c718eb Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 12:38:10 +0100 Subject: [PATCH 050/140] {"types":"C","runs":64} --- Breakout.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Breakout.java b/Breakout.java index 05b9729..43dea3b 100755 --- a/Breakout.java +++ b/Breakout.java @@ -69,13 +69,13 @@ public void run() { bricks.setFilled(true); add (bricks, x, y); //state the width of brick and distance between individual brick to the other along the x-axis - x += BRICK_WIDTH + BRICK_SEP; + x -= BRICK_WIDTH + BRICK_SEP; } /*state the height of brick and distance *between individual brick to the other along the x-axis *and also returning to the first loop */ - y -= BRICK_HEIGHT + BRICK_SEP; + y += BRICK_HEIGHT + BRICK_SEP; x = BRICK_SEP / 2; } From ece31ef469e631182e9a01a839b645bb2fdc449e Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 12:38:37 +0100 Subject: [PATCH 051/140] {"types":"C","runs":66} --- Breakout.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Breakout.java b/Breakout.java index 43dea3b..bd4ccfa 100755 --- a/Breakout.java +++ b/Breakout.java @@ -69,7 +69,7 @@ public void run() { bricks.setFilled(true); add (bricks, x, y); //state the width of brick and distance between individual brick to the other along the x-axis - x -= BRICK_WIDTH + BRICK_SEP; + x = BRICK_WIDTH + BRICK_SEP * 15; } /*state the height of brick and distance *between individual brick to the other along the x-axis From 9eb7f03102c650fa532f81166ae8c98f224488af Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 12:38:58 +0100 Subject: [PATCH 052/140] {"types":"C","runs":68} --- Breakout.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Breakout.java b/Breakout.java index bd4ccfa..2930486 100755 --- a/Breakout.java +++ b/Breakout.java @@ -69,7 +69,7 @@ public void run() { bricks.setFilled(true); add (bricks, x, y); //state the width of brick and distance between individual brick to the other along the x-axis - x = BRICK_WIDTH + BRICK_SEP * 15; + x = (BRICK_WIDTH + BRICK_SEP )* 15; } /*state the height of brick and distance *between individual brick to the other along the x-axis From 5f0827ec1b6cae97762883af0fc8427b450e3dc7 Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 12:42:45 +0100 Subject: [PATCH 053/140] {"types":"C","runs":68} --- Breakout.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Breakout.java b/Breakout.java index 2930486..4fbee0f 100755 --- a/Breakout.java +++ b/Breakout.java @@ -56,8 +56,8 @@ public class Breakout extends GraphicsProgram { public void run() { // //to setup x and y cordinates - int x = BRICK_SEP / 2; - int y = BRICK_Y_OFFSET; + int x = (getWidth() - APPLICATION_WIDTH) - BRICK_SEP / 2; + int y = (getHeight() - APPLICATION_HEIGHT) - BRICK_Y_OFFSET; //to set up bricks and the placement //creating a loop for row and nesting the loop to create column @@ -69,7 +69,7 @@ public void run() { bricks.setFilled(true); add (bricks, x, y); //state the width of brick and distance between individual brick to the other along the x-axis - x = (BRICK_WIDTH + BRICK_SEP )* 15; + x += BRICK_WIDTH + BRICK_SEP; } /*state the height of brick and distance *between individual brick to the other along the x-axis From 0c3240212aa1a5ff1a704931403a2f332b6a1aee Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 13:51:34 +0100 Subject: [PATCH 054/140] {"types":"C","runs":69} --- Breakout.java | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/Breakout.java b/Breakout.java index 4fbee0f..226059a 100755 --- a/Breakout.java +++ b/Breakout.java @@ -56,8 +56,8 @@ public class Breakout extends GraphicsProgram { public void run() { // //to setup x and y cordinates - int x = (getWidth() - APPLICATION_WIDTH) - BRICK_SEP / 2; - int y = (getHeight() - APPLICATION_HEIGHT) - BRICK_Y_OFFSET; + int x = 2; + int y = BRICK_Y_OFFSET; //to set up bricks and the placement //creating a loop for row and nesting the loop to create column @@ -68,6 +68,20 @@ public void run() { GRect bricks = new GRect (BRICK_WIDTH, BRICK_HEIGHT); bricks.setFilled(true); add (bricks, x, y); + + //set brickc colors + if (row <= 2){ + bricks.setColor(Color.RED); + } else if (row <= 4) { + bricks.setColor(Color.ORANGE); + } else if (row <= 6) { + bricks.setColor(Color.YELLOW); + } else if (row <= 8) { + bricks.setColor(Color.GREEN); + } else if (row <= 10) { + bricks.setColor(Color.CYAN); + } + //state the width of brick and distance between individual brick to the other along the x-axis x += BRICK_WIDTH + BRICK_SEP; } @@ -84,10 +98,4 @@ public void run() { } - - - - - - - + \ No newline at end of file From 8df773b6b92d90f9ad6e0ed981b44cad613362cf Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 13:52:04 +0100 Subject: [PATCH 055/140] {"types":"C","runs":72} --- Breakout.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Breakout.java b/Breakout.java index 226059a..9909270 100755 --- a/Breakout.java +++ b/Breakout.java @@ -70,7 +70,7 @@ public void run() { add (bricks, x, y); //set brickc colors - if (row <= 2){ + if (row < 2){ bricks.setColor(Color.RED); } else if (row <= 4) { bricks.setColor(Color.ORANGE); From 0fea0dc9685579da3e8a874b07a421192b72057c Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 13:52:29 +0100 Subject: [PATCH 056/140] {"types":"C","runs":73} --- Breakout.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Breakout.java b/Breakout.java index 9909270..207dae6 100755 --- a/Breakout.java +++ b/Breakout.java @@ -72,13 +72,13 @@ public void run() { //set brickc colors if (row < 2){ bricks.setColor(Color.RED); - } else if (row <= 4) { + } else if (row < 4) { bricks.setColor(Color.ORANGE); - } else if (row <= 6) { + } else if (row < 6) { bricks.setColor(Color.YELLOW); - } else if (row <= 8) { + } else if (row < 8) { bricks.setColor(Color.GREEN); - } else if (row <= 10) { + } else if (row < 10) { bricks.setColor(Color.CYAN); } From 6b64f9e48f7e1cac818afa91b8328e531fa07801 Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 13:53:22 +0100 Subject: [PATCH 057/140] {"types":"C","runs":74} --- Breakout.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Breakout.java b/Breakout.java index 207dae6..6efb38f 100755 --- a/Breakout.java +++ b/Breakout.java @@ -67,8 +67,6 @@ public void run() { //add bricks GRect bricks = new GRect (BRICK_WIDTH, BRICK_HEIGHT); bricks.setFilled(true); - add (bricks, x, y); - //set brickc colors if (row < 2){ bricks.setColor(Color.RED); @@ -81,6 +79,7 @@ public void run() { } else if (row < 10) { bricks.setColor(Color.CYAN); } + add (bricks, x, y); //state the width of brick and distance between individual brick to the other along the x-axis x += BRICK_WIDTH + BRICK_SEP; From d7dbc09bdb0f058bc2a73266d504565b9ba1ba26 Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 14:05:52 +0100 Subject: [PATCH 058/140] {"types":"C","runs":75} --- Breakout.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/Breakout.java b/Breakout.java index 6efb38f..53acd9b 100755 --- a/Breakout.java +++ b/Breakout.java @@ -45,6 +45,7 @@ public class Breakout extends GraphicsProgram { /** Offset of the top brick row from the top */ private static final int BRICK_Y_OFFSET = 70; +private double PADDLE_WIDHT; @@ -92,7 +93,14 @@ public void run() { x = BRICK_SEP / 2; } - + //setup Paddle + int i = (getWidth() /2) - APPLICATION_WIDTH; + int k = (getHeight() /2) - APPLICATION_HEIGHT; + + //insert paddle + GRect paddle = new GRect (PADDLE_WIDHT, PADDLE_HEIGHT); + paddle.setFilled(true); + add (paddle, y, x); } } From 79d7ab70ef0086c776f76fcbeb1f2c84d731e90f Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 14:07:18 +0100 Subject: [PATCH 059/140] {"types":"C","runs":77} --- Breakout.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Breakout.java b/Breakout.java index 53acd9b..7c6f088 100755 --- a/Breakout.java +++ b/Breakout.java @@ -94,8 +94,8 @@ public void run() { } //setup Paddle - int i = (getWidth() /2) - APPLICATION_WIDTH; - int k = (getHeight() /2) - APPLICATION_HEIGHT; + int i = (getWidth() /2) - (APPLICATION_WIDTH * -5); + int k = (getHeight() /2) - (APPLICATION_HEIGHT * -5); //insert paddle GRect paddle = new GRect (PADDLE_WIDHT, PADDLE_HEIGHT); From 16eb77b6172198eea947437bfeed029eefdc7100 Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 14:09:22 +0100 Subject: [PATCH 060/140] {"types":"C","runs":78} --- Breakout.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Breakout.java b/Breakout.java index 7c6f088..c636d7c 100755 --- a/Breakout.java +++ b/Breakout.java @@ -94,8 +94,8 @@ public void run() { } //setup Paddle - int i = (getWidth() /2) - (APPLICATION_WIDTH * -5); - int k = (getHeight() /2) - (APPLICATION_HEIGHT * -5); + int i = (getWidth() /2) - PADDLE_WIDTH; + int k = (getHeight() /2) - PADDLE_HEIGHT; //insert paddle GRect paddle = new GRect (PADDLE_WIDHT, PADDLE_HEIGHT); From e94ae4aa0f784a5eaab6c0839098f6098a7f6163 Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 14:10:34 +0100 Subject: [PATCH 061/140] {"types":"C","runs":80} --- Breakout.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Breakout.java b/Breakout.java index c636d7c..f497629 100755 --- a/Breakout.java +++ b/Breakout.java @@ -94,8 +94,8 @@ public void run() { } //setup Paddle - int i = (getWidth() /2) - PADDLE_WIDTH; - int k = (getHeight() /2) - PADDLE_HEIGHT; + int i = ((getWidth() /2) - PADDLE_WIDTH); + int k = ((getHeight() /2) - PADDLE_HEIGHT) * -13; //insert paddle GRect paddle = new GRect (PADDLE_WIDHT, PADDLE_HEIGHT); From e365daa08c9f5f445e80f25903c655a012e073f5 Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 14:10:57 +0100 Subject: [PATCH 062/140] {"types":"C","runs":81} --- Breakout.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Breakout.java b/Breakout.java index f497629..8783567 100755 --- a/Breakout.java +++ b/Breakout.java @@ -95,7 +95,7 @@ public void run() { //setup Paddle int i = ((getWidth() /2) - PADDLE_WIDTH); - int k = ((getHeight() /2) - PADDLE_HEIGHT) * -13; + int k = ((getHeight() /2) - (PADDLE_HEIGHT) * -13); //insert paddle GRect paddle = new GRect (PADDLE_WIDHT, PADDLE_HEIGHT); From 7d64cd95effa0ff8b92d8dcd586c222cc1fcb12f Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 14:11:35 +0100 Subject: [PATCH 063/140] {"types":"C","runs":81} --- Breakout.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Breakout.java b/Breakout.java index 8783567..8c3c0e9 100755 --- a/Breakout.java +++ b/Breakout.java @@ -95,7 +95,7 @@ public void run() { //setup Paddle int i = ((getWidth() /2) - PADDLE_WIDTH); - int k = ((getHeight() /2) - (PADDLE_HEIGHT) * -13); + int k = ((getHeight() /2) - PADDLE_HEIGHT) * (-13); //insert paddle GRect paddle = new GRect (PADDLE_WIDHT, PADDLE_HEIGHT); From 89cde525720d5d7ac4687bb9c4fe5ea41cf47c92 Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 14:12:40 +0100 Subject: [PATCH 064/140] {"types":"C","runs":83} --- Breakout.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Breakout.java b/Breakout.java index 8c3c0e9..97c9eb0 100755 --- a/Breakout.java +++ b/Breakout.java @@ -98,9 +98,9 @@ public void run() { int k = ((getHeight() /2) - PADDLE_HEIGHT) * (-13); //insert paddle - GRect paddle = new GRect (PADDLE_WIDHT, PADDLE_HEIGHT); + GRect paddle = new GRect (x, y, PADDLE_WIDTH, PADDLE_HEIGHT); paddle.setFilled(true); - add (paddle, y, x); + add (paddle); } } From 0a89232c23398d72a558c88a83fc025233f0e97c Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 14:13:08 +0100 Subject: [PATCH 065/140] {"types":"C","runs":84} --- Breakout.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Breakout.java b/Breakout.java index 97c9eb0..9a24b83 100755 --- a/Breakout.java +++ b/Breakout.java @@ -95,7 +95,7 @@ public void run() { //setup Paddle int i = ((getWidth() /2) - PADDLE_WIDTH); - int k = ((getHeight() /2) - PADDLE_HEIGHT) * (-13); + int k = ((getHeight() /2) - PADDLE_HEIGHT) * (30); //insert paddle GRect paddle = new GRect (x, y, PADDLE_WIDTH, PADDLE_HEIGHT); From b2f705ea10d7e4015156b4af416f9d5ea167da5c Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 14:13:23 +0100 Subject: [PATCH 066/140] {"types":"C","runs":85} --- Breakout.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Breakout.java b/Breakout.java index 9a24b83..ca7404c 100755 --- a/Breakout.java +++ b/Breakout.java @@ -95,7 +95,7 @@ public void run() { //setup Paddle int i = ((getWidth() /2) - PADDLE_WIDTH); - int k = ((getHeight() /2) - PADDLE_HEIGHT) * (30); + int k = ((getHeight() /2) - PADDLE_HEIGHT) * (-30); //insert paddle GRect paddle = new GRect (x, y, PADDLE_WIDTH, PADDLE_HEIGHT); From a67749072b27df87446dc840816ebe27fe49aead Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 14:14:18 +0100 Subject: [PATCH 067/140] {"types":"C","runs":86} --- Breakout.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Breakout.java b/Breakout.java index ca7404c..70f9546 100755 --- a/Breakout.java +++ b/Breakout.java @@ -95,7 +95,7 @@ public void run() { //setup Paddle int i = ((getWidth() /2) - PADDLE_WIDTH); - int k = ((getHeight() /2) - PADDLE_HEIGHT) * (-30); + int k = ((getHeight() /2) - APPLICATION_HEIGHT) * (-30); //insert paddle GRect paddle = new GRect (x, y, PADDLE_WIDTH, PADDLE_HEIGHT); From 3f31df09e41ae0d06fd739d6605abf4261008e32 Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 14:14:32 +0100 Subject: [PATCH 068/140] {"types":"C","runs":87} --- Breakout.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Breakout.java b/Breakout.java index 70f9546..97f2dff 100755 --- a/Breakout.java +++ b/Breakout.java @@ -95,7 +95,7 @@ public void run() { //setup Paddle int i = ((getWidth() /2) - PADDLE_WIDTH); - int k = ((getHeight() /2) - APPLICATION_HEIGHT) * (-30); + int k = ((getHeight() /2) - APPLICATION_HEIGHT); //insert paddle GRect paddle = new GRect (x, y, PADDLE_WIDTH, PADDLE_HEIGHT); From 8b14b201d7a1ff1d27eed1291b81bac9de74ac87 Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 14:15:41 +0100 Subject: [PATCH 069/140] {"types":"C","runs":88} --- Breakout.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Breakout.java b/Breakout.java index 97f2dff..cf75f1e 100755 --- a/Breakout.java +++ b/Breakout.java @@ -94,8 +94,8 @@ public void run() { } //setup Paddle - int i = ((getWidth() /2) - PADDLE_WIDTH); - int k = ((getHeight() /2) - APPLICATION_HEIGHT); + double i = ((getWidth() /2) - PADDLE_WIDTH); + double k = ((getHeight() /2) - PADDLE_HEIGHT) * (-30); //insert paddle GRect paddle = new GRect (x, y, PADDLE_WIDTH, PADDLE_HEIGHT); From 75d1f69995cba282f16a2fd2def94ef1d8e6b0f8 Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 14:16:42 +0100 Subject: [PATCH 070/140] {"types":"C","runs":89} --- Breakout.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Breakout.java b/Breakout.java index cf75f1e..5e4f940 100755 --- a/Breakout.java +++ b/Breakout.java @@ -95,7 +95,7 @@ public void run() { //setup Paddle double i = ((getWidth() /2) - PADDLE_WIDTH); - double k = ((getHeight() /2) - PADDLE_HEIGHT) * (-30); + double k = ((getHeight() /2) - BRICK_Y_OFFSET) * (-30); //insert paddle GRect paddle = new GRect (x, y, PADDLE_WIDTH, PADDLE_HEIGHT); From 313bd8cc72084bff575c5506b13417c8d623f5fe Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 14:16:55 +0100 Subject: [PATCH 071/140] {"types":"C","runs":90} --- Breakout.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Breakout.java b/Breakout.java index 5e4f940..01bd87e 100755 --- a/Breakout.java +++ b/Breakout.java @@ -95,7 +95,7 @@ public void run() { //setup Paddle double i = ((getWidth() /2) - PADDLE_WIDTH); - double k = ((getHeight() /2) - BRICK_Y_OFFSET) * (-30); + double k = ((getHeight() /2) - BRICK_Y_OFFSET); //insert paddle GRect paddle = new GRect (x, y, PADDLE_WIDTH, PADDLE_HEIGHT); From 0b0a2cc7c0a70a7b5944f3fc8844ddd37bbbf59f Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 14:18:07 +0100 Subject: [PATCH 072/140] {"types":"C","runs":91} --- Breakout.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Breakout.java b/Breakout.java index 01bd87e..030202c 100755 --- a/Breakout.java +++ b/Breakout.java @@ -93,9 +93,10 @@ public void run() { x = BRICK_SEP / 2; } + //setup Paddle - double i = ((getWidth() /2) - PADDLE_WIDTH); - double k = ((getHeight() /2) - BRICK_Y_OFFSET); + double i = ((APPLICATION_WIDTH /2) - PADDLE_WIDTH); + double k = ((APPLICATION_HEIGHT /2) - BRICK_Y_OFFSET); //insert paddle GRect paddle = new GRect (x, y, PADDLE_WIDTH, PADDLE_HEIGHT); From 823b8cd188baf5946a48a39c8ed0dbd5f0060000 Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 14:18:50 +0100 Subject: [PATCH 073/140] {"types":"C","runs":92} --- Breakout.java | 1 + 1 file changed, 1 insertion(+) diff --git a/Breakout.java b/Breakout.java index 030202c..42f82b0 100755 --- a/Breakout.java +++ b/Breakout.java @@ -100,6 +100,7 @@ public void run() { //insert paddle GRect paddle = new GRect (x, y, PADDLE_WIDTH, PADDLE_HEIGHT); + paddle.setColor(Color.BLUE); paddle.setFilled(true); add (paddle); } From cd386a6e26065ea28890e969876f3904656fa7f6 Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 14:19:28 +0100 Subject: [PATCH 074/140] {"types":"C","runs":93} --- Breakout.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Breakout.java b/Breakout.java index 42f82b0..888341f 100755 --- a/Breakout.java +++ b/Breakout.java @@ -95,8 +95,8 @@ public void run() { //setup Paddle - double i = ((APPLICATION_WIDTH /2) - PADDLE_WIDTH); - double k = ((APPLICATION_HEIGHT /2) - BRICK_Y_OFFSET); + double i = (APPLICATION_WIDTH - PADDLE_WIDTH); + double k = (APPLICATION_HEIGHT - BRICK_Y_OFFSET); //insert paddle GRect paddle = new GRect (x, y, PADDLE_WIDTH, PADDLE_HEIGHT); From 6106b2f7cafe2ff633fd782fd0da92e315f80b12 Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 14:19:53 +0100 Subject: [PATCH 075/140] {"types":"C","runs":95} --- Breakout.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Breakout.java b/Breakout.java index 888341f..1f77030 100755 --- a/Breakout.java +++ b/Breakout.java @@ -96,7 +96,7 @@ public void run() { //setup Paddle double i = (APPLICATION_WIDTH - PADDLE_WIDTH); - double k = (APPLICATION_HEIGHT - BRICK_Y_OFFSET); + double k = (APPLICATION_HEIGHT - PADDLE_HEIGHT); //insert paddle GRect paddle = new GRect (x, y, PADDLE_WIDTH, PADDLE_HEIGHT); From c6615ba26fa0471d30305aceaa97168d2552b63f Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 14:23:08 +0100 Subject: [PATCH 076/140] {"types":"C","runs":96} --- Breakout.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Breakout.java b/Breakout.java index 1f77030..54f1d7a 100755 --- a/Breakout.java +++ b/Breakout.java @@ -95,14 +95,14 @@ public void run() { //setup Paddle - double i = (APPLICATION_WIDTH - PADDLE_WIDTH); - double k = (APPLICATION_HEIGHT - PADDLE_HEIGHT); + double i = ((-getWidth() / 2) - PADDLE_WIDTH); + double k = ((-getHeight() / 2) - PADDLE_HEIGHT); //insert paddle - GRect paddle = new GRect (x, y, PADDLE_WIDTH, PADDLE_HEIGHT); + GRect paddle = new GRect (PADDLE_WIDTH, PADDLE_HEIGHT); paddle.setColor(Color.BLUE); paddle.setFilled(true); - add (paddle); + add (paddle, i, k); } } From 6f0a5eb6f0de852ff38530190fa14e8c596aed7e Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 14:24:11 +0100 Subject: [PATCH 077/140] {"types":"C","runs":97} --- Breakout.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Breakout.java b/Breakout.java index 54f1d7a..6140e99 100755 --- a/Breakout.java +++ b/Breakout.java @@ -95,8 +95,8 @@ public void run() { //setup Paddle - double i = ((-getWidth() / 2) - PADDLE_WIDTH); - double k = ((-getHeight() / 2) - PADDLE_HEIGHT); + double i = ((getWidth() - APPLICATION_WIDTH) - PADDLE_WIDTH); + double k = ((getHeight() - APPLICATION_HEIGHT) - PADDLE_HEIGHT); //insert paddle GRect paddle = new GRect (PADDLE_WIDTH, PADDLE_HEIGHT); From 3a464de01083f56909e629070b00e76263358683 Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 14:24:47 +0100 Subject: [PATCH 078/140] {"types":"C","runs":98} --- Breakout.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Breakout.java b/Breakout.java index 6140e99..18a156b 100755 --- a/Breakout.java +++ b/Breakout.java @@ -99,10 +99,10 @@ public void run() { double k = ((getHeight() - APPLICATION_HEIGHT) - PADDLE_HEIGHT); //insert paddle - GRect paddle = new GRect (PADDLE_WIDTH, PADDLE_HEIGHT); + GRect paddle = new GRect (i, k, PADDLE_WIDTH, PADDLE_HEIGHT); paddle.setColor(Color.BLUE); paddle.setFilled(true); - add (paddle, i, k); + add (paddle); } } From 2de9932219ca7a0bb9b29bd04f2e8137fe522810 Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 14:25:44 +0100 Subject: [PATCH 079/140] {"types":"C","runs":99} --- Breakout.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Breakout.java b/Breakout.java index 18a156b..56e93ee 100755 --- a/Breakout.java +++ b/Breakout.java @@ -96,7 +96,7 @@ public void run() { //setup Paddle double i = ((getWidth() - APPLICATION_WIDTH) - PADDLE_WIDTH); - double k = ((getHeight() - APPLICATION_HEIGHT) - PADDLE_HEIGHT); + double k = ((getHeight() - APPLICATION_HEIGHT) - (PADDLE_HEIGHT * (20))); //insert paddle GRect paddle = new GRect (i, k, PADDLE_WIDTH, PADDLE_HEIGHT); From dd8d6469702eb6bb6473deec8edda76f3aa692f3 Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 14:27:08 +0100 Subject: [PATCH 080/140] {"types":"C","runs":100} --- Breakout.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Breakout.java b/Breakout.java index 56e93ee..3e94f00 100755 --- a/Breakout.java +++ b/Breakout.java @@ -95,8 +95,8 @@ public void run() { //setup Paddle - double i = ((getWidth() - APPLICATION_WIDTH) - PADDLE_WIDTH); - double k = ((getHeight() - APPLICATION_HEIGHT) - (PADDLE_HEIGHT * (20))); + double i = x - PADDLE_WIDTH; + double k = (y- (PADDLE_HEIGHT * (20))); //insert paddle GRect paddle = new GRect (i, k, PADDLE_WIDTH, PADDLE_HEIGHT); From f042d49bf393f70fd10d5a1b53c6fd7b35042a9c Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 14:27:41 +0100 Subject: [PATCH 081/140] {"types":"C","runs":101} --- Breakout.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Breakout.java b/Breakout.java index 3e94f00..81d0d1f 100755 --- a/Breakout.java +++ b/Breakout.java @@ -96,7 +96,7 @@ public void run() { //setup Paddle double i = x - PADDLE_WIDTH; - double k = (y- (PADDLE_HEIGHT * (20))); + double k = y- PADDLE_HEIGHT; //insert paddle GRect paddle = new GRect (i, k, PADDLE_WIDTH, PADDLE_HEIGHT); From bef6dde15ea18562f29dc039b98263d7f6e8fe64 Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 14:28:20 +0100 Subject: [PATCH 082/140] {"types":"C","runs":102} --- Breakout.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Breakout.java b/Breakout.java index 81d0d1f..88dc578 100755 --- a/Breakout.java +++ b/Breakout.java @@ -95,14 +95,14 @@ public void run() { //setup Paddle - double i = x - PADDLE_WIDTH; - double k = y- PADDLE_HEIGHT; + double i = (APPLICATION_WIDTH - PADDLE_WIDTH); + double k = (APPLICATION_HEIGHT - PADDLE_HEIGHT); //insert paddle - GRect paddle = new GRect (i, k, PADDLE_WIDTH, PADDLE_HEIGHT); + GRect paddle = new GRect (PADDLE_WIDTH, PADDLE_HEIGHT); paddle.setColor(Color.BLUE); paddle.setFilled(true); - add (paddle); + add (paddle, i, k); } } From c2131a83cf2ee378e5082065747c54191dcccd05 Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 14:29:02 +0100 Subject: [PATCH 083/140] {"types":"C","runs":103} --- Breakout.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/Breakout.java b/Breakout.java index 88dc578..4d0bbf9 100755 --- a/Breakout.java +++ b/Breakout.java @@ -93,16 +93,14 @@ public void run() { x = BRICK_SEP / 2; } - //setup Paddle - double i = (APPLICATION_WIDTH - PADDLE_WIDTH); - double k = (APPLICATION_HEIGHT - PADDLE_HEIGHT); + int i = ((getWidth() /2) - PADDLE_WIDTH); + int k = ((getHeight() /2) - PADDLE_HEIGHT) * (-30); //insert paddle - GRect paddle = new GRect (PADDLE_WIDTH, PADDLE_HEIGHT); - paddle.setColor(Color.BLUE); + GRect paddle = new GRect (i, k, PADDLE_WIDTH, PADDLE_HEIGHT); paddle.setFilled(true); - add (paddle, i, k); + add (paddle); } } From d88386cc8154dfbab4fe0b09f17e8ac3d9a00ca9 Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 14:29:18 +0100 Subject: [PATCH 084/140] {"types":"C","runs":104} --- Breakout.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Breakout.java b/Breakout.java index 4d0bbf9..4865433 100755 --- a/Breakout.java +++ b/Breakout.java @@ -95,7 +95,7 @@ public void run() { //setup Paddle int i = ((getWidth() /2) - PADDLE_WIDTH); - int k = ((getHeight() /2) - PADDLE_HEIGHT) * (-30); + int k = ((getHeight() /2) - PADDLE_HEIGHT); //insert paddle GRect paddle = new GRect (i, k, PADDLE_WIDTH, PADDLE_HEIGHT); From 5244c7d5ab7563e2c3bb4f7be580479c890f1a27 Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 14:29:40 +0100 Subject: [PATCH 085/140] {"types":"C","runs":106} --- Breakout.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Breakout.java b/Breakout.java index 4865433..2accae2 100755 --- a/Breakout.java +++ b/Breakout.java @@ -95,7 +95,7 @@ public void run() { //setup Paddle int i = ((getWidth() /2) - PADDLE_WIDTH); - int k = ((getHeight() /2) - PADDLE_HEIGHT); + int k = ((getHeight() /2) - PADDLE_HEIGHT) * 5; //insert paddle GRect paddle = new GRect (i, k, PADDLE_WIDTH, PADDLE_HEIGHT); From 0fc5fc0c29ac2749cb4bab13df23ffd0098a727c Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 14:29:51 +0100 Subject: [PATCH 086/140] {"types":"C","runs":107} --- Breakout.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Breakout.java b/Breakout.java index 2accae2..f4f280a 100755 --- a/Breakout.java +++ b/Breakout.java @@ -95,7 +95,7 @@ public void run() { //setup Paddle int i = ((getWidth() /2) - PADDLE_WIDTH); - int k = ((getHeight() /2) - PADDLE_HEIGHT) * 5; + int k = ((getHeight() /2) - PADDLE_HEIGHT) * 2; //insert paddle GRect paddle = new GRect (i, k, PADDLE_WIDTH, PADDLE_HEIGHT); From b432f650dbd3db51843a08000702f881c197aa9e Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 14:31:58 +0100 Subject: [PATCH 087/140] {"types":"C","runs":108} --- Breakout.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Breakout.java b/Breakout.java index f4f280a..a3975ea 100755 --- a/Breakout.java +++ b/Breakout.java @@ -95,7 +95,7 @@ public void run() { //setup Paddle int i = ((getWidth() /2) - PADDLE_WIDTH); - int k = ((getHeight() /2) - PADDLE_HEIGHT) * 2; + int k = ((getHeight() /2) - (PADDLE_HEIGHT - BRICK_Y_OFFSET)); //insert paddle GRect paddle = new GRect (i, k, PADDLE_WIDTH, PADDLE_HEIGHT); From c99262fd647080ba6db6ddab013bc40e54e662d0 Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 14:32:37 +0100 Subject: [PATCH 088/140] {"types":"C","runs":109} --- Breakout.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Breakout.java b/Breakout.java index a3975ea..ff8e9a6 100755 --- a/Breakout.java +++ b/Breakout.java @@ -95,7 +95,7 @@ public void run() { //setup Paddle int i = ((getWidth() /2) - PADDLE_WIDTH); - int k = ((getHeight() /2) - (PADDLE_HEIGHT - BRICK_Y_OFFSET)); + int k = ((getHeight() /2) - (PADDLE_HEIGHT - 80)); //insert paddle GRect paddle = new GRect (i, k, PADDLE_WIDTH, PADDLE_HEIGHT); From 7936f52891326326e7a7e5ddae60f5942c18d7dc Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 14:32:48 +0100 Subject: [PATCH 089/140] {"types":"C","runs":110} --- Breakout.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Breakout.java b/Breakout.java index ff8e9a6..2d96b87 100755 --- a/Breakout.java +++ b/Breakout.java @@ -95,7 +95,7 @@ public void run() { //setup Paddle int i = ((getWidth() /2) - PADDLE_WIDTH); - int k = ((getHeight() /2) - (PADDLE_HEIGHT - 80)); + int k = ((getHeight() /2) - (PADDLE_HEIGHT - 100)); //insert paddle GRect paddle = new GRect (i, k, PADDLE_WIDTH, PADDLE_HEIGHT); From 9711ea0df9437b766d9b95eecf0fa3150c9d6d02 Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 14:33:54 +0100 Subject: [PATCH 090/140] {"types":"C","runs":111} --- Breakout.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Breakout.java b/Breakout.java index 2d96b87..d425695 100755 --- a/Breakout.java +++ b/Breakout.java @@ -95,7 +95,7 @@ public void run() { //setup Paddle int i = ((getWidth() /2) - PADDLE_WIDTH); - int k = ((getHeight() /2) - (PADDLE_HEIGHT - 100)); + int k = ((getHeight() /2) - (PADDLE_HEIGHT - 30)); //insert paddle GRect paddle = new GRect (i, k, PADDLE_WIDTH, PADDLE_HEIGHT); From fa1d96065103c6c923c10a6913247fd98fe9061b Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 14:34:39 +0100 Subject: [PATCH 091/140] {"types":"C","runs":112} --- Breakout.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Breakout.java b/Breakout.java index d425695..2631f08 100755 --- a/Breakout.java +++ b/Breakout.java @@ -95,7 +95,7 @@ public void run() { //setup Paddle int i = ((getWidth() /2) - PADDLE_WIDTH); - int k = ((getHeight() /2) - (PADDLE_HEIGHT - 30)); + double k = ((getHeight() /2) - (PADDLE_HEIGHT - (1.7))); //insert paddle GRect paddle = new GRect (i, k, PADDLE_WIDTH, PADDLE_HEIGHT); From 42bf20d0f1a38be189075d38927115857c1dcc40 Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 14:34:58 +0100 Subject: [PATCH 092/140] {"types":"C","runs":113} --- Breakout.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Breakout.java b/Breakout.java index 2631f08..29690f1 100755 --- a/Breakout.java +++ b/Breakout.java @@ -94,7 +94,7 @@ public void run() { } //setup Paddle - int i = ((getWidth() /2) - PADDLE_WIDTH); + double i = ((getWidth() /2) - PADDLE_WIDTH); double k = ((getHeight() /2) - (PADDLE_HEIGHT - (1.7))); //insert paddle From 21123a06d7fd76fc941eb171bdc70e12d0c2c4ec Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 14:35:20 +0100 Subject: [PATCH 093/140] {"types":"C","runs":114} --- Breakout.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Breakout.java b/Breakout.java index 29690f1..ef0e7b1 100755 --- a/Breakout.java +++ b/Breakout.java @@ -95,7 +95,7 @@ public void run() { //setup Paddle double i = ((getWidth() /2) - PADDLE_WIDTH); - double k = ((getHeight() /2) - (PADDLE_HEIGHT - (1.7))); + double k = ((getHeight() /2) - (PADDLE_HEIGHT * (1.7))); //insert paddle GRect paddle = new GRect (i, k, PADDLE_WIDTH, PADDLE_HEIGHT); From 511f1ec833c0c8baf9484bbbd83ca27a317426ff Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 14:35:47 +0100 Subject: [PATCH 094/140] {"types":"C","runs":115} --- Breakout.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Breakout.java b/Breakout.java index ef0e7b1..f4f280a 100755 --- a/Breakout.java +++ b/Breakout.java @@ -94,8 +94,8 @@ public void run() { } //setup Paddle - double i = ((getWidth() /2) - PADDLE_WIDTH); - double k = ((getHeight() /2) - (PADDLE_HEIGHT * (1.7))); + int i = ((getWidth() /2) - PADDLE_WIDTH); + int k = ((getHeight() /2) - PADDLE_HEIGHT) * 2; //insert paddle GRect paddle = new GRect (i, k, PADDLE_WIDTH, PADDLE_HEIGHT); From 60d95eb634f2507000c12d95c9b0832f6258a54e Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 14:35:57 +0100 Subject: [PATCH 095/140] {"types":"C","runs":116} --- Breakout.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Breakout.java b/Breakout.java index f4f280a..d7cfd17 100755 --- a/Breakout.java +++ b/Breakout.java @@ -95,7 +95,7 @@ public void run() { //setup Paddle int i = ((getWidth() /2) - PADDLE_WIDTH); - int k = ((getHeight() /2) - PADDLE_HEIGHT) * 2; + int k = ((getHeight() /2) - PADDLE_HEIGHT) * 1; //insert paddle GRect paddle = new GRect (i, k, PADDLE_WIDTH, PADDLE_HEIGHT); From 8c25d7724fd6a9f511a20b8a6e331dad7e7856ef Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 14:36:10 +0100 Subject: [PATCH 096/140] {"types":"C","runs":117} --- Breakout.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Breakout.java b/Breakout.java index d7cfd17..f4f280a 100755 --- a/Breakout.java +++ b/Breakout.java @@ -95,7 +95,7 @@ public void run() { //setup Paddle int i = ((getWidth() /2) - PADDLE_WIDTH); - int k = ((getHeight() /2) - PADDLE_HEIGHT) * 1; + int k = ((getHeight() /2) - PADDLE_HEIGHT) * 2; //insert paddle GRect paddle = new GRect (i, k, PADDLE_WIDTH, PADDLE_HEIGHT); From 2d69f4f215134aee31a1a4b1a7fbf0bec054c21e Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 14:36:43 +0100 Subject: [PATCH 097/140] {"types":"C","runs":118} --- Breakout.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Breakout.java b/Breakout.java index f4f280a..554a944 100755 --- a/Breakout.java +++ b/Breakout.java @@ -95,7 +95,7 @@ public void run() { //setup Paddle int i = ((getWidth() /2) - PADDLE_WIDTH); - int k = ((getHeight() /2) - PADDLE_HEIGHT) * 2; + double k = ((getHeight() /2) - PADDLE_HEIGHT) * (1.7); //insert paddle GRect paddle = new GRect (i, k, PADDLE_WIDTH, PADDLE_HEIGHT); From 0fd19acf50d043c96850a09e0531f3053e3b325a Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 14:37:04 +0100 Subject: [PATCH 098/140] {"types":"C","runs":119} --- Breakout.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Breakout.java b/Breakout.java index 554a944..7e0c79c 100755 --- a/Breakout.java +++ b/Breakout.java @@ -94,8 +94,8 @@ public void run() { } //setup Paddle - int i = ((getWidth() /2) - PADDLE_WIDTH); - double k = ((getHeight() /2) - PADDLE_HEIGHT) * (1.7); + double i = ((getWidth() /2) - PADDLE_WIDTH); + double k = ((getHeight() /2) - PADDLE_HEIGHT) * (1.9); //insert paddle GRect paddle = new GRect (i, k, PADDLE_WIDTH, PADDLE_HEIGHT); From 131595757250ade11488a7a6a44dcfffeffaf215 Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 14:39:19 +0100 Subject: [PATCH 099/140] {"types":"C","runs":120} --- Breakout.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Breakout.java b/Breakout.java index 7e0c79c..29be23b 100755 --- a/Breakout.java +++ b/Breakout.java @@ -98,9 +98,9 @@ public void run() { double k = ((getHeight() /2) - PADDLE_HEIGHT) * (1.9); //insert paddle - GRect paddle = new GRect (i, k, PADDLE_WIDTH, PADDLE_HEIGHT); + GRect paddle = new GRect (PADDLE_WIDTH, PADDLE_HEIGHT); paddle.setFilled(true); - add (paddle); + add (paddle, i, k); } } From ea385f99bb3536c867bcc337ed256b23b9832e2a Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 14:44:57 +0100 Subject: [PATCH 100/140] {"types":"C","runs":121} --- Breakout.java | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/Breakout.java b/Breakout.java index 29be23b..456b6ec 100755 --- a/Breakout.java +++ b/Breakout.java @@ -93,15 +93,21 @@ public void run() { x = BRICK_SEP / 2; } + // + getPaddle(); + } + //setup Paddle - double i = ((getWidth() /2) - PADDLE_WIDTH); - double k = ((getHeight() /2) - PADDLE_HEIGHT) * (1.9); - - //insert paddle - GRect paddle = new GRect (PADDLE_WIDTH, PADDLE_HEIGHT); - paddle.setFilled(true); - add (paddle, i, k); - } + private void getPaddle() { + double i = ((getWidth() /2) - PADDLE_WIDTH); + double k = ((getHeight() /2) - PADDLE_HEIGHT) * (1.9); + + //insert paddle + GRect paddle = new GRect (PADDLE_WIDTH, PADDLE_HEIGHT); + paddle.setFilled(true); + // TODO Auto-generated method stub + +} } From 437470b5bff3970ecae15bf00899ea7fe1181d52 Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 14:46:00 +0100 Subject: [PATCH 101/140] {"types":"C","runs":122} --- Breakout.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Breakout.java b/Breakout.java index 456b6ec..7d16adb 100755 --- a/Breakout.java +++ b/Breakout.java @@ -106,9 +106,14 @@ private void getPaddle() { GRect paddle = new GRect (PADDLE_WIDTH, PADDLE_HEIGHT); paddle.setFilled(true); // TODO Auto-generated method stub - } } + + + + + + \ No newline at end of file From 10645f0218823e42592f0ef04dc9c9fd21027bcc Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 14:52:10 +0100 Subject: [PATCH 102/140] {"types":"C","runs":123} --- Breakout.java | 1 + 1 file changed, 1 insertion(+) diff --git a/Breakout.java b/Breakout.java index 7d16adb..b9fa5b7 100755 --- a/Breakout.java +++ b/Breakout.java @@ -105,6 +105,7 @@ private void getPaddle() { //insert paddle GRect paddle = new GRect (PADDLE_WIDTH, PADDLE_HEIGHT); paddle.setFilled(true); + add (paddle, i, k); // TODO Auto-generated method stub } From 897588ec2c69bfe8456e8617f2eaa27fa40c25e4 Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 14:58:03 +0100 Subject: [PATCH 103/140] {"types":"C","runs":124} --- Breakout.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Breakout.java b/Breakout.java index b9fa5b7..f35d0b1 100755 --- a/Breakout.java +++ b/Breakout.java @@ -45,6 +45,9 @@ public class Breakout extends GraphicsProgram { /** Offset of the top brick row from the top */ private static final int BRICK_Y_OFFSET = 70; + + // + private static final int PADDLE_Y_OFFSET = 30; private double PADDLE_WIDHT; @@ -98,15 +101,14 @@ public void run() { } //setup Paddle - private void getPaddle() { + private void getPaddle() { double i = ((getWidth() /2) - PADDLE_WIDTH); - double k = ((getHeight() /2) - PADDLE_HEIGHT) * (1.9); + double k = (getHeight() - PADDLE_Y_OFFSET - PADDLE_HEIGHT); //insert paddle GRect paddle = new GRect (PADDLE_WIDTH, PADDLE_HEIGHT); paddle.setFilled(true); add (paddle, i, k); - // TODO Auto-generated method stub } } From fdd4a16ad00a5f6479affbdbceb3b2a8e74e088f Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 15:03:03 +0100 Subject: [PATCH 104/140] {"types":"C","runs":125} --- Breakout.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Breakout.java b/Breakout.java index f35d0b1..704ff58 100755 --- a/Breakout.java +++ b/Breakout.java @@ -48,7 +48,7 @@ public class Breakout extends GraphicsProgram { // private static final int PADDLE_Y_OFFSET = 30; -private double PADDLE_WIDHT; + From 2ff46836b7786574b4f3d5a51a3dd403a5882c8b Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 15:04:37 +0100 Subject: [PATCH 105/140] {"types":"C","runs":125} --- Breakout.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Breakout.java b/Breakout.java index 704ff58..f29284f 100755 --- a/Breakout.java +++ b/Breakout.java @@ -98,6 +98,7 @@ public void run() { // getPaddle(); + } //setup Paddle @@ -109,6 +110,7 @@ private void getPaddle() { GRect paddle = new GRect (PADDLE_WIDTH, PADDLE_HEIGHT); paddle.setFilled(true); add (paddle, i, k); + addMouseListeners(); } } From ba49a8a45631f3cd6acc15826485f7e44988285d Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 15:05:08 +0100 Subject: [PATCH 106/140] {"types":"C","runs":126} --- Breakout.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Breakout.java b/Breakout.java index f29284f..01c3b8e 100755 --- a/Breakout.java +++ b/Breakout.java @@ -103,7 +103,7 @@ public void run() { //setup Paddle private void getPaddle() { - double i = ((getWidth() /2) - PADDLE_WIDTH); + double i = ((getWidth() /2); double k = (getHeight() - PADDLE_Y_OFFSET - PADDLE_HEIGHT); //insert paddle From dd38039ebb1b83821a65c11cc76cc9ebed0c60f8 Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 15:05:15 +0100 Subject: [PATCH 107/140] {"types":"C","runs":126} --- Breakout.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Breakout.java b/Breakout.java index 01c3b8e..d943d7e 100755 --- a/Breakout.java +++ b/Breakout.java @@ -103,7 +103,7 @@ public void run() { //setup Paddle private void getPaddle() { - double i = ((getWidth() /2); + double i = (getWidth() /2); double k = (getHeight() - PADDLE_Y_OFFSET - PADDLE_HEIGHT); //insert paddle From 85892e51eaad90e0ea91eef4fff7560428dbadae Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 15:05:49 +0100 Subject: [PATCH 108/140] {"types":"C","runs":127} --- Breakout.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Breakout.java b/Breakout.java index d943d7e..7f2fb9f 100755 --- a/Breakout.java +++ b/Breakout.java @@ -103,7 +103,7 @@ public void run() { //setup Paddle private void getPaddle() { - double i = (getWidth() /2); + double i = (getWidth() - PADDLE_WIDTH/2); double k = (getHeight() - PADDLE_Y_OFFSET - PADDLE_HEIGHT); //insert paddle From 0ed30677f7345f1d01e80f6724d6523f00fa7551 Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 15:06:16 +0100 Subject: [PATCH 109/140] {"types":"C","runs":129} --- Breakout.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Breakout.java b/Breakout.java index 7f2fb9f..455fd56 100755 --- a/Breakout.java +++ b/Breakout.java @@ -103,7 +103,7 @@ public void run() { //setup Paddle private void getPaddle() { - double i = (getWidth() - PADDLE_WIDTH/2); + double i = (getWidth() / 2- PADDLE_WIDTH/2); double k = (getHeight() - PADDLE_Y_OFFSET - PADDLE_HEIGHT); //insert paddle From b0373e24554dce22510764f86fa035bb980d0b73 Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 15:20:31 +0100 Subject: [PATCH 110/140] {"types":"C","runs":131} --- Breakout.java | 116 ++++++++++++++++++++++++++++---------------------- 1 file changed, 66 insertions(+), 50 deletions(-) diff --git a/Breakout.java b/Breakout.java index 455fd56..45f301e 100755 --- a/Breakout.java +++ b/Breakout.java @@ -58,62 +58,78 @@ public class Breakout extends GraphicsProgram { /** Runs the Breakout program. */ public void run() { - // - //to setup x and y cordinates - int x = 2; - int y = BRICK_Y_OFFSET; - - //to set up bricks and the placement - //creating a loop for row and nesting the loop to create column - for (int row = 0; row < NBRICK_ROWS; row++) { - //create another loop for column - for (int column = 0; column < NBRICKS_PER_ROW; column++) { - //add bricks - GRect bricks = new GRect (BRICK_WIDTH, BRICK_HEIGHT); - bricks.setFilled(true); - //set brickc colors - if (row < 2){ - bricks.setColor(Color.RED); - } else if (row < 4) { - bricks.setColor(Color.ORANGE); - } else if (row < 6) { - bricks.setColor(Color.YELLOW); - } else if (row < 8) { - bricks.setColor(Color.GREEN); - } else if (row < 10) { - bricks.setColor(Color.CYAN); - } - add (bricks, x, y); - - //state the width of brick and distance between individual brick to the other along the x-axis - x += BRICK_WIDTH + BRICK_SEP; - } - /*state the height of brick and distance - *between individual brick to the other along the x-axis - *and also returning to the first loop - */ - y += BRICK_HEIGHT + BRICK_SEP; - x = BRICK_SEP / 2; - } - - // + createPaddle(); getPaddle(); - } +} + + + + + private void createPaddle() { - //setup Paddle - private void getPaddle() { - double i = (getWidth() / 2- PADDLE_WIDTH/2); - double k = (getHeight() - PADDLE_Y_OFFSET - PADDLE_HEIGHT); + //the following program creates bricks + + //to setup x and y cordinates + int x = 2; + int y = BRICK_Y_OFFSET; + + /*to set up bricks and the placement + *creating a loop for row and nesting the loop to create column + */ + + for (int row = 0; row < NBRICK_ROWS; row++) { + //create another loop for column + for (int column = 0; column < NBRICKS_PER_ROW; column++) { + //add bricks + GRect bricks = new GRect (BRICK_WIDTH, BRICK_HEIGHT); + bricks.setFilled(true); + //set brickc colors + if (row < 2){ + bricks.setColor(Color.RED); + } else if (row < 4) { + bricks.setColor(Color.ORANGE); + } else if (row < 6) { + bricks.setColor(Color.YELLOW); + } else if (row < 8) { + bricks.setColor(Color.GREEN); + } else if (row < 10) { + bricks.setColor(Color.CYAN); + } + add (bricks, x, y); + + //state the width of brick and distance between individual brick to the other along the x-axis + x += BRICK_WIDTH + BRICK_SEP; + } + /*state the height of brick and distance + *between individual brick to the other along the x-axis + *and also returning to the first loop + */ + y += BRICK_HEIGHT + BRICK_SEP; + x = BRICK_SEP / 2; + } - //insert paddle - GRect paddle = new GRect (PADDLE_WIDTH, PADDLE_HEIGHT); - paddle.setFilled(true); - add (paddle, i, k); - addMouseListeners(); -} } + + + + /*to create paddle + * as a private method + * and to also add mouse function + */ + private void getPaddle() { + double i = (getWidth() / 2- PADDLE_WIDTH/2); + double k = (getHeight() - PADDLE_Y_OFFSET - PADDLE_HEIGHT); + + //insert paddle + GRect paddle = new GRect (PADDLE_WIDTH, PADDLE_HEIGHT); + paddle.setFilled(true); + add (paddle, i, k); + addMouseListeners(); + } + +} From 6855e8ed345083702e57aed6808f3432fe44f0a3 Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 17:37:23 +0100 Subject: [PATCH 111/140] {"types":"C","runs":133} --- Breakout.java | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/Breakout.java b/Breakout.java index 45f301e..59e2e34 100755 --- a/Breakout.java +++ b/Breakout.java @@ -63,7 +63,7 @@ public void run() { } - + private void createPaddle() { @@ -131,10 +131,3 @@ private void getPaddle() { } - - - - - - - \ No newline at end of file From f61a5a52c9e9419bd920259192da1d3cdf371d30 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 8 Jun 2017 18:07:41 +0100 Subject: [PATCH 112/140] My Programming Assignment 3 --- .settings/org.eclipse.jdt.core.prefs | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index 21ed01f..90cc2ec 100755 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -1,12 +1,21 @@ -#Mon Oct 15 10:34:35 PDT 2007 eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.autoboxing=ignore org.eclipse.jdt.core.compiler.problem.deprecation=warning org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled org.eclipse.jdt.core.compiler.problem.discouragedReference=warning org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning @@ -50,3 +59,4 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=di org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning +org.eclipse.jdt.core.compiler.source=1.6 From c879b6ffe1910bb175a745a35fd83cf4c6f6075f Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 22:40:20 +0100 Subject: [PATCH 113/140] {"types":"C","runs":134} --- Breakout.java | 80 ++++++++++++++++++++++++++++++++------------------- 1 file changed, 51 insertions(+), 29 deletions(-) diff --git a/Breakout.java b/Breakout.java index 59e2e34..dcc4c3a 100755 --- a/Breakout.java +++ b/Breakout.java @@ -17,40 +17,50 @@ public class Breakout extends GraphicsProgram { -/** Width and height of application window in pixels */ - public static final int APPLICATION_WIDTH = 400; - public static final int APPLICATION_HEIGHT = 600; - + /** Width and height of application window in pixels */ + public static final int APPLICATION_WIDTH = 400; + public static final int APPLICATION_HEIGHT = 600; + /** Dimensions of game board (usually the same) */ - private static final int WIDTH = APPLICATION_WIDTH; - /** Dimensions of the paddle */ - private static final int PADDLE_WIDTH = 60; - private static final int PADDLE_HEIGHT = 10; - + private static final int WIDTH = APPLICATION_WIDTH; + private static final int HEIGHT = APPLICATION_HEIGHT; + +/** Dimensions of the paddle */ + private static final int PADDLE_WIDTH = 60; + private static final int PADDLE_HEIGHT = 10; + +/** Offset of the paddle up from the bottom */ + private static final int PADDLE_Y_OFFSET = 30; + /** Number of bricks per row */ - private static final int NBRICKS_PER_ROW = 10; - + private static final int NBRICKS_PER_ROW = 10; + /** Number of rows of bricks */ - private static final int NBRICK_ROWS = 10; - + private static final int NBRICK_ROWS = 10; + +/** Total number of bricks */ + private static final int TOTAL_BRICKS = NBRICK_ROWS * NBRICKS_PER_ROW; + /** Separation between bricks */ - private static final int BRICK_SEP = 4; - + private static final int BRICK_SEP = 4; + /** Width of a brick */ - private static final int BRICK_WIDTH = - (WIDTH - (NBRICKS_PER_ROW - 1) * BRICK_SEP) / NBRICKS_PER_ROW; - + private static final int BRICK_WIDTH = + (WIDTH - (NBRICKS_PER_ROW - 1) * BRICK_SEP) / NBRICKS_PER_ROW; + /** Height of a brick */ - private static final int BRICK_HEIGHT = 8; - + private static final int BRICK_HEIGHT = 8; + +/** Radius of the ball in pixels */ + private static final int BALL_RADIUS = 10; + /** Offset of the top brick row from the top */ - private static final int BRICK_Y_OFFSET = 70; - - // - private static final int PADDLE_Y_OFFSET = 30; - - - + private static final int BRICK_Y_OFFSET = 70; + +/** Number of turns */ + private static final int NTURNS = 3; +private Component getPaddle; + /* Method: run() */ @@ -58,7 +68,7 @@ public class Breakout extends GraphicsProgram { /** Runs the Breakout program. */ public void run() { - createPaddle(); + createBricks(); getPaddle(); } @@ -66,7 +76,7 @@ public void run() { - private void createPaddle() { + private void createBricks() { //the following program creates bricks @@ -129,5 +139,17 @@ private void getPaddle() { addMouseListeners(); } + + // makes paddle move + public void mouseMoved(MouseEvent e) { + + getPaddle.setLocation(e.getX() - PADDLE_WIDTH/2, getPaddle.getY()); + if (getPaddle.getX() <= 0) getPaddle.setLocation(0, getPaddle.getY()); + if (getPaddle.getX() + PADDLE_WIDTH >= getWidth()) getPaddle.setLocation(getWidth() - PADDLE_WIDTH, getPaddle.getY()); + } } + + + + From cd70a03ddcb36ef05af7324d1313cda752ca39ba Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 22:42:42 +0100 Subject: [PATCH 114/140] {"types":"C","runs":134} From 6f59e72e85bf1902d910ee6522f1e9e3e4543291 Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 22:45:32 +0100 Subject: [PATCH 115/140] {"types":"A","runs":135} --- getPaddle.java | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 getPaddle.java diff --git a/getPaddle.java b/getPaddle.java new file mode 100644 index 0000000..42dcbec --- /dev/null +++ b/getPaddle.java @@ -0,0 +1,4 @@ + +public class getPaddle { + +} From 4662d5b2494f068358032ab9e0e8f4c099428f84 Mon Sep 17 00:00:00 2001 From: S Date: Thu, 8 Jun 2017 22:45:51 +0100 Subject: [PATCH 116/140] {"types":"R","runs":135} --- getPaddle.java | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 getPaddle.java diff --git a/getPaddle.java b/getPaddle.java deleted file mode 100644 index 42dcbec..0000000 --- a/getPaddle.java +++ /dev/null @@ -1,4 +0,0 @@ - -public class getPaddle { - -} From dd0eb7cf1fec861eb4c0c8a05e2c3ea0d77e4ffe Mon Sep 17 00:00:00 2001 From: S Date: Fri, 9 Jun 2017 03:11:37 +0100 Subject: [PATCH 117/140] {"types":"C","runs":135} --- Breakout.java | 39 ++++++++++++++++++++++++++++++++------- 1 file changed, 32 insertions(+), 7 deletions(-) diff --git a/Breakout.java b/Breakout.java index dcc4c3a..1f3fa37 100755 --- a/Breakout.java +++ b/Breakout.java @@ -59,7 +59,6 @@ public class Breakout extends GraphicsProgram { /** Number of turns */ private static final int NTURNS = 3; -private Component getPaddle; /* Method: run() */ @@ -69,7 +68,7 @@ public class Breakout extends GraphicsProgram { /** Runs the Breakout program. */ public void run() { createBricks(); - getPaddle(); + paddle(); } @@ -128,7 +127,7 @@ private void createBricks() { * as a private method * and to also add mouse function */ - private void getPaddle() { + private void paddle() { double i = (getWidth() / 2- PADDLE_WIDTH/2); double k = (getHeight() - PADDLE_Y_OFFSET - PADDLE_HEIGHT); @@ -141,11 +140,8 @@ private void getPaddle() { // makes paddle move - public void mouseMoved(MouseEvent e) { + public void mouseMoved(MouseEvent e) { - getPaddle.setLocation(e.getX() - PADDLE_WIDTH/2, getPaddle.getY()); - if (getPaddle.getX() <= 0) getPaddle.setLocation(0, getPaddle.getY()); - if (getPaddle.getX() + PADDLE_WIDTH >= getWidth()) getPaddle.setLocation(getWidth() - PADDLE_WIDTH, getPaddle.getY()); } } @@ -153,3 +149,32 @@ public void mouseMoved(MouseEvent e) { + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 04cd8a6c7476b0bc09d4431f75a3985cfcfb7e07 Mon Sep 17 00:00:00 2001 From: S Date: Fri, 9 Jun 2017 07:15:53 +0100 Subject: [PATCH 118/140] {"types":"C","runs":1} From a2d76f87c3c05d9fd7bf782013a19d689f430579 Mon Sep 17 00:00:00 2001 From: S Date: Fri, 9 Jun 2017 07:16:30 +0100 Subject: [PATCH 119/140] {"types":"C","runs":2} --- Breakout.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Breakout.java b/Breakout.java index 1f3fa37..1b035f2 100755 --- a/Breakout.java +++ b/Breakout.java @@ -139,10 +139,6 @@ private void paddle() { } - // makes paddle move - public void mouseMoved(MouseEvent e) { - - } } From b0754dcec4161ae3afc1102bd701bf9ffe4a4af4 Mon Sep 17 00:00:00 2001 From: S Date: Fri, 9 Jun 2017 07:17:20 +0100 Subject: [PATCH 120/140] {"types":"C","runs":2} From f06c7142b68b73183b2211a9d3303d255f8ecbc8 Mon Sep 17 00:00:00 2001 From: S Date: Fri, 9 Jun 2017 07:19:32 +0100 Subject: [PATCH 121/140] {"types":"C","runs":4} --- Breakout.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Breakout.java b/Breakout.java index 1b035f2..1f3fa37 100755 --- a/Breakout.java +++ b/Breakout.java @@ -139,6 +139,10 @@ private void paddle() { } + // makes paddle move + public void mouseMoved(MouseEvent e) { + + } } From 2c6b39d8258280da0734932ce9c74109e6eaa705 Mon Sep 17 00:00:00 2001 From: S Date: Fri, 9 Jun 2017 12:59:52 +0100 Subject: [PATCH 122/140] {"types":"C","runs":12} --- Breakout.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Breakout.java b/Breakout.java index 1f3fa37..fa1a936 100755 --- a/Breakout.java +++ b/Breakout.java @@ -115,7 +115,7 @@ private void createBricks() { *and also returning to the first loop */ y += BRICK_HEIGHT + BRICK_SEP; - x = BRICK_SEP / 2; + } From 4a5834c1a9aff113ae1d2186ddc2ae31a5aab1c8 Mon Sep 17 00:00:00 2001 From: S Date: Fri, 9 Jun 2017 13:00:11 +0100 Subject: [PATCH 123/140] {"types":"C","runs":13} --- Breakout.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Breakout.java b/Breakout.java index fa1a936..4909a34 100755 --- a/Breakout.java +++ b/Breakout.java @@ -115,7 +115,7 @@ private void createBricks() { *and also returning to the first loop */ y += BRICK_HEIGHT + BRICK_SEP; - + x = 2 } From ecce4d193b9f80549fa5bcf20e191a2b94d869cd Mon Sep 17 00:00:00 2001 From: S Date: Fri, 9 Jun 2017 13:00:25 +0100 Subject: [PATCH 124/140] {"types":"C","runs":14} --- Breakout.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Breakout.java b/Breakout.java index 4909a34..5cbad59 100755 --- a/Breakout.java +++ b/Breakout.java @@ -115,7 +115,7 @@ private void createBricks() { *and also returning to the first loop */ y += BRICK_HEIGHT + BRICK_SEP; - x = 2 + x = 2; } From 35e53c7bb7c74881f4ae845ab6cfb425618162bb Mon Sep 17 00:00:00 2001 From: S Date: Sat, 10 Jun 2017 04:17:16 +0100 Subject: [PATCH 125/140] {"types":"C","runs":15} --- Breakout.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/Breakout.java b/Breakout.java index 5cbad59..7db6335 100755 --- a/Breakout.java +++ b/Breakout.java @@ -59,6 +59,8 @@ public class Breakout extends GraphicsProgram { /** Number of turns */ private static final int NTURNS = 3; + + private GRect PADDLE; /* Method: run() */ @@ -68,7 +70,7 @@ public class Breakout extends GraphicsProgram { /** Runs the Breakout program. */ public void run() { createBricks(); - paddle(); + getPaddle(); } @@ -127,21 +129,21 @@ private void createBricks() { * as a private method * and to also add mouse function */ - private void paddle() { + public void getPaddle() { double i = (getWidth() / 2- PADDLE_WIDTH/2); double k = (getHeight() - PADDLE_Y_OFFSET - PADDLE_HEIGHT); //insert paddle - GRect paddle = new GRect (PADDLE_WIDTH, PADDLE_HEIGHT); - paddle.setFilled(true); - add (paddle, i, k); + PADDLE = new GRect (PADDLE_WIDTH, PADDLE_HEIGHT); + PADDLE.setFilled(true); + add (PADDLE, i, k); addMouseListeners(); } // makes paddle move public void mouseMoved(MouseEvent e) { - + } } From bd04801985e0c53ac50f69a7f15c938b925d5391 Mon Sep 17 00:00:00 2001 From: S Date: Sat, 10 Jun 2017 04:17:44 +0100 Subject: [PATCH 126/140] {"types":"C","runs":16} From 649d9d6ef7cba17f8b14523c5ba86561c9d7248d Mon Sep 17 00:00:00 2001 From: S Date: Sat, 10 Jun 2017 04:35:17 +0100 Subject: [PATCH 127/140] {"types":"C","runs":17} --- Breakout.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Breakout.java b/Breakout.java index 7db6335..d1db267 100755 --- a/Breakout.java +++ b/Breakout.java @@ -59,7 +59,11 @@ public class Breakout extends GraphicsProgram { /** Number of turns */ private static final int NTURNS = 3; + +/**create an instance variable gobj */ + private static final GRect gobj; +/** Create a GRect instance */ private GRect PADDLE; @@ -142,9 +146,11 @@ public void getPaddle() { // makes paddle move - public void mouseMoved(MouseEvent e) { - + public void mouseClicked(MouseEvent e) { + if (gobj == PADDLE){ + PADDLE.move(getX(), getY()); } + } } From 90b1f891aa603323ad11104579faa2ced0a8b9b8 Mon Sep 17 00:00:00 2001 From: S Date: Sat, 10 Jun 2017 04:39:45 +0100 Subject: [PATCH 128/140] {"types":"C","runs":17} --- Breakout.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Breakout.java b/Breakout.java index d1db267..f0cf399 100755 --- a/Breakout.java +++ b/Breakout.java @@ -148,7 +148,7 @@ public void getPaddle() { // makes paddle move public void mouseClicked(MouseEvent e) { if (gobj == PADDLE){ - PADDLE.move(getX(), getY()); + PADDLE.move(getX() - PADDLE_WIDTH, getY() - PADDLE_HEIGHT); } } } From 992c55185f8653d98b3105ba0f7919dc51cf2c75 Mon Sep 17 00:00:00 2001 From: S Date: Sat, 10 Jun 2017 04:46:31 +0100 Subject: [PATCH 129/140] {"types":"C","runs":18} --- Breakout.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Breakout.java b/Breakout.java index f0cf399..bd2334a 100755 --- a/Breakout.java +++ b/Breakout.java @@ -61,7 +61,10 @@ public class Breakout extends GraphicsProgram { private static final int NTURNS = 3; /**create an instance variable gobj */ - private static final GRect gobj; + private static GObject gobj; + + /**create an instance variable gobj */ + private static GPoint last; /** Create a GRect instance */ private GRect PADDLE; @@ -147,6 +150,9 @@ public void getPaddle() { // makes paddle move public void mouseClicked(MouseEvent e) { + last = new GPoint(e.getPoint()); + gobj = getElementAt(last); + // if (gobj == PADDLE){ PADDLE.move(getX() - PADDLE_WIDTH, getY() - PADDLE_HEIGHT); } From cf788fceb1f906d6f65b29f91b70b8e34c7b70b8 Mon Sep 17 00:00:00 2001 From: S Date: Sat, 10 Jun 2017 04:48:20 +0100 Subject: [PATCH 130/140] {"types":"C","runs":18} --- Breakout.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Breakout.java b/Breakout.java index bd2334a..b4110db 100755 --- a/Breakout.java +++ b/Breakout.java @@ -154,7 +154,7 @@ public void mouseClicked(MouseEvent e) { gobj = getElementAt(last); // if (gobj == PADDLE){ - PADDLE.move(getX() - PADDLE_WIDTH, getY() - PADDLE_HEIGHT); + PADDLE.move(getX(), getY()); } } } From 1d989ad61d4f26ea6114d9084664f1a85107a276 Mon Sep 17 00:00:00 2001 From: S Date: Sat, 10 Jun 2017 04:48:49 +0100 Subject: [PATCH 131/140] {"types":"C","runs":20} --- Breakout.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Breakout.java b/Breakout.java index b4110db..bd2334a 100755 --- a/Breakout.java +++ b/Breakout.java @@ -154,7 +154,7 @@ public void mouseClicked(MouseEvent e) { gobj = getElementAt(last); // if (gobj == PADDLE){ - PADDLE.move(getX(), getY()); + PADDLE.move(getX() - PADDLE_WIDTH, getY() - PADDLE_HEIGHT); } } } From c635d657d805ba02c25ae5a9c6cd248a65b1d030 Mon Sep 17 00:00:00 2001 From: S Date: Sat, 10 Jun 2017 04:50:19 +0100 Subject: [PATCH 132/140] {"types":"C","runs":20} --- Breakout.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Breakout.java b/Breakout.java index bd2334a..63d4dbe 100755 --- a/Breakout.java +++ b/Breakout.java @@ -154,7 +154,7 @@ public void mouseClicked(MouseEvent e) { gobj = getElementAt(last); // if (gobj == PADDLE){ - PADDLE.move(getX() - PADDLE_WIDTH, getY() - PADDLE_HEIGHT); + PADDLE.move(getWidth() /2 - (getX() - PADDLE_WIDTH), getY() - PADDLE_HEIGHT); } } } From 705dc6e750fd791397f9c296865d33667398647d Mon Sep 17 00:00:00 2001 From: S Date: Sat, 10 Jun 2017 04:52:34 +0100 Subject: [PATCH 133/140] {"types":"C","runs":22} --- Breakout.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Breakout.java b/Breakout.java index 63d4dbe..097c4b6 100755 --- a/Breakout.java +++ b/Breakout.java @@ -154,7 +154,7 @@ public void mouseClicked(MouseEvent e) { gobj = getElementAt(last); // if (gobj == PADDLE){ - PADDLE.move(getWidth() /2 - (getX() - PADDLE_WIDTH), getY() - PADDLE_HEIGHT); + PADDLE.move((getWidth() /2) - getX(), (getHeight() /2) - getY()); } } } From 76d9e25b9ac38734dfcb1607f0c29e5836987c3b Mon Sep 17 00:00:00 2001 From: S Date: Sat, 10 Jun 2017 04:53:52 +0100 Subject: [PATCH 134/140] {"types":"C","runs":23} --- Breakout.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Breakout.java b/Breakout.java index 097c4b6..4d01ab3 100755 --- a/Breakout.java +++ b/Breakout.java @@ -154,7 +154,7 @@ public void mouseClicked(MouseEvent e) { gobj = getElementAt(last); // if (gobj == PADDLE){ - PADDLE.move((getWidth() /2) - getX(), (getHeight() /2) - getY()); + PADDLE.move((getWidth() - getX()) /2, (getHeight() - getY()) / 2); } } } From 78bb9daac5404902fed6289422e2bea196f5cb19 Mon Sep 17 00:00:00 2001 From: S Date: Sat, 10 Jun 2017 06:29:15 +0100 Subject: [PATCH 135/140] {"types":"C","runs":25} --- Breakout.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Breakout.java b/Breakout.java index 4d01ab3..9e20019 100755 --- a/Breakout.java +++ b/Breakout.java @@ -15,6 +15,8 @@ import java.awt.*; import java.awt.event.*; +import com.sun.org.apache.xml.internal.security.Init; + public class Breakout extends GraphicsProgram { /** Width and height of application window in pixels */ @@ -136,7 +138,7 @@ private void createBricks() { * as a private method * and to also add mouse function */ - public void getPaddle() { + public Init getPaddle() { double i = (getWidth() / 2- PADDLE_WIDTH/2); double k = (getHeight() - PADDLE_Y_OFFSET - PADDLE_HEIGHT); @@ -145,6 +147,7 @@ public void getPaddle() { PADDLE.setFilled(true); add (PADDLE, i, k); addMouseListeners(); + return null; } From 1de988fa6db626bfefebcd40f8a5907299db497f Mon Sep 17 00:00:00 2001 From: S Date: Mon, 12 Jun 2017 10:11:35 +0100 Subject: [PATCH 136/140] {"types":"C","runs":0} From 58fc7f8a73d89abce670b9d33d53eebffb067bc1 Mon Sep 17 00:00:00 2001 From: S Date: Mon, 12 Jun 2017 17:31:41 +0100 Subject: [PATCH 137/140] {"types":"C","runs":12} --- Breakout.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/Breakout.java b/Breakout.java index 9e20019..08fe235 100755 --- a/Breakout.java +++ b/Breakout.java @@ -153,12 +153,7 @@ public Init getPaddle() { // makes paddle move public void mouseClicked(MouseEvent e) { - last = new GPoint(e.getPoint()); - gobj = getElementAt(last); - // - if (gobj == PADDLE){ - PADDLE.move((getWidth() - getX()) /2, (getHeight() - getY()) / 2); - } + int x = e.getX(); } } From 0677e8281bc2e085dbc81d829e7226a70cf9c0d7 Mon Sep 17 00:00:00 2001 From: S Date: Wed, 14 Jun 2017 10:55:50 +0100 Subject: [PATCH 138/140] {"types":"C","runs":1} --- .classpath | 4 ++-- Breakout.java | 32 +++++++++++++++++++++----------- 2 files changed, 23 insertions(+), 13 deletions(-) diff --git a/.classpath b/.classpath index 948fbb9..d82572c 100755 --- a/.classpath +++ b/.classpath @@ -1,7 +1,7 @@ - - + + diff --git a/Breakout.java b/Breakout.java index 08fe235..c7224e0 100755 --- a/Breakout.java +++ b/Breakout.java @@ -70,7 +70,9 @@ public class Breakout extends GraphicsProgram { /** Create a GRect instance */ private GRect PADDLE; - + + /** create a goval instanceBall()*/ + private GOval BALL; /* Method: run() */ @@ -80,6 +82,7 @@ public class Breakout extends GraphicsProgram { public void run() { createBricks(); getPaddle(); + addBall(); } @@ -138,10 +141,9 @@ private void createBricks() { * as a private method * and to also add mouse function */ - public Init getPaddle() { + private Init getPaddle() { double i = (getWidth() / 2- PADDLE_WIDTH/2); double k = (getHeight() - PADDLE_Y_OFFSET - PADDLE_HEIGHT); - //insert paddle PADDLE = new GRect (PADDLE_WIDTH, PADDLE_HEIGHT); PADDLE.setFilled(true); @@ -152,15 +154,23 @@ public Init getPaddle() { // makes paddle move - public void mouseClicked(MouseEvent e) { - int x = e.getX(); - } -} + public void mouseMoved(MouseEvent e){ + PADDLE.setLocation(e.getX() - PADDLE_WIDTH, PADDLE.getY()); + if (PADDLE.getX() <= 0) + PADDLE.setLocation(0, PADDLE.getY()); + if (PADDLE.getX() + PADDLE_WIDTH >= getWidth()) + PADDLE.setLocation(getWidth() - PADDLE_WIDTH, PADDLE.getY()); + } - - - - + // + private void addBall(){ + int m = (getWidth()/5 - PADDLE_WIDTH) - BALL_RADIUS; + int n = (getHeight()/2 - PADDLE_HEIGHT) - BALL_RADIUS; + BALL = new GOval(BALL_RADIUS, BALL_RADIUS); + BALL.setFilled(true); + add (BALL, m, n); + } +} From 2611d4c6a4a4f12efc8838c1ba27255288d16690 Mon Sep 17 00:00:00 2001 From: S Date: Wed, 14 Jun 2017 10:56:11 +0100 Subject: [PATCH 139/140] {"types":"C","runs":2} --- Breakout.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Breakout.java b/Breakout.java index c7224e0..705955e 100755 --- a/Breakout.java +++ b/Breakout.java @@ -164,8 +164,8 @@ public void mouseMoved(MouseEvent e){ // private void addBall(){ - int m = (getWidth()/5 - PADDLE_WIDTH) - BALL_RADIUS; - int n = (getHeight()/2 - PADDLE_HEIGHT) - BALL_RADIUS; + int m = (getWidth()/2 - PADDLE_WIDTH) - BALL_RADIUS; + int n = (getHeight()/5 - PADDLE_HEIGHT) - BALL_RADIUS; BALL = new GOval(BALL_RADIUS, BALL_RADIUS); BALL.setFilled(true); add (BALL, m, n); From 0a4ec129bbf37f734a201f7b78323dbc8f414910 Mon Sep 17 00:00:00 2001 From: S Date: Wed, 14 Jun 2017 10:56:29 +0100 Subject: [PATCH 140/140] {"types":"C","runs":3} --- Breakout.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Breakout.java b/Breakout.java index 705955e..e36fee7 100755 --- a/Breakout.java +++ b/Breakout.java @@ -165,7 +165,7 @@ public void mouseMoved(MouseEvent e){ // private void addBall(){ int m = (getWidth()/2 - PADDLE_WIDTH) - BALL_RADIUS; - int n = (getHeight()/5 - PADDLE_HEIGHT) - BALL_RADIUS; + int n = (getHeight() - PADDLE_HEIGHT) - BALL_RADIUS; BALL = new GOval(BALL_RADIUS, BALL_RADIUS); BALL.setFilled(true); add (BALL, m, n);