1
0
Fork 0

Compare commits

...

35 Commits
A2.1 ... master

Author SHA1 Message Date
rxbn_ 2a27f74846 BreakOut 5 - reset direction 2020-02-04 21:24:35 +01:00
rxbn_ 5a5d661719 BreakOut 5 - new Level design and layout 2020-02-04 20:46:47 +01:00
rxbn_ 05a4463ba8 BreakOut 5.4 2020-02-03 23:35:01 +01:00
rxbn_ 59c2f83f49 BreakOut 5.3 2020-02-03 23:34:20 +01:00
rxbn_ 59fdc12e4f BreakOut 5.2 - methods are now written according to specifications to pass JUnit tests 2020-02-01 09:50:56 +01:00
rxbn_ 90afe2d72e BreakOut 5.2 - Scoreboard 2020-01-30 21:23:00 +01:00
rxbn_ 21a7b951d6 BreakOut 5.1 - b), c) 2020-01-30 19:15:16 +01:00
rxbn_ 5ea292bbae BreakOut 5.1 - a) 2020-01-30 19:10:49 +01:00
rxbn_ b51c1c4f62 BreakOut 5.* Vorgabe 2020-01-28 13:23:40 +01:00
rxbn_ f6e8e6fcc5 minor comments and refactoring in break_out.model.Level 2020-01-25 00:01:15 +01:00
rxbn_ 87048abd6f Aufgabe 3 Feedback - minor fixes 2020-01-23 18:45:36 +01:00
rxbn_ 49f431c236 neue Abgabegruppe - 262 2020-01-16 11:05:05 +01:00
rxbn_ 041092f121 quick fix - JavaDoc 2020-01-05 14:46:43 +01:00
rxbn_ 8668f6e2b5 minor fix - longer paddles - game design decision 2020-01-05 14:41:35 +01:00
rxbn_ 9210e43b6a Aufgabe 4.4 - updateStonesAndScore, allStonesBroken 2020-01-05 14:40:52 +01:00
rxbn_ 2102f5c27b Aufgabe 4.3 - hitsStone, reflectOnStone 2020-01-05 14:14:31 +01:00
rxbn_ 0fdd579b41 Aufgabe 4.2 - drawStones 2019-12-31 15:41:10 +01:00
rxbn_ 669c37029a minor fixes 2019-12-31 15:21:40 +01:00
rxbn_ 2870a5fc9a Aufgabe 4.1 - loadLevelData 2019-12-30 16:43:24 +01:00
rxbn_ 1b829fba1e BreakOut 4.* Vorgabe 2019-12-30 16:04:19 +01:00
rxbn_ 4bec1047ed Aufgabe 3.4 2019-12-19 17:44:50 +01:00
rxbn_ 94a394438d Aufgabe 3.3 2019-12-17 22:15:00 +01:00
rxbn_ 0548e10e6b Aufgabe 3.2 2019-12-17 21:26:34 +01:00
rxbn_ ba286f548f Aufgabe 3.1 2019-12-17 20:38:47 +01:00
rxbn_ 9182e79f6b BreakOut 3.* Vorgabe - missing IStone.java 2019-12-17 20:37:54 +01:00
rxbn_ 4fe42792ee BreakOut 3.* Vorgabe + Implementation 2019-12-17 18:10:30 +01:00
rxbn_ ce770c9cc7 fix - Ball - reflectOnPaddle - wrong estimation and therefore no bottom paddle behaviour 2019-12-15 07:27:18 +01:00
rxbn_ 341aa10277 fix - createRelease - wrong file prefix 2019-12-14 12:38:40 +01:00
rxbn_ c21af90605 Ball - no blue colors according to constant GAME_BACKGROUND to prevent ghosting 2019-12-13 01:51:03 +01:00
rxbn_ 463b562645 Field - grid color with alpha value 2019-12-13 01:35:49 +01:00
rxbn_ 7b416c205e Field - game background as a constant 2019-12-13 01:30:05 +01:00
rxbn_ 584d33ae07 quick fix - first draw grid then ball 2019-12-13 01:16:04 +01:00
rxbn_ 46e689dec3 ball - new color when ball hits paddle 2019-12-13 01:14:58 +01:00
rxbn_ 087650adc8 documentation - correct javadoc for paddle constructor 2019-12-13 00:41:14 +01:00
rxbn_ 75ee56adce custom color for paddles 2019-12-12 19:20:52 +01:00
19 changed files with 1211 additions and 82 deletions

View File

@ -3,8 +3,13 @@
- Einführung in die Programmierung WS19/20 - Einführung in die Programmierung WS19/20
- Programmieren des Spieles "Breakout" basierend auf dem Framework des Instituts - Programmieren des Spieles "Breakout" basierend auf dem Framework des Instituts
# Gruppe # alte Gruppe (bis inkl. 3.)
Gruppennummer: 175 Gruppennummer: 175
Gruppenmitglieder Gruppenmitglieder
- [Ruben Meyer](mailto:ruben.meyer@student.uni-luebeck.de) - [Ruben Meyer](mailto:ruben.meyer@student.uni-luebeck.de)
- [Moritz Henseleit](mailto:moritz.henseleit@student.uni-luebeck.de) - [Moritz Henseleit](mailto:moritz.henseleit@student.uni-luebeck.de)
# neue Gruppe (ab inkl. 4.)
Gruppennummer: 262
Gruppenmitglieder:
- [Ruben Meyer](mailto:ruben.meyer@student.uni-luebeck.de)

View File

@ -1,7 +1,7 @@
#!/usr/bin/env zsh #!/usr/bin/env zsh
# project prefix # project prefix
PREFIX="175-BreakoutA" PREFIX="262-BreakOutA"
# get versioning # get versioning
echo -n "Type your tag version for '$PREFIX' (like (2.1) followed by [ENTER] for ${PREFIX}2.1): " echo -n "Type your tag version for '$PREFIX' (like (2.1) followed by [ENTER] for ${PREFIX}2.1): "

View File

@ -1,33 +1,35 @@
{ {
"field" : [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], "field" : [
[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0],
[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0],
[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 1, 0, 3, 0, 1, 0, 0, 0, 1, 2, 1, 0, 0, 0, 1, 0, 3, 0, 1, 0],
[0, 0, 2, 0, 2, 2, 2, 0, 2, 2, 0, 2, 2, 0, 0, 0, 0, 2, 2, 2, 0, 0], [0, 0, 1, 0, 1, 0, 0, 0, 0, 1, 3, 1, 0, 0, 0, 0, 1, 0, 1, 0, 0],
[0, 0, 1, 0, 0, 1, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0], [0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 2, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0],
[0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 1, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
[0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
[0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 1, 1, 1, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
[0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
[0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
[0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0], [0, 0, 0, 0, 0, 3, 3, 3, 3, 2, 1, 2, 3, 3, 3, 3, 0, 0, 0, 0, 0],
[0, 0, 3, 0, 0, 3, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 3, 3, 0, 0, 0], [0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0],
[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0],
[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0],
[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0],
[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0],
[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
],
"maxLives" : 5 "maxLives" : 5
} }

33
res/Level2.json Normal file
View File

@ -0,0 +1,33 @@
{
"field" : [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
[0, 0, 2, 0, 2, 2, 2, 0, 2, 2, 0, 2, 2, 0, 0, 0, 0, 2, 2, 2, 0, 0],
[0, 0, 1, 0, 0, 1, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0],
[0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 1, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0],
[0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0],
[0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 1, 1, 1, 0, 0],
[0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0],
[0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0],
[0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0],
[0, 0, 3, 0, 0, 3, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 3, 3, 0, 0, 0],
[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]],
"maxLives" : 5
}

33
res/Level3.json Normal file
View File

@ -0,0 +1,33 @@
{
"field" : [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
[0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
[0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
[0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
[0, 1, 1, 1, 1, 0, 0, 2, 0, 0, 0, 0, 3, 0, 0, 3, 0, 0, 0, 3, 0, 0],
[0, 1, 0, 0, 1, 1, 0, 2, 2, 2, 2, 0, 3, 3, 0, 3, 3, 0, 0, 3, 3, 0],
[0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 2, 0, 3, 3, 0, 0, 3, 0, 0, 3, 3, 0],
[0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 2, 0, 0, 3, 0, 0, 3, 0, 0, 3, 0, 0],
[0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 2, 0, 0, 3, 0, 0, 3, 0, 0, 3, 0, 0],
[0, 1, 0, 0, 0, 1, 0, 0, 0, 2, 2, 0, 0, 3, 0, 0, 3, 0, 3, 3, 0, 0],
[0, 1, 0, 0, 0, 1, 0, 0, 2, 2, 0, 0, 0, 3, 0, 0, 3, 0, 3, 0, 0, 0],
[0, 1, 0, 0, 0, 1, 0, 2, 2, 0, 0, 0, 0, 3, 0, 3, 3, 0, 3, 0, 0, 0],
[0, 1, 1, 1, 1, 1, 0, 2, 0, 0, 0, 0, 0, 3, 0, 3, 0, 0, 3, 0, 0, 0],
[0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 3, 3, 3, 0, 0, 3, 0, 0, 0],
[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 3, 3, 0, 0, 0],
[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]],
"maxLives" : 5
}

View File

@ -1,11 +1,13 @@
package break_out; package break_out;
import break_out.model.Position;
import java.awt.Color; import java.awt.Color;
/** /**
* A class that contains all constant values to configure the game * A class that contains all constant values to configure the game
* *
* @author dmlux, modified by I. Schumacher * @author dmlux, modified by I. Schumacher, modified by Gruppe 175: Ruben Meyer und Moritz Henseleit
*/ */
public class Constants { public class Constants {
@ -47,7 +49,7 @@ public class Constants {
/** /**
* The paddle width in pixels * The paddle width in pixels
*/ */
public static final Integer PADDLE_WIDTH = 70; public static final Integer PADDLE_WIDTH = 90;
/** /**
* The paddle height in pixels * The paddle height in pixels
@ -74,4 +76,54 @@ public class Constants {
*/ */
public static final Double BALL_SPEED = 1.20; public static final Double BALL_SPEED = 1.20;
/**
* The background color for the field
*/
public static final Color COLOR_GAME_BACKGROUND = new Color(64, 45, 61);
/**
* The default component color
*/
public static final Color COLOR_COMPONENT = new Color(191, 105, 145);
/**
* The component color for the bottom paddle
*/
public static final Color COLOR_PADDLE_BOTTOM = new Color(242, 173, 148);
/**
* The component color for the top paddle
*/
public static final Color COLOR_PADDLE_TOP = new Color(242, 196, 141);
/**
* The component color for the text
*/
public static final Color COLOR_TEXT = new Color(0, 0, 0);
/**
* The component color for the scoreboard
*/
public static final Color COLOR_SCOREBOARD = new Color(140, 140, 140, 144);
/**
* The padding / offset of the scoreboard to the inner text elements
*/
public static final int SCOREBOARD_OFFSET = 15;
/**
* The string for the score on the scoreboard
*/
public static final String SCOREBOARD_SCORE = "Score: ";
/**
* The string for the lives on the scoreboard
*/
public static final String SCOREBOARD_LIVES = "Lives: ";
/**
* The position for the scoreboards midpoint (bottom center)
*/
public static final Position SCOREBOARD_MIDPOINT = new Position(SCREEN_WIDTH*5/6, SCREEN_HEIGHT);
} }

View File

@ -104,7 +104,6 @@ public class Controller implements ActionListener, KeyListener {
*/ */
@Override @Override
public void keyTyped(KeyEvent e) { public void keyTyped(KeyEvent e) {
} }
/** /**
@ -114,6 +113,32 @@ public class Controller implements ActionListener, KeyListener {
*/ */
@Override @Override
public void keyPressed(KeyEvent e) { public void keyPressed(KeyEvent e) {
switch(e.getKeyCode()) {
// space bar was pressed
case KeyEvent.VK_SPACE:
// start-stop mechanism for the ball
if(!game.getLevel().ballWasStarted()) game.getLevel().startBall();
else game.getLevel().stopBall();
break;
// arrow facing left was pressed
case KeyEvent.VK_LEFT:
// paddle shall go left
game.getLevel().getPaddleBottom().setDirection(-1);
game.getLevel().getPaddleTop().setDirection(-1);
break;
// arrow facing right was pressed
case KeyEvent.VK_RIGHT:
// paddle shall go right
game.getLevel().getPaddleBottom().setDirection(+1);
game.getLevel().getPaddleTop().setDirection(+1);
break;
// escape was pressed
case KeyEvent.VK_ESCAPE:
// exit current level
game.getLevel().setFinished(true);
toStartScreen(game.getLevel().getScore());
break;
}
} }
@ -124,15 +149,26 @@ public class Controller implements ActionListener, KeyListener {
*/ */
@Override @Override
public void keyReleased(KeyEvent e) { public void keyReleased(KeyEvent e) {
switch(e.getKeyCode()) {
case KeyEvent.VK_LEFT: // arrow facing left was released
case KeyEvent.VK_RIGHT: // arrow facing right was released
// paddle shall stop
game.getLevel().getPaddleBottom().setDirection(0);
game.getLevel().getPaddleTop().setDirection(0);
break;
}
} }
/** /**
* This method switches the view to the StartScreen view. * This method switches the view to the StartScreen view.
* @param score The player score
*/ */
public void toStartScreen() { public void toStartScreen(int score) {
view.showScreen(StartScreen.class.getName()); view.showScreen(StartScreen.class.getName());
view.getStartScreen().requestFocusInWindow(); view.getStartScreen().requestFocusInWindow();
view.getStartScreen().addScore(score);
view.getStartScreen().repaint();
} }
/** /**

View File

@ -0,0 +1,111 @@
package break_out.controller;
import java.io.FileNotFoundException;
import java.io.FileReader;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import org.json.simple.JSONObject;
import org.json.simple.JSONValue;
import org.json.simple.parser.JSONParser;
import org.json.simple.parser.ParseException;
import break_out.Constants;
/**
* The <code>JSONReader</code> reads the content of an json file.
*
* @author dmlux, modified by I.Schumacher
*
*/
public class JSONReader {
/**
* The project path to the JSON file
*/
private String path;
/**
* The stones stored as List&lt;List&lt;Long&gt;&gt;
*/
private List<List<Long>> rects = new ArrayList<List<Long>>();
/**
* The stones stored as 2D-int-array
*/
private int[][] stones = new int[Constants.SQUARES_Y][Constants.SQUARES_X];
/**
* The counter with the number of trials that are allowed to break out the stones of the level
*/
private Long lifecount = null;
/**
* The constructor needs an path to create the JSONReader
*
* @param path
* The absolute path to the JSON file
*/
public JSONReader(String path) {
this.path = path;
loadJsonValues();
}
/**
* Getter for the stones of the JSON file
*
* @return The List&lt;List&lt;Long&gt;&gt; of stones
*/
public List<List<Long>> getStonesListOfLists() {
return rects;
}
/**
* Getter for the stones of the JSON file
*
* @return The stones as 2D-Array
*/
public int[][] getStones2DArray() {
for (int i = 0; i < rects.size(); i++) {
for (int j = 0; j < rects.get(i).size(); j++) {
stones[i][j] = (int)rects.get(i).get(j).longValue();
}
}
return stones;
}
/**
* Getter for the lifeCounter of the JSON file
*
* @return The lifeCounter
*/
public int getLifeCounter() {
return (int)lifecount.longValue();
}
/**
* Loader for the both values "fields" and "maxDrops" of the JSON file
*
*/
@SuppressWarnings("unchecked")
private void loadJsonValues() {
JSONParser parser = new JSONParser();
try {
Object obj = parser.parse(new FileReader(path));
String jsonStr = obj.toString();
JSONObject json = (JSONObject) JSONValue.parse(jsonStr);
rects = (List<List<Long>>) json.get("field");
lifecount = (Long)json.get("maxLives");
} catch (ParseException ex) {
ex.printStackTrace();
} catch (FileNotFoundException ex) {
ex.printStackTrace();
} catch (IOException ex) {
ex.printStackTrace();
}
}
}

View File

@ -2,6 +2,10 @@ package break_out.model;
import break_out.Constants; import break_out.Constants;
import java.awt.*;
import java.util.ArrayList;
import java.util.Random;
/** /**
* This class contains the information about the balls characteristics and behavior * This class contains the information about the balls characteristics and behavior
* *
@ -19,18 +23,38 @@ public class Ball implements IBall {
*/ */
private Vector2D direction; private Vector2D direction;
/**
* The balls hit state for paddles; custom implementation
*/
private boolean hitsPaddle;
/**
* The balls lost state for upper and lower borders
*/
private boolean isLost;
/**
* The balls color with default component color
*/
private Color color = Constants.COLOR_COMPONENT;
/**
* The stone which has been hit by the ball
*/
private Stone hitStone = null;
/** /**
* The constructor of a ball * The constructor of a ball
* The balls position and direction are initialized here. * The balls position and direction are initialized here.
*/ */
public Ball() { public Ball() {
this.position = new Position(0, 0); this.position = new Position(0, 0);
this.direction = new Vector2D(Constants.BALL_SPEED, Constants.BALL_SPEED);
this.direction.rescale();
// start at bottom-center // reset direction
this.position.setX((Constants.SCREEN_WIDTH - Constants.BALL_DIAMETER) / 2.0); resetDirection();
this.position.setY(Constants.SCREEN_HEIGHT - Constants.BALL_DIAMETER - Constants.PADDLE_HEIGHT);
// reset position to bottom-center
resetPosition();
} }
/** /**
@ -51,6 +75,53 @@ public class Ball implements IBall {
return this.direction; return this.direction;
} }
/**
* The getter for the balls color
*
* @return color The balls current color
*/
public Color getColor() { return this.color; }
/**
* The setter for the balls color
*
* @param color The balls new color
*/
public void setColor(Color color) { this.color = color; }
/**
* Creates new random color for the ball and sets it
*
* @see <a href="https://stackoverflow.com/a/4247219">Stackoverflow Answer 4247219</a>
*/
public void newRandomColor() {
Random random = new Random();
// random hue without blue colors to prevent ghosting
float hue = (random.nextInt(200)+50) / 360f;
// saturation between 0.5 and 0.7
float saturation = (random.nextInt(2000) + 5000) / 10000f;
float luminance = 0.9f;
Color randColor = Color.getHSBColor(hue, saturation, luminance);
setColor(randColor);
}
/**
* The getter for the balls hit state
*
* @return hitsPaddle The balls current hit state
*/
public boolean getHitState() { return this.hitsPaddle; }
/**
* The setter for the balls hit state
*
* @param state The balls new hit state
*/
public void setHitState(boolean state) { this.hitsPaddle = state; }
/** /**
* updates ball position * updates ball position
*/ */
@ -80,14 +151,12 @@ public class Ball implements IBall {
// reacts on top border // reacts on top border
if (this.position.getY() <= 0) { if (this.position.getY() <= 0) {
this.position.setY(0); isLost = true;
this.direction.setDy(-(this.direction.getDy()));
} }
// reacts on bottom border (+Diameter because of hitbox) // reacts on bottom border (+Diameter because of hitbox)
if (this.position.getY() >= Constants.SCREEN_HEIGHT - Constants.BALL_DIAMETER) { if (this.position.getY() >= Constants.SCREEN_HEIGHT - Constants.BALL_DIAMETER) {
this.position.setY(Constants.SCREEN_HEIGHT - Constants.BALL_DIAMETER); isLost = true;
this.direction.setDy(-(this.direction.getDy()));
} }
} }
@ -153,7 +222,7 @@ public class Ball implements IBall {
// only two paddles defined in the game design, therefore greater or smaller than middle of screen // only two paddles defined in the game design, therefore greater or smaller than middle of screen
//deciding if the paddle is at the top or bottom to adjust if its +or- y direction //deciding if the paddle is at the top or bottom to adjust if its +or- y direction
if (paddle.getPosition().getY() <= Constants.SCREEN_HEIGHT) { if (paddle.getPosition().getY() <= Constants.SCREEN_HEIGHT/2.0) {
// top paddle // top paddle
reflectionPoint.setY(reflectionPoint.getY() - Constants.REFLECTION_OFFSET); reflectionPoint.setY(reflectionPoint.getY() - Constants.REFLECTION_OFFSET);
} else { } else {
@ -176,6 +245,163 @@ public class Ball implements IBall {
// replace direction vector // replace direction vector
this.direction.setDx(reflectionVector.getDx()); this.direction.setDx(reflectionVector.getDx());
this.direction.setDy(reflectionVector.getDy()); this.direction.setDy(reflectionVector.getDy());
} }
/**
* tests whether the ball touches any stone's hit box
* @param stones list of stones on the playground
* @return true if the ball touches a stone
*/
public boolean hitsStone(ArrayList<Stone> stones) {
// ball as a Rectangle
Rectangle rectBall = new Rectangle((int) getPosition().getX(), (int) getPosition().getY(), Constants.BALL_DIAMETER, Constants.BALL_DIAMETER);
// size of grid blocks
int blockWidth = Constants.SCREEN_WIDTH / Constants.SQUARES_X;
int blockHeight = Constants.SCREEN_HEIGHT / Constants.SQUARES_Y;
// foreach stone in stones
for(Stone stone : stones) {
if(stone != null) {
// stone as a Rectangle based on view.Field
Rectangle rectStone = new Rectangle((int) stone.getPosition().getX()+1, (int) stone.getPosition().getY()+1, blockWidth-1, blockHeight-1);
// if ball intersects with stone which is existent and visible
if(rectBall.intersects(rectStone) && stone.getColor() != null) {
// set stone and return true
hitStone = stone;
// reflect ball
reflectOnStone(hitStone);
return true;
}
}
}
return false;
}
/**
* returns the stone which got hit, can be null
* @return the stone which got hit
*/
public Stone getHitStone() {
return hitStone;
}
/**
* Ball got hit by Stone stone
* @param stone hitbox mechanism of stone
*/
public void reflectOnStone(Stone stone) {
// reflection model based on view.Field rendering model
// size of grid blocks
int blockWidth = Constants.SCREEN_WIDTH / Constants.SQUARES_X;
int blockHeight = Constants.SCREEN_HEIGHT / Constants.SQUARES_Y;
// ball as a Rectangle
Rectangle rectBall = new Rectangle((int) getPosition().getX(), (int) getPosition().getY(), Constants.BALL_DIAMETER, Constants.BALL_DIAMETER);
// stone as a Rectangle
Rectangle rectStone = new Rectangle((int) stone.getPosition().getX()+1, (int) stone.getPosition().getY()+1, blockWidth-1, blockHeight-1);
// stones borders as Rectangle's
Rectangle topBorder = new Rectangle((int) stone.getPosition().getX(), (int) stone.getPosition().getY(), blockWidth, 1);
Rectangle bottomBorder = new Rectangle((int) stone.getPosition().getX(), (int) stone.getPosition().getY()+blockHeight, blockWidth, 1);
Rectangle leftBorder = new Rectangle((int) stone.getPosition().getX(), (int) stone.getPosition().getY(), 1, blockHeight);
Rectangle rightBorder = new Rectangle((int) stone.getPosition().getX()+blockWidth, (int) stone.getPosition().getY(), 1, blockHeight);
//System.out.println(String.format("ball (%s, %s) stone (%s, %s)", getPosition().getX(), getPosition().getY(), stone.getPosition().getX(), stone.getPosition().getY()));
// if stone intersects with any bounds
if(rectBall.intersects(rectStone.getBounds())) {
// corner intersections
if((rectBall.intersects(leftBorder) || rectBall.intersects(rightBorder)) && (rectBall.intersects(topBorder) || rectBall.intersects(bottomBorder))) {
// intersections as Rectangle's
Rectangle intersTop = rectBall.intersection(topBorder);
Rectangle intersBottom = rectBall.intersection(bottomBorder);
Rectangle intersLeft = rectBall.intersection(leftBorder);
Rectangle intersRight = rectBall.intersection(rightBorder);
// rectangles as area to determine corner
double areaIntersTop = intersTop.getHeight() * intersTop.getWidth();
double areaIntersBottom = intersBottom.getHeight() * intersBottom.getWidth();
double areaIntersLeft = intersLeft.getHeight() * intersLeft.getWidth();
double areaIntersRight = intersRight.getHeight() * intersRight.getWidth();
//System.out.printf("ut, ub, ul, ur: %s %s %s %s\r\n", areaIntersTop, areaIntersBottom, areaIntersLeft, areaIntersRight);
// top side
if(areaIntersTop > 0) {
// left|right border
if(areaIntersLeft > areaIntersTop || areaIntersRight > areaIntersTop) direction.setDx(-getDirection().getDx());
// top border
else direction.setDy(-getDirection().getDy());
}
// bottom side
if(areaIntersBottom > 0) {
// left|right border
if(areaIntersLeft > areaIntersBottom || areaIntersRight > areaIntersBottom) direction.setDx(-getDirection().getDx());
// bottom border
else direction.setDy(-getDirection().getDy());
}
// return; intersection already handled
return;
}
// vertical bounds
if(rectBall.intersects(leftBorder) || rectBall.intersects(rightBorder)) {
//System.out.println("left|right border");
direction.setDx(-getDirection().getDx());
}
// horizontal bounds
if(rectBall.intersects(topBorder) || rectBall.intersects(bottomBorder)) {
//System.out.println("top|bottom border");
direction.setDy(-getDirection().getDy());
}
}
}
/**
* The getter for balls lost state
* @return balls lost state
*/
public boolean isLost() {
return isLost;
}
/**
* The setter for balls lost state
* @param lost balls lost state
*/
public void setLost(boolean lost) {
isLost = lost;
}
/**
* resets balls position
*/
public void resetPosition() {
// start at bottom-center
position.setX((Constants.SCREEN_WIDTH - Constants.BALL_DIAMETER) / 2.0);
position.setY(Constants.SCREEN_HEIGHT - Constants.BALL_DIAMETER - Constants.PADDLE_HEIGHT);
}
/**
* resets balls direction
*/
public void resetDirection() {
direction = new Vector2D(Constants.BALL_SPEED, Constants.BALL_SPEED);
direction.rescale();
}
} }

View File

@ -36,7 +36,7 @@ public class Game {
/** /**
* The last levelnumber * The last levelnumber
*/ */
private int maxLevel = 1; private int maxLevel = 3;
/** /**
* The total score of the game * The total score of the game
@ -114,7 +114,7 @@ public class Game {
controller.toPlayground(); controller.toPlayground();
} else { } else {
// tells the controller to switch to the startScreen of the game // tells the controller to switch to the startScreen of the game
controller.toStartScreen(); controller.toStartScreen(level.getScore());
} }

View File

@ -1,5 +1,7 @@
package break_out.model; package break_out.model;
import java.util.ArrayList;
public interface IBall { public interface IBall {
// Exercise 1 // Exercise 1
@ -11,4 +13,11 @@ public interface IBall {
// Exercise 2 // Exercise 2
public boolean hitsPaddle(Paddle paddle); public boolean hitsPaddle(Paddle paddle);
public void reflectOnPaddle(Paddle paddle); public void reflectOnPaddle(Paddle paddle);
// Exercise 4
public boolean hitsStone(ArrayList<Stone> stones);
public Stone getHitStone();
// Exercise 5
public boolean isLost();
} }

View File

@ -1,8 +1,18 @@
package break_out.model; package break_out.model;
import java.util.ArrayList;
public interface ILevel { public interface ILevel {
// Exercise 1 // Exercise 1
public Ball getBall(); public Ball getBall();
// Exercise 2
public Paddle getPaddleTop(); public Paddle getPaddleTop();
public Paddle getPaddleBottom(); public Paddle getPaddleBottom();
// Exercise 3
public void setFinished(boolean finished);
// Exercise 4
public ArrayList<Stone> getStones();
} }

View File

@ -9,9 +9,13 @@ public interface IPaddle {
public void setPosition(Position position); public void setPosition(Position position);
public Color getColor(); public Color getColor();
public void setColor(Color color); public void setColor(Color color);
public double getWidth(); public int getWidth();
public void setWidth(double width); public void setWidth(int width);
public double getHeight(); public int getHeight();
public void setHeight(double height); public void setHeight(int height);
// Exercise 3
public int getDirection();
public void setDirection(int direction);
public void updatePosition(Ball ball);
} }

View File

@ -0,0 +1,17 @@
package break_out.model;
import java.awt.*;
public interface IStone {
// Exercise 3
public int getType();
public int getValue();
public Color getColor();
public Position getPosition();
public void setType(int type);
public void setValue(int value);
public void setColor(Color color);
public void setPosition(Position position);
}

View File

@ -2,6 +2,9 @@ package break_out.model;
import break_out.Constants; import break_out.Constants;
import break_out.controller.JSONReader;
import java.util.ArrayList;
/** /**
* This class contains information about the running game * This class contains information about the running game
@ -34,13 +37,28 @@ public class Level extends Thread implements ILevel {
/** /**
* Flag that shows if the ball was started * Flag that shows if the ball was started
*/ */
private boolean ballWasStarted = true; private boolean ballWasStarted = false;
/**
* Flag that shows if the level was finished
*/
private boolean finished = false;
/** /**
* The paddles of the level * The paddles of the level
*/ */
private Paddle paddleTop, paddleBottom; private Paddle paddleTop, paddleBottom;
/**
* The stones of the level
*/
private ArrayList<Stone> stones = new ArrayList<>();
/**
* The life counter of the level
*/
private int lifeCounter;
/** /**
* The constructor creates a new level object and needs the current game object, * The constructor creates a new level object and needs the current game object,
* the number of the level to be created and the current score * the number of the level to be created and the current score
@ -55,13 +73,11 @@ public class Level extends Thread implements ILevel {
this.score = score; this.score = score;
this.ball = new Ball(); this.ball = new Ball();
// calc paddle positions resetPaddles();
Position posPaddleTop = new Position((Constants.SCREEN_WIDTH - Constants.PADDLE_WIDTH) / 2.0, 0);
Position posPaddleBottom = new Position((Constants.SCREEN_WIDTH - Constants.PADDLE_WIDTH) / 2.0, Constants.SCREEN_HEIGHT - Constants.PADDLE_HEIGHT);
// set paddles // set paddles color
this.paddleTop = new Paddle(posPaddleTop); this.paddleTop.setColor(Constants.COLOR_PADDLE_TOP);
this.paddleBottom = new Paddle(posPaddleBottom); this.paddleBottom.setColor(Constants.COLOR_PADDLE_BOTTOM);
loadLevelData(levelnr); loadLevelData(levelnr);
} }
@ -105,19 +121,51 @@ public class Level extends Thread implements ILevel {
game.notifyObservers(); game.notifyObservers();
// endless loop // endless loop
while (true) { while (!finished) {
// if ballWasStarted is true, the ball is moving // if ballWasStarted is true, the ball is moving
if (ballWasStarted) { if (ballWasStarted()) {
// Call here the balls method for updating his position on the playground // Call here the balls method for updating his position on the playground
this.ball.updatePosition(); getBall().updatePosition();
// Call here the balls method for reacting on the borders of the playground // Call here the balls method for reacting on the borders of the playground
this.ball.reactOnBorder(); getBall().reactOnBorder();
// Call here the balls method for reacting on lost ball state
if(getBall().isLost()) {
decreaseLives();
}
// if ball hits paddle (top|bottom), reflect ball // if ball hits paddle (top|bottom), reflect ball
if(this.ball.hitsPaddle(paddleTop)) this.ball.reflectOnPaddle(paddleTop); if(getBall().hitsPaddle(paddleTop)) getBall().reflectOnPaddle(paddleTop);
if(this.ball.hitsPaddle(paddleBottom)) this.ball.reflectOnPaddle(paddleBottom); if(getBall().hitsPaddle(paddleBottom)) getBall().reflectOnPaddle(paddleBottom);
if(getBall().hitsPaddle(paddleTop) || getBall().hitsPaddle(paddleBottom)) {
getBall().setHitState(true);
// DEBUG OUTPUT
//System.out.println(String.format("hitstate: %s, color: %s", this.ball.getHitState(), this.ball.getColor().getRGB()));
}
// if ball has hit a paddle set a new random color to it
else if(getBall().getHitState()) {
getBall().setHitState(false);
getBall().newRandomColor();
}
// Call here the balls method for reacting on stones of the playground
if(getBall().hitsStone(getStones())) {
updateStonesAndScore();
//System.out.println("count: "+stones.size());
}
// if all stones are broken, go to next level
if(allStonesBroken()) {
// next level
//System.out.println("next level");
}
// update paddles position
getPaddleTop().updatePosition(getBall());
getPaddleBottom().updatePosition(getBall());
// Tells the observer to repaint the components on the playground // Tells the observer to repaint the components on the playground
@ -139,7 +187,35 @@ public class Level extends Thread implements ILevel {
* @param levelnr The number X for the LevelX.json file * @param levelnr The number X for the LevelX.json file
*/ */
private void loadLevelData(int levelnr) { private void loadLevelData(int levelnr) {
JSONReader reader = new JSONReader(String.format("res/Level%s.json", levelnr));
int[][] stoneTypes = reader.getStones2DArray();
// life counter
lifeCounter = reader.getLifeCounter();
// clear stones list, not needed but could cause problems when not done
stones.clear();
// foreach column
for(int y = 0; y < stoneTypes.length; y++) {
// foreach element in column x
for(int x = 0; x < stoneTypes[y].length; x++) {
Position tempPos = new Position(-1, -1);
// position calculation, equivalent to grid calculation in "view.Field"
// size of grid blocks
int blockWidth = Constants.SCREEN_WIDTH / Constants.SQUARES_X;
int blockHeight = Constants.SCREEN_HEIGHT / Constants.SQUARES_Y;
tempPos.setX(blockWidth * x);
tempPos.setY(blockHeight * y);
Stone tempStone = new Stone(stoneTypes[y][x], tempPos);
// add stone to list
if(tempStone.getType() != 0)
stones.add(tempStone);
}
}
} }
/** /**
@ -160,6 +236,115 @@ public class Level extends Thread implements ILevel {
return paddleBottom; return paddleBottom;
} }
/**
* The setter for the levels game state
* @param finished game state
*/
public void setFinished(boolean finished) {
this.finished = finished;
}
/**
* The getter for the levels stones
* @return stones The stones of the level
*/
public ArrayList<Stone> getStones() {
// hacky workaround for ConcurrentModificationExceptions
ArrayList<Stone> copy = new ArrayList<>();
copy.addAll(stones);
return copy;
}
/**
* The updater for the levels stones and the player score
*/
private void updateStonesAndScore() {
// hit stone
Stone stone = getBall().getHitStone();
// add value to score
score += stone.getValue();
// set new type
stone.setType(stone.getType()-1);
// stones type is 0? remove it!
if(stone.getType() == 0) {
stones.remove(stone);
}
if(allStonesBroken()) {
setFinished(true);
nextLevel();
}
}
/**
* checks whether all stones are broken
* @return true when all stones are broken
*/
private boolean allStonesBroken() {
return stones.isEmpty();
}
/**
* decreases the lives and interact to the new count
*/
private void decreaseLives() {
lifeCounter--;
// reset paddles to center pos
if(lifeCounter > 0) {
resetPaddles();
getBall().resetPosition();
getBall().resetDirection();
getBall().setLost(false);
stopBall();
// level failed
} else {
setFinished(true);
game.getController().toStartScreen(getScore());
}
}
/**
* resets paddles position and or init them
*/
private void resetPaddles() {
// calc paddle positions
Position posPaddleTop = new Position((Constants.SCREEN_WIDTH - Constants.PADDLE_WIDTH) / 2.0, 0);
Position posPaddleBottom = new Position((Constants.SCREEN_WIDTH - Constants.PADDLE_WIDTH) / 2.0, Constants.SCREEN_HEIGHT - Constants.PADDLE_HEIGHT);
// resets top paddle
if(paddleTop == null) paddleTop = new Paddle(posPaddleTop);
else paddleTop.setPosition(posPaddleTop);
// resets bottom paddle
if(paddleBottom == null) paddleBottom = new Paddle(posPaddleBottom);
else paddleBottom.setPosition(posPaddleBottom);
}
/**
* The getter for levels score
* @return the score
*/
public int getScore() {
return score;
}
/**
* The getter for levels lives
* @return the life counter
*/
public int getLives() {
return lifeCounter;
}
/**
* switch to next level
*/
public void nextLevel() {
game.createLevel(++levelnr, score);
}
} }

View File

@ -16,11 +16,17 @@ public class Paddle implements IPaddle {
*/ */
private Position position; private Position position;
/**
* The paddles direction on the playground
* only -1,0,+1 are valid values
*/
private int direction;
/** /**
* The paddles sizing * The paddles sizing
*/ */
private double width; private int width;
private double height; private int height;
/** /**
* The paddles color * The paddles color
@ -29,6 +35,8 @@ public class Paddle implements IPaddle {
/** /**
* The constructor of a paddle * The constructor of a paddle
*
* @param position paddles initial position
*/ */
public Paddle(Position position) { public Paddle(Position position) {
this.position = position; this.position = position;
@ -82,7 +90,7 @@ public class Paddle implements IPaddle {
* *
* @return width The paddles current width * @return width The paddles current width
*/ */
public double getWidth() { public int getWidth() {
return width; return width;
} }
@ -91,7 +99,7 @@ public class Paddle implements IPaddle {
* *
* @param width The paddles new width * @param width The paddles new width
*/ */
public void setWidth(double width) { public void setWidth(int width) {
this.width = width; this.width = width;
} }
@ -100,7 +108,7 @@ public class Paddle implements IPaddle {
* *
* @return height The paddles current height * @return height The paddles current height
*/ */
public double getHeight() { public int getHeight() {
return height; return height;
} }
@ -109,7 +117,55 @@ public class Paddle implements IPaddle {
* *
* @param height The paddles new height * @param height The paddles new height
*/ */
public void setHeight(double height) { public void setHeight(int height) {
this.height = height; this.height = height;
} }
/**
* The getter for the paddles direction
*
* @return direction The paddles current direction
*/
public int getDirection() {
return direction;
}
/**
* The setter for the paddles direction
*
* @param direction The paddles new direction
*/
public void setDirection(int direction) {
// normalization not needed
// normalize to valid values
//if(direction > 0) direction = 1;
//if(direction < 0) direction = -1;
this.direction = direction;
}
/**
* Updates paddles position based on balls position
*
* @param ball The ball
*/
public void updatePosition(Ball ball) {
// move paddle, if it is the nearest paddle
if(ball.getPosition().getY() < Constants.SCREEN_HEIGHT/2.0 && getPosition().getY() < Constants.SCREEN_HEIGHT/2.0 ||
ball.getPosition().getY() > Constants.SCREEN_HEIGHT/2.0 && getPosition().getY() > Constants.SCREEN_HEIGHT/2.0) {
// temporary position to modify x value
Position tmp = getPosition();
// modify x value; getDirection is normalized to the values {-1, 0, 1}
// therefore we can just multiply it with DX_MOVEMENT
tmp.setX(getPosition().getX() + getDirection()*Constants.DX_MOVEMENT);
// out of border boundaries
if(tmp.getX() <= 0) tmp.setX(0);
if(tmp.getX() >= Constants.SCREEN_WIDTH-getWidth()) tmp.setX(Constants.SCREEN_WIDTH-getWidth());
setPosition(tmp);
}
}
} }

View File

@ -0,0 +1,147 @@
package break_out.model;
import java.awt.*;
/**
* This class contains information about the stones characteristics and behaviour
*
* @author Gruppe 175: Moritz Henseleit, Rubn Meyer
*/
public class Stone implements IStone {
/**
* The stones type
*/
private int type;
/**
* The stones value according to the stones type to calculate players score
*/
private int value;
/**
* The stones color according to the stones type
*/
private Color color;
/**
* The stones position on the playground
*/
private Position position;
/**
* The constructor of a stone
*
* @param type stones initial type
* @param position stones initial position
*/
public Stone(int type, Position position) {
// sets type; and value and color according to stone type
setType(type);
// sets position
setPosition(position);
}
/**
* The getter for the stones value to calculate players score
*
* @return stones value
*/
public int getValue() {
return this.value;
}
/**
* The setter for the stones value
*
* @param value The stones new value
*/
public void setValue(int value) {
this.value = value;
}
/**
* The getter for the stones color
* Can be null because a stone could not exist
*
* @return The stones color
*/
public Color getColor() {
return this.color;
}
/**
* The setter for the stones color
*
* @param color The stones new color
*/
public void setColor(Color color) {
this.color = color;
}
/**
* The getter for the stones position
*
* @return The stones position
*/
public Position getPosition() {
return this.position;
}
/**
* The setter for the stones position
*
* @param position The stones new position
*/
public void setPosition(Position position) {
this.position = position;
}
/**
* The getter for the stones type
*
* @return The stones type
*/
public int getType() {
return this.type;
}
/**
* The setter for the stones type
*
* @param type The stones new type
*/
public void setType(int type) {
// set the type; no verification needed;
this.type = type;
switch(type) {
// multi-case, hacky, but dont care
case 0:
// nah, isn't a stone
default:
// default case, not in range
// setting to not a stone
setColor(null);
break;
case 1:
// stone type one
setColor(new Color(77, 80, 140));
setValue(1);
break;
case 2:
// stone type two
setColor(new Color(242, 191, 94));
setValue(2);
break;
case 3:
// stone type three
setColor(new Color(242, 80, 65));
setValue(3);
break;
}
}
}

View File

@ -1,14 +1,21 @@
package break_out.view; package break_out.view;
import java.awt.Color; import java.awt.Color;
import java.awt.Dimension;
import java.awt.Graphics; import java.awt.Graphics;
import java.awt.Graphics2D; import java.awt.Graphics2D;
import java.awt.Dimension;
import java.awt.RenderingHints; import java.awt.RenderingHints;
import java.awt.Font;
import java.awt.font.TextAttribute;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
import javax.swing.JPanel; import javax.swing.JPanel;
import break_out.Constants; import break_out.Constants;
import break_out.model.Position;
import break_out.model.Stone;
import net.miginfocom.swing.MigLayout; import net.miginfocom.swing.MigLayout;
/** /**
@ -42,7 +49,7 @@ public class Field extends JPanel {
super(); super();
this.view = view; this.view = view;
this.background = new Color(177, 92, 107); this.background = Constants.COLOR_GAME_BACKGROUND;
setFocusable(true); setFocusable(true);
@ -94,20 +101,26 @@ public class Field extends JPanel {
g2.fillRect(0, 0, getWidth(), getHeight()); g2.fillRect(0, 0, getWidth(), getHeight());
// Setting the color for the following components // Setting the color for the following components
g2.setColor(new Color(200, 200, 200)); g2.setColor(Constants.COLOR_COMPONENT);
// Calls the method for drawing the ball
drawBall(g2);
// Calls the method for drawing the grid // Calls the method for drawing the grid
drawGrid(g2); drawGrid(g2);
// Calls the method for drawing the stones
drawStones(g2);
// Calls the method for drawing the ball
drawBall(g2);
// Calls the method for drawing the bottom paddle // Calls the method for drawing the bottom paddle
drawPaddleBottom(g2); drawPaddleBottom(g2);
// Calls the method for drawing the top paddle // Calls the method for drawing the top paddle
drawPaddleTop(g2); drawPaddleTop(g2);
// Calls the method for drawing the scoreboard
drawScoreboard(g2);
} }
/** /**
@ -116,10 +129,17 @@ public class Field extends JPanel {
* @param g2 The graphics object * @param g2 The graphics object
*/ */
private void drawBall(Graphics2D g2) { private void drawBall(Graphics2D g2) {
// temporarily save default component color to draw ball in specific color
Color temp = g2.getColor();
g2.setColor(view.getGame().getLevel().getBall().getColor());
g2.fillOval((int) view.getGame().getLevel().getBall().getPosition().getX(), g2.fillOval((int) view.getGame().getLevel().getBall().getPosition().getX(),
(int) view.getGame().getLevel().getBall().getPosition().getY(), (int) view.getGame().getLevel().getBall().getPosition().getY(),
Constants.BALL_DIAMETER, Constants.BALL_DIAMETER,
Constants.BALL_DIAMETER); Constants.BALL_DIAMETER);
// reset color to default
g2.setColor(temp);
} }
/** /**
@ -133,6 +153,13 @@ public class Field extends JPanel {
int blockWidth = Constants.SCREEN_WIDTH / Constants.SQUARES_X; int blockWidth = Constants.SCREEN_WIDTH / Constants.SQUARES_X;
int blockHeight = Constants.SCREEN_HEIGHT / Constants.SQUARES_Y; int blockHeight = Constants.SCREEN_HEIGHT / Constants.SQUARES_Y;
// temporarily save default component color to draw ball in specific color
Color temp = g2.getColor();
// Component color with alpha
Color withAlpha = new Color(g2.getColor().getRed(), g2.getColor().getGreen(), g2.getColor().getBlue(), 170);
g2.setColor(withAlpha);
// draw vertical lines // draw vertical lines
for (int i = 1; i < Constants.SQUARES_X; i++) { for (int i = 1; i < Constants.SQUARES_X; i++) {
g2.drawLine(i * blockWidth, 0, i * blockWidth, Constants.SCREEN_HEIGHT); g2.drawLine(i * blockWidth, 0, i * blockWidth, Constants.SCREEN_HEIGHT);
@ -142,6 +169,9 @@ public class Field extends JPanel {
for (int i = 1; i < Constants.SQUARES_Y; i++) { for (int i = 1; i < Constants.SQUARES_Y; i++) {
g2.drawLine(0, i * blockHeight, Constants.SCREEN_WIDTH, i * blockHeight); g2.drawLine(0, i * blockHeight, Constants.SCREEN_WIDTH, i * blockHeight);
} }
// reset color to default
g2.setColor(temp);
} }
/** /**
@ -150,6 +180,10 @@ public class Field extends JPanel {
* @param g2 The graphics object * @param g2 The graphics object
*/ */
private void drawPaddleBottom(Graphics2D g2) { private void drawPaddleBottom(Graphics2D g2) {
// temporarily save default component color to draw paddle in specific color
Color temp = g2.getColor();
g2.setColor(view.getGame().getLevel().getPaddleBottom().getColor());
// fillRoundRect(x, y, width, height, arcWidth, arcHeight) // fillRoundRect(x, y, width, height, arcWidth, arcHeight)
g2.fillRoundRect((int) view.getGame().getLevel().getPaddleBottom().getPosition().getX(), g2.fillRoundRect((int) view.getGame().getLevel().getPaddleBottom().getPosition().getX(),
(int) view.getGame().getLevel().getPaddleBottom().getPosition().getY(), (int) view.getGame().getLevel().getPaddleBottom().getPosition().getY(),
@ -157,6 +191,9 @@ public class Field extends JPanel {
(int) view.getGame().getLevel().getPaddleBottom().getHeight(), (int) view.getGame().getLevel().getPaddleBottom().getHeight(),
10, 10,
10); 10);
// reset color to default
g2.setColor(temp);
} }
/** /**
@ -165,6 +202,10 @@ public class Field extends JPanel {
* @param g2 The graphics object * @param g2 The graphics object
*/ */
private void drawPaddleTop(Graphics2D g2) { private void drawPaddleTop(Graphics2D g2) {
// temporarily save default component color to draw paddle in specific color
Color temp = g2.getColor();
g2.setColor(view.getGame().getLevel().getPaddleTop().getColor());
// fillRoundRect(x, y, width, height, arcWidth, arcHeight) // fillRoundRect(x, y, width, height, arcWidth, arcHeight)
g2.fillRoundRect((int) view.getGame().getLevel().getPaddleTop().getPosition().getX(), g2.fillRoundRect((int) view.getGame().getLevel().getPaddleTop().getPosition().getX(),
(int) view.getGame().getLevel().getPaddleTop().getPosition().getY(), (int) view.getGame().getLevel().getPaddleTop().getPosition().getY(),
@ -172,6 +213,139 @@ public class Field extends JPanel {
(int) view.getGame().getLevel().getPaddleTop().getHeight(), (int) view.getGame().getLevel().getPaddleTop().getHeight(),
10, 10,
10); 10);
// reset color to default
g2.setColor(temp);
}
/**
* Draws the stones
*
* @param g2 The graphics object
*/
private void drawStones(Graphics2D g2) {
// query stones
ArrayList<Stone> stones = view.getGame().getLevel().getStones();
// foreach stone
for(Stone stone : stones) {
Position pos = stone.getPosition();
// size of grid blocks
int blockWidth = Constants.SCREEN_WIDTH / Constants.SQUARES_X;
int blockHeight = Constants.SCREEN_HEIGHT / Constants.SQUARES_Y;
// if stone has a color, draw it
if(stone.getColor() != null) {
// temporarily save default component color to draw stone in specific color
Color temp = g2.getColor();
g2.setColor(stone.getColor());
// fillRoundRect(x, y, width, height, arcWidth, arcHeight)
g2.fillRoundRect((int) pos.getX()+1,
(int) pos.getY()+1,
(int) blockWidth-1,
(int) blockHeight-1,
0,
0);
// reset color to default
g2.setColor(temp);
}
}
}
/**
* Draws the scoreboard with score and lives
* @param g2
*/
private void drawScoreboard(Graphics2D g2) {
Font currentFont = g2.getFont();
// source: <a href="https://stackoverflow.com/questions/18249592/"> Stackoverflow Question - 18249592 </a>
Map<TextAttribute, Object> attributes = new HashMap<>();
attributes.put(TextAttribute.FAMILY, currentFont.getFamily());
attributes.put(TextAttribute.WEIGHT, TextAttribute.WEIGHT_BOLD);
attributes.put(TextAttribute.SIZE, (int) (currentFont.getSize() * 1.8));
Font myFont = Font.getFont(attributes);
g2.setFont(myFont);
// temporarily save default component color to draw text and background in specific color
Color temp = g2.getColor();
// draw background in specific color
g2.setColor(Constants.COLOR_SCOREBOARD);
// bottom centered mid-point
int midX = (int) Constants.SCOREBOARD_MIDPOINT.getX();
int midY = (int) Constants.SCOREBOARD_MIDPOINT.getY();
int offset = Constants.SCOREBOARD_OFFSET;
// calculate rendered string width
int scoreWidth = g2.getFontMetrics().stringWidth(Constants.SCOREBOARD_SCORE + view.getGame().getLevel().getScore());
int lifeWidth = g2.getFontMetrics().stringWidth(Constants.SCOREBOARD_LIVES + view.getGame().getLevel().getLives());
int maxWidth = Math.max(scoreWidth, lifeWidth); // max width
int fontSize = g2.getFontMetrics().getHeight(); // font size
// fillRoundRect(x, y, width, height, arcWidth, arcHeight)
g2.fillRoundRect((midX)-offset-maxWidth/2, midY-2*offset-3*fontSize, maxWidth+2*offset, 2*(fontSize+offset), 5, 5);
// draw text in specific color (sharing g2 object and therefore also color)
g2.setColor(Constants.COLOR_TEXT);
// draw score and lives
drawScore(g2);
drawLives(g2);
// reset color and font
g2.setColor(temp);
g2.setFont(currentFont);
}
/**
* Draws the score
*
* @param g2 The graphics object
*/
private void drawScore(Graphics2D g2) {
int score = view.getGame().getLevel().getScore();
int fontSize = g2.getFontMetrics().getHeight(); // font size
// bottom centered mid-point
int x = (int) Constants.SCOREBOARD_MIDPOINT.getX();
int y = (int) Constants.SCOREBOARD_MIDPOINT.getY()-(int)((3.0/2.0)*fontSize);
String str = Constants.SCOREBOARD_SCORE+score;
x -= g2.getFontMetrics().stringWidth(str)/2; // because x is middle position on x axis
// draw string
g2.drawString(str, x, y);
}
/**
* Draws the life counter
*
* @param g2 The graphics object
*/
private void drawLives(Graphics2D g2) {
int lives = view.getGame().getLevel().getLives();
int fontSize = g2.getFontMetrics().getHeight(); // font size
// bottom centered mid-point
int x = (int) Constants.SCOREBOARD_MIDPOINT.getX();
int y = (int) Constants.SCOREBOARD_MIDPOINT.getY()-3*fontSize;
String str = Constants.SCOREBOARD_LIVES+lives;
x -= g2.getFontMetrics().stringWidth(str)/2; // because x is middle position on x axis
// draw string
g2.drawString(str, x, y);
} }
} }

View File

@ -51,6 +51,11 @@ public class StartScreen extends JPanel {
*/ */
private JLabel error; private JLabel error;
/**
* The scoreMenu
*/
private SectionPanel scoreMenu;
/** /**
* The constructor needs a view * The constructor needs a view
@ -125,16 +130,16 @@ public class StartScreen extends JPanel {
*/ */
private void initializeScoreMenu() { private void initializeScoreMenu() {
// The layout // The layout
SectionPanel scoreMenu = new SectionPanel(Color.WHITE); scoreMenu = new SectionPanel(Color.WHITE);
scoreMenu.shady = false; scoreMenu.shady = false;
scoreMenu.setLayout(new MigLayout("", "10[center, grow, fill]10", scoreMenu.setLayout(new MigLayout("", "10[center, grow, fill]10",
"5[center]5")); "5[center]5"));
// adding the compoenents to the layout // adding the components to the layout
JLabel headline = new JLabel("Scores"); JLabel headline = new JLabel("Scores");
headline.setFont(new Font("Sans-serif", Font.PLAIN, 16)); headline.setFont(new Font("Sans-serif", Font.PLAIN, 16));
headline.setHorizontalAlignment(SwingConstants.CENTER); headline.setHorizontalAlignment(SwingConstants.CENTER);
scoreMenu.add(headline, "cell 0 0, gaptop 5"); scoreMenu.add(headline, "cell 0 0, gaptop 5, wrap");
add(scoreMenu, "cell 1 0, gapleft 5"); add(scoreMenu, "cell 1 0, gapleft 5");
} }
@ -200,4 +205,28 @@ public class StartScreen extends JPanel {
error.setText(""); error.setText("");
} }
/**
* Adds a score to the scoreboard
* @param score
*/
public void addScore(int score) {
// adding the components to the layout
// name
JLabel lName = new JLabel(getPlayersName());
lName.setFont(new Font("Sans-serif", Font.PLAIN, 16));
lName.setHorizontalAlignment(SwingConstants.CENTER);
scoreMenu.add(lName, "gaptop 5");
// spacing
JLabel space = new JLabel();
scoreMenu.add(space);
// score
JLabel lScore = new JLabel(String.valueOf(score));
lScore.setFont(new Font("Sans-serif", Font.PLAIN, 16));
lScore.setHorizontalAlignment(SwingConstants.CENTER);
scoreMenu.add(lScore, "gaptop 5, wrap");
}
} }