Mercurial > hg > ristipolku
annotate game/Engine.java @ 162:e8eeac403e5f
Backed out changeset fb33d3796942
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Thu, 01 Dec 2016 14:33:25 +0200 |
| parents | src/Engine.java@fb33d3796942 |
| children | 2b2fa62cfea5 |
| rev | line source |
|---|---|
| 0 | 1 /* |
| 9 | 2 * Ristipolku Game Engine |
| 151 | 3 * (C) Copyright 2011 Matti 'ccr' Hämäläinen <ccr@tnsp.org> |
| 0 | 4 */ |
| 9 | 5 package game; |
| 6 | |
| 0 | 7 import java.awt.*; |
| 8 import java.awt.geom.*; | |
| 1 | 9 import java.awt.event.*; |
| 7 | 10 import java.awt.image.*; |
| 11 import java.awt.event.*; | |
| 25 | 12 import java.awt.font.*; |
| 9 | 13 import javax.imageio.*; |
| 7 | 14 import javax.swing.*; |
| 1 | 15 import java.util.*; |
|
131
67b2322fda91
Add spawning of animated score elements when player finishes a turn.
Matti Hamalainen <ccr@tnsp.org>
parents:
124
diff
changeset
|
16 import java.util.concurrent.locks.Lock; |
|
67b2322fda91
Add spawning of animated score elements when player finishes a turn.
Matti Hamalainen <ccr@tnsp.org>
parents:
124
diff
changeset
|
17 import java.util.concurrent.locks.ReentrantReadWriteLock; |
| 6 | 18 import java.io.*; |
| 1 | 19 import game.*; |
| 37 | 20 import javax.sound.sampled.*; |
| 21 | 21 |
|
42
951a4d669af0
Initially working path solving algorithm.
Matti Hamalainen <ccr@tnsp.org>
parents:
41
diff
changeset
|
22 |
| 75 | 23 class AboutBox extends IDMWidget |
| 8 | 24 { |
| 75 | 25 BufferedImage aboutImg; |
| 26 boolean aboutSecret; | |
| 27 | |
| 76 | 28 IDMPoint currPos, currOffs; |
| 29 Paint textPaint; | |
| 30 Font textFont; | |
| 31 FontMetrics textMetrics; | |
|
134
4c0dec72e2f0
Whitespace cosmetic cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents:
133
diff
changeset
|
32 |
| 76 | 33 |
| 75 | 34 public AboutBox() |
| 35 { | |
| 36 try { | |
| 37 ResourceLoader res = new ResourceLoader("graphics/girl.jpg"); | |
| 38 aboutImg = ImageIO.read(res.getStream()); | |
| 39 } | |
| 40 catch (IOException e) | |
| 41 { | |
| 42 } | |
| 43 | |
| 44 aboutSecret = false; | |
|
134
4c0dec72e2f0
Whitespace cosmetic cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents:
133
diff
changeset
|
45 |
| 75 | 46 setPos(150f, 150f); |
|
81
8932b1300ba1
Adjust about box size, add instructions.
Matti Hamalainen <ccr@tnsp.org>
parents:
80
diff
changeset
|
47 setSize(675f, 420f); |
| 75 | 48 } |
| 49 | |
| 50 public void setTextFont(Font font, FontMetrics metrics) | |
| 51 { | |
| 52 textFont = font; | |
| 53 textMetrics = metrics; | |
| 54 } | |
|
134
4c0dec72e2f0
Whitespace cosmetic cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents:
133
diff
changeset
|
55 |
| 75 | 56 public void setTextPaint(Paint paint) |
| 8 | 57 { |
| 75 | 58 textPaint = paint; |
| 59 } | |
| 60 | |
| 61 public void setCurrPos(IDMPoint npos) | |
| 62 { | |
| 63 currPos = npos; | |
| 64 currOffs = new IDMPoint(0, 0); | |
| 65 } | |
|
134
4c0dec72e2f0
Whitespace cosmetic cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents:
133
diff
changeset
|
66 |
| 75 | 67 public void setCurrPos(float x, float y) |
| 68 { | |
| 69 setCurrPos(new IDMPoint(x, y)); | |
| 8 | 70 } |
|
134
4c0dec72e2f0
Whitespace cosmetic cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents:
133
diff
changeset
|
71 |
| 75 | 72 public void drawString(Graphics2D g, String text) |
| 8 | 73 { |
| 75 | 74 Paint savePaint = g.getPaint(); |
| 75 g.setPaint(textPaint); | |
| 76 | 76 g.setFont(textFont); |
|
134
4c0dec72e2f0
Whitespace cosmetic cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents:
133
diff
changeset
|
77 |
| 75 | 78 int i = 0; |
| 79 while (i < text.length()) | |
| 8 | 80 { |
| 75 | 81 int p = text.indexOf("\n", i); |
| 82 boolean linefeed; | |
| 83 String str; | |
|
80
3d34258ccc2c
Render empty lines correctly.
Matti Hamalainen <ccr@tnsp.org>
parents:
77
diff
changeset
|
84 if (p >= i) |
| 75 | 85 { |
| 86 str = text.substring(i, p); | |
| 87 i = p + 1; | |
| 88 linefeed = true; | |
| 89 } | |
| 90 else | |
| 91 { | |
| 92 str = text.substring(i); | |
| 93 i += str.length(); | |
| 94 linefeed = false; | |
| 95 } | |
| 96 | |
| 97 g.drawString(str, currPos.x + currOffs.x, currPos.y + currOffs.y); | |
|
134
4c0dec72e2f0
Whitespace cosmetic cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents:
133
diff
changeset
|
98 |
| 75 | 99 if (linefeed) |
| 100 { | |
| 101 currOffs.x = 0; | |
| 76 | 102 currOffs.y += textMetrics.getHeight(); |
| 75 | 103 } |
| 104 else | |
| 105 { | |
| 106 currOffs.x += textMetrics.stringWidth(str); | |
| 107 } | |
| 8 | 108 } |
| 75 | 109 |
| 110 g.setPaint(savePaint); | |
| 111 } | |
| 112 | |
| 113 public void paint(Graphics2D g) | |
| 114 { | |
| 115 int x = getScaledX(), y = getScaledY(), | |
| 116 w = getScaledWidth(), h = getScaledHeight(); | |
| 117 | |
| 115 | 118 g.setPaint(new Color(0.0f, 0.0f, 0.0f, 0.7f)); |
| 75 | 119 g.fill(new RoundRectangle2D.Float(x, y, w, h, 10, 10)); |
| 120 | |
| 76 | 121 setTextFont(G.fonts[3], G.metrics[3]); |
| 75 | 122 setTextPaint(Color.white); |
|
134
4c0dec72e2f0
Whitespace cosmetic cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents:
133
diff
changeset
|
123 |
| 76 | 124 setCurrPos(x + 20, y + 30); |
|
105
75015dfd47ef
Move version number info to G.java.
Matti Hamalainen <ccr@tnsp.org>
parents:
93
diff
changeset
|
125 drawString(g, "RistiPolku (CrossPaths) v"+ G.version +"\n"); |
| 75 | 126 |
| 76 | 127 setTextFont(G.fonts[1], G.metrics[1]); |
| 75 | 128 if (aboutSecret) |
| 129 { | |
| 115 | 130 g.drawImage(aboutImg, x + 20, y + 55, |
|
134
4c0dec72e2f0
Whitespace cosmetic cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents:
133
diff
changeset
|
131 aboutImg.getWidth(), aboutImg.getHeight(), null); |
| 75 | 132 |
| 76 | 133 setCurrPos(x + 225, y + 75); |
| 75 | 134 drawString(g, |
| 135 "Dedicated to my\n" + | |
| 76 | 136 "favorite woman\n" + |
| 75 | 137 "in the world."); |
|
134
4c0dec72e2f0
Whitespace cosmetic cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents:
133
diff
changeset
|
138 |
| 76 | 139 setCurrPos(x + 370, y + 175); |
| 75 | 140 drawString(g, "- Matti"); |
| 141 } | |
| 8 | 142 else |
| 143 { | |
| 75 | 144 setTextPaint(Color.yellow); |
| 152 | 145 drawString(g, "(c) Copyright 2011 Tecnic Software productions (TNSP)\n"); |
| 75 | 146 |
| 147 setTextPaint(Color.white); | |
| 152 | 148 drawString(g, "Programming, graphics and design by " + |
| 149 "Matti 'ccr' Hämäläinen.\n" + | |
| 150 "Audio from archive.org, used non-commercially.\n \n"); | |
|
81
8932b1300ba1
Adjust about box size, add instructions.
Matti Hamalainen <ccr@tnsp.org>
parents:
80
diff
changeset
|
151 |
|
8932b1300ba1
Adjust about box size, add instructions.
Matti Hamalainen <ccr@tnsp.org>
parents:
80
diff
changeset
|
152 setTextPaint(Color.red); |
|
8932b1300ba1
Adjust about box size, add instructions.
Matti Hamalainen <ccr@tnsp.org>
parents:
80
diff
changeset
|
153 drawString(g, "Controls:\n"); |
|
8932b1300ba1
Adjust about box size, add instructions.
Matti Hamalainen <ccr@tnsp.org>
parents:
80
diff
changeset
|
154 |
|
8932b1300ba1
Adjust about box size, add instructions.
Matti Hamalainen <ccr@tnsp.org>
parents:
80
diff
changeset
|
155 IDMPoint old = currOffs.copy(); |
|
134
4c0dec72e2f0
Whitespace cosmetic cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents:
133
diff
changeset
|
156 |
|
81
8932b1300ba1
Adjust about box size, add instructions.
Matti Hamalainen <ccr@tnsp.org>
parents:
80
diff
changeset
|
157 setTextPaint(Color.white); |
|
8932b1300ba1
Adjust about box size, add instructions.
Matti Hamalainen <ccr@tnsp.org>
parents:
80
diff
changeset
|
158 drawString(g, |
|
8932b1300ba1
Adjust about box size, add instructions.
Matti Hamalainen <ccr@tnsp.org>
parents:
80
diff
changeset
|
159 "Arrow keys / mouse wheel\n"+ |
|
8932b1300ba1
Adjust about box size, add instructions.
Matti Hamalainen <ccr@tnsp.org>
parents:
80
diff
changeset
|
160 "Enter / mouse click\n"+ |
|
8932b1300ba1
Adjust about box size, add instructions.
Matti Hamalainen <ccr@tnsp.org>
parents:
80
diff
changeset
|
161 "Space bar\n"); |
|
8932b1300ba1
Adjust about box size, add instructions.
Matti Hamalainen <ccr@tnsp.org>
parents:
80
diff
changeset
|
162 |
|
8932b1300ba1
Adjust about box size, add instructions.
Matti Hamalainen <ccr@tnsp.org>
parents:
80
diff
changeset
|
163 currPos.x += 330; |
|
8932b1300ba1
Adjust about box size, add instructions.
Matti Hamalainen <ccr@tnsp.org>
parents:
80
diff
changeset
|
164 currOffs.y = old.y; |
|
8932b1300ba1
Adjust about box size, add instructions.
Matti Hamalainen <ccr@tnsp.org>
parents:
80
diff
changeset
|
165 drawString(g, |
|
8932b1300ba1
Adjust about box size, add instructions.
Matti Hamalainen <ccr@tnsp.org>
parents:
80
diff
changeset
|
166 "- Rotate piece\n" + |
|
8932b1300ba1
Adjust about box size, add instructions.
Matti Hamalainen <ccr@tnsp.org>
parents:
80
diff
changeset
|
167 "- Place/lock piece\n" + |
|
8932b1300ba1
Adjust about box size, add instructions.
Matti Hamalainen <ccr@tnsp.org>
parents:
80
diff
changeset
|
168 "- Swap piece\n"); |
|
134
4c0dec72e2f0
Whitespace cosmetic cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents:
133
diff
changeset
|
169 |
|
81
8932b1300ba1
Adjust about box size, add instructions.
Matti Hamalainen <ccr@tnsp.org>
parents:
80
diff
changeset
|
170 currPos.x -= 330; |
|
8932b1300ba1
Adjust about box size, add instructions.
Matti Hamalainen <ccr@tnsp.org>
parents:
80
diff
changeset
|
171 setTextPaint(Color.green); |
|
8932b1300ba1
Adjust about box size, add instructions.
Matti Hamalainen <ccr@tnsp.org>
parents:
80
diff
changeset
|
172 drawString(g, |
|
8932b1300ba1
Adjust about box size, add instructions.
Matti Hamalainen <ccr@tnsp.org>
parents:
80
diff
changeset
|
173 "\nObjective: Create a path long as possible by rotating\n"+ |
|
8932b1300ba1
Adjust about box size, add instructions.
Matti Hamalainen <ccr@tnsp.org>
parents:
80
diff
changeset
|
174 "and placing pieces. More points will be awarded for\n"+ |
|
8932b1300ba1
Adjust about box size, add instructions.
Matti Hamalainen <ccr@tnsp.org>
parents:
80
diff
changeset
|
175 "advancing the path by several segments per turn." |
|
8932b1300ba1
Adjust about box size, add instructions.
Matti Hamalainen <ccr@tnsp.org>
parents:
80
diff
changeset
|
176 ); |
| 8 | 177 } |
| 178 } | |
| 75 | 179 |
| 180 public boolean keyPressed(KeyEvent e) | |
| 181 { | |
| 182 if (e.getKeyCode() == KeyEvent.VK_L) | |
| 183 { | |
| 184 aboutSecret = true; | |
| 185 } | |
| 186 else | |
| 187 { | |
| 188 clicked(); | |
| 189 aboutSecret = false; | |
| 190 } | |
| 191 return true; | |
| 192 } | |
|
134
4c0dec72e2f0
Whitespace cosmetic cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents:
133
diff
changeset
|
193 |
| 75 | 194 public void clicked() |
| 8 | 195 { |
| 75 | 196 parent.remove(this); |
| 8 | 197 } |
| 198 } | |
| 75 | 199 |
| 0 | 200 |
| 48 | 201 class GameBoard extends IDMWidget |
| 0 | 202 { |
| 75 | 203 static final int boardSize = 9; |
| 204 static final int boardMiddle = 4; | |
| 2 | 205 Piece[][] board; |
|
117
973f567c7b9d
Change how gameboard is rendered, make it more OO-sensible.
Matti Hamalainen <ccr@tnsp.org>
parents:
116
diff
changeset
|
206 float pscale, ptime; |
|
134
4c0dec72e2f0
Whitespace cosmetic cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents:
133
diff
changeset
|
207 |
|
138
9eb791e2fa17
Optimize board updating logic, so that the old placed tiles need not to be
Matti Hamalainen <ccr@tnsp.org>
parents:
135
diff
changeset
|
208 public boolean flagGameOver, flagBoardIsDirty; |
|
119
52d79502447c
Make few variables un-public.
Matti Hamalainen <ccr@tnsp.org>
parents:
117
diff
changeset
|
209 int gameScore; |
| 54 | 210 |
|
119
52d79502447c
Make few variables un-public.
Matti Hamalainen <ccr@tnsp.org>
parents:
117
diff
changeset
|
211 Piece currPiece, nextPiece; |
| 41 | 212 int currX, currY, currPoint; |
| 9 | 213 |
| 47 | 214 Sound sndPlaced; |
|
131
67b2322fda91
Add spawning of animated score elements when player finishes a turn.
Matti Hamalainen <ccr@tnsp.org>
parents:
124
diff
changeset
|
215 |
|
67b2322fda91
Add spawning of animated score elements when player finishes a turn.
Matti Hamalainen <ccr@tnsp.org>
parents:
124
diff
changeset
|
216 private final ReentrantReadWriteLock pointLock = new ReentrantReadWriteLock(); |
|
67b2322fda91
Add spawning of animated score elements when player finishes a turn.
Matti Hamalainen <ccr@tnsp.org>
parents:
124
diff
changeset
|
217 private ArrayList<AnimatedPointElement> pointElems; |
|
134
4c0dec72e2f0
Whitespace cosmetic cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents:
133
diff
changeset
|
218 |
| 75 | 219 public GameBoard(IDMPoint pos, float ps) |
|
59
fd10a9422b60
Cleanups, bugfixes, etc etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
57
diff
changeset
|
220 { |
|
fd10a9422b60
Cleanups, bugfixes, etc etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
57
diff
changeset
|
221 super(pos); |
| 75 | 222 pscale = ps; |
|
59
fd10a9422b60
Cleanups, bugfixes, etc etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
57
diff
changeset
|
223 |
|
108
ae66d21d4747
Disable piece placement sound.
Matti Hamalainen <ccr@tnsp.org>
parents:
106
diff
changeset
|
224 // sndPlaced = G.smgr.getSound("sounds/placed.wav"); |
|
59
fd10a9422b60
Cleanups, bugfixes, etc etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
57
diff
changeset
|
225 |
|
131
67b2322fda91
Add spawning of animated score elements when player finishes a turn.
Matti Hamalainen <ccr@tnsp.org>
parents:
124
diff
changeset
|
226 pointElems = new ArrayList<AnimatedPointElement>(); |
|
67b2322fda91
Add spawning of animated score elements when player finishes a turn.
Matti Hamalainen <ccr@tnsp.org>
parents:
124
diff
changeset
|
227 |
|
59
fd10a9422b60
Cleanups, bugfixes, etc etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
57
diff
changeset
|
228 startNewGame(); |
|
fd10a9422b60
Cleanups, bugfixes, etc etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
57
diff
changeset
|
229 } |
|
134
4c0dec72e2f0
Whitespace cosmetic cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents:
133
diff
changeset
|
230 |
|
59
fd10a9422b60
Cleanups, bugfixes, etc etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
57
diff
changeset
|
231 public void startNewGame() |
| 2 | 232 { |
| 233 board = new Piece[boardSize][boardSize]; | |
| 234 board[boardMiddle][boardMiddle] = new Piece(PieceType.START); | |
| 235 | |
| 41 | 236 currX = boardMiddle; |
|
42
951a4d669af0
Initially working path solving algorithm.
Matti Hamalainen <ccr@tnsp.org>
parents:
41
diff
changeset
|
237 currY = boardMiddle; |
|
951a4d669af0
Initially working path solving algorithm.
Matti Hamalainen <ccr@tnsp.org>
parents:
41
diff
changeset
|
238 currPoint = 0; |
|
59
fd10a9422b60
Cleanups, bugfixes, etc etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
57
diff
changeset
|
239 |
|
fd10a9422b60
Cleanups, bugfixes, etc etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
57
diff
changeset
|
240 currPiece = null; |
| 54 | 241 nextPiece = new Piece(PieceType.ACTIVE); |
|
59
fd10a9422b60
Cleanups, bugfixes, etc etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
57
diff
changeset
|
242 |
|
65
dc936dba124e
Set game over-flag correctly, so that we reset everything after a game over
Matti Hamalainen <ccr@tnsp.org>
parents:
62
diff
changeset
|
243 flagGameOver = false; |
|
138
9eb791e2fa17
Optimize board updating logic, so that the old placed tiles need not to be
Matti Hamalainen <ccr@tnsp.org>
parents:
135
diff
changeset
|
244 flagBoardIsDirty = true; |
|
59
fd10a9422b60
Cleanups, bugfixes, etc etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
57
diff
changeset
|
245 pieceFinishTurn(); |
| 55 | 246 gameScore = 0; |
| 2 | 247 } |
| 0 | 248 |
|
59
fd10a9422b60
Cleanups, bugfixes, etc etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
57
diff
changeset
|
249 public void paintBackPlate(Graphics2D g) |
|
fd10a9422b60
Cleanups, bugfixes, etc etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
57
diff
changeset
|
250 { |
|
fd10a9422b60
Cleanups, bugfixes, etc etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
57
diff
changeset
|
251 g.setPaint(new Color(0.0f, 0.0f, 0.0f, 0.2f)); |
|
fd10a9422b60
Cleanups, bugfixes, etc etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
57
diff
changeset
|
252 g.setStroke(new BasicStroke(5.0f)); |
|
fd10a9422b60
Cleanups, bugfixes, etc etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
57
diff
changeset
|
253 g.draw(new RoundRectangle2D.Float(getScaledX(), getScaledY(), |
|
fd10a9422b60
Cleanups, bugfixes, etc etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
57
diff
changeset
|
254 boardSize * pscale, boardSize * pscale, |
|
fd10a9422b60
Cleanups, bugfixes, etc etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
57
diff
changeset
|
255 pscale / 5, pscale / 5)); |
|
fd10a9422b60
Cleanups, bugfixes, etc etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
57
diff
changeset
|
256 } |
|
134
4c0dec72e2f0
Whitespace cosmetic cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents:
133
diff
changeset
|
257 |
|
138
9eb791e2fa17
Optimize board updating logic, so that the old placed tiles need not to be
Matti Hamalainen <ccr@tnsp.org>
parents:
135
diff
changeset
|
258 public void paintBoard(Graphics2D g, boolean drawCurrent) |
| 2 | 259 { |
| 260 for (int y = 0; y < boardSize; y++) | |
| 261 for (int x = 0; x < boardSize; x++) | |
| 262 if (board[x][y] != null) | |
| 263 { | |
|
138
9eb791e2fa17
Optimize board updating logic, so that the old placed tiles need not to be
Matti Hamalainen <ccr@tnsp.org>
parents:
135
diff
changeset
|
264 if ((drawCurrent && board[x][y] == currPiece) || |
|
9eb791e2fa17
Optimize board updating logic, so that the old placed tiles need not to be
Matti Hamalainen <ccr@tnsp.org>
parents:
135
diff
changeset
|
265 (!drawCurrent && board[x][y] != currPiece)) |
|
9eb791e2fa17
Optimize board updating logic, so that the old placed tiles need not to be
Matti Hamalainen <ccr@tnsp.org>
parents:
135
diff
changeset
|
266 { |
|
9eb791e2fa17
Optimize board updating logic, so that the old placed tiles need not to be
Matti Hamalainen <ccr@tnsp.org>
parents:
135
diff
changeset
|
267 board[x][y].paint(g, |
|
9eb791e2fa17
Optimize board updating logic, so that the old placed tiles need not to be
Matti Hamalainen <ccr@tnsp.org>
parents:
135
diff
changeset
|
268 getScaledX() + (x * pscale), |
|
9eb791e2fa17
Optimize board updating logic, so that the old placed tiles need not to be
Matti Hamalainen <ccr@tnsp.org>
parents:
135
diff
changeset
|
269 getScaledY() + (y * pscale), |
|
9eb791e2fa17
Optimize board updating logic, so that the old placed tiles need not to be
Matti Hamalainen <ccr@tnsp.org>
parents:
135
diff
changeset
|
270 pscale - pscale / 10); |
|
9eb791e2fa17
Optimize board updating logic, so that the old placed tiles need not to be
Matti Hamalainen <ccr@tnsp.org>
parents:
135
diff
changeset
|
271 } |
|
59
fd10a9422b60
Cleanups, bugfixes, etc etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
57
diff
changeset
|
272 } |
|
138
9eb791e2fa17
Optimize board updating logic, so that the old placed tiles need not to be
Matti Hamalainen <ccr@tnsp.org>
parents:
135
diff
changeset
|
273 } |
|
9eb791e2fa17
Optimize board updating logic, so that the old placed tiles need not to be
Matti Hamalainen <ccr@tnsp.org>
parents:
135
diff
changeset
|
274 |
|
9eb791e2fa17
Optimize board updating logic, so that the old placed tiles need not to be
Matti Hamalainen <ccr@tnsp.org>
parents:
135
diff
changeset
|
275 public void paint(Graphics2D g) |
|
9eb791e2fa17
Optimize board updating logic, so that the old placed tiles need not to be
Matti Hamalainen <ccr@tnsp.org>
parents:
135
diff
changeset
|
276 { |
|
9eb791e2fa17
Optimize board updating logic, so that the old placed tiles need not to be
Matti Hamalainen <ccr@tnsp.org>
parents:
135
diff
changeset
|
277 paintBoard(g, true); |
|
117
973f567c7b9d
Change how gameboard is rendered, make it more OO-sensible.
Matti Hamalainen <ccr@tnsp.org>
parents:
116
diff
changeset
|
278 |
|
131
67b2322fda91
Add spawning of animated score elements when player finishes a turn.
Matti Hamalainen <ccr@tnsp.org>
parents:
124
diff
changeset
|
279 Lock read = pointLock.readLock(); |
|
67b2322fda91
Add spawning of animated score elements when player finishes a turn.
Matti Hamalainen <ccr@tnsp.org>
parents:
124
diff
changeset
|
280 read.lock(); |
|
67b2322fda91
Add spawning of animated score elements when player finishes a turn.
Matti Hamalainen <ccr@tnsp.org>
parents:
124
diff
changeset
|
281 try |
|
67b2322fda91
Add spawning of animated score elements when player finishes a turn.
Matti Hamalainen <ccr@tnsp.org>
parents:
124
diff
changeset
|
282 { |
|
67b2322fda91
Add spawning of animated score elements when player finishes a turn.
Matti Hamalainen <ccr@tnsp.org>
parents:
124
diff
changeset
|
283 for (AnimatedPointElement elem : pointElems) |
|
67b2322fda91
Add spawning of animated score elements when player finishes a turn.
Matti Hamalainen <ccr@tnsp.org>
parents:
124
diff
changeset
|
284 { |
|
67b2322fda91
Add spawning of animated score elements when player finishes a turn.
Matti Hamalainen <ccr@tnsp.org>
parents:
124
diff
changeset
|
285 elem.paint(g); |
|
67b2322fda91
Add spawning of animated score elements when player finishes a turn.
Matti Hamalainen <ccr@tnsp.org>
parents:
124
diff
changeset
|
286 } |
|
67b2322fda91
Add spawning of animated score elements when player finishes a turn.
Matti Hamalainen <ccr@tnsp.org>
parents:
124
diff
changeset
|
287 } |
|
67b2322fda91
Add spawning of animated score elements when player finishes a turn.
Matti Hamalainen <ccr@tnsp.org>
parents:
124
diff
changeset
|
288 finally |
|
67b2322fda91
Add spawning of animated score elements when player finishes a turn.
Matti Hamalainen <ccr@tnsp.org>
parents:
124
diff
changeset
|
289 { |
|
67b2322fda91
Add spawning of animated score elements when player finishes a turn.
Matti Hamalainen <ccr@tnsp.org>
parents:
124
diff
changeset
|
290 read.unlock(); |
|
67b2322fda91
Add spawning of animated score elements when player finishes a turn.
Matti Hamalainen <ccr@tnsp.org>
parents:
124
diff
changeset
|
291 } |
|
134
4c0dec72e2f0
Whitespace cosmetic cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents:
133
diff
changeset
|
292 |
|
131
67b2322fda91
Add spawning of animated score elements when player finishes a turn.
Matti Hamalainen <ccr@tnsp.org>
parents:
124
diff
changeset
|
293 |
|
117
973f567c7b9d
Change how gameboard is rendered, make it more OO-sensible.
Matti Hamalainen <ccr@tnsp.org>
parents:
116
diff
changeset
|
294 if (!flagGameOver) |
|
973f567c7b9d
Change how gameboard is rendered, make it more OO-sensible.
Matti Hamalainen <ccr@tnsp.org>
parents:
116
diff
changeset
|
295 { |
|
973f567c7b9d
Change how gameboard is rendered, make it more OO-sensible.
Matti Hamalainen <ccr@tnsp.org>
parents:
116
diff
changeset
|
296 if (nextPiece != null) |
|
973f567c7b9d
Change how gameboard is rendered, make it more OO-sensible.
Matti Hamalainen <ccr@tnsp.org>
parents:
116
diff
changeset
|
297 { |
|
973f567c7b9d
Change how gameboard is rendered, make it more OO-sensible.
Matti Hamalainen <ccr@tnsp.org>
parents:
116
diff
changeset
|
298 // Draw next piece |
|
973f567c7b9d
Change how gameboard is rendered, make it more OO-sensible.
Matti Hamalainen <ccr@tnsp.org>
parents:
116
diff
changeset
|
299 AffineTransform save = g.getTransform(); |
|
154
48b91eabc029
Improve scaling a bit, not completely functional yet.
Matti Hamalainen <ccr@tnsp.org>
parents:
152
diff
changeset
|
300 nextPiece.paint(g, G.screenDim.width * 0.85f - 90.0f/2.0f, G.screenDim.height * 0.43f, 90.0f); |
|
117
973f567c7b9d
Change how gameboard is rendered, make it more OO-sensible.
Matti Hamalainen <ccr@tnsp.org>
parents:
116
diff
changeset
|
301 g.setTransform(save); |
|
973f567c7b9d
Change how gameboard is rendered, make it more OO-sensible.
Matti Hamalainen <ccr@tnsp.org>
parents:
116
diff
changeset
|
302 } |
|
973f567c7b9d
Change how gameboard is rendered, make it more OO-sensible.
Matti Hamalainen <ccr@tnsp.org>
parents:
116
diff
changeset
|
303 } |
|
973f567c7b9d
Change how gameboard is rendered, make it more OO-sensible.
Matti Hamalainen <ccr@tnsp.org>
parents:
116
diff
changeset
|
304 else |
|
973f567c7b9d
Change how gameboard is rendered, make it more OO-sensible.
Matti Hamalainen <ccr@tnsp.org>
parents:
116
diff
changeset
|
305 { |
|
973f567c7b9d
Change how gameboard is rendered, make it more OO-sensible.
Matti Hamalainen <ccr@tnsp.org>
parents:
116
diff
changeset
|
306 // Game over text |
|
973f567c7b9d
Change how gameboard is rendered, make it more OO-sensible.
Matti Hamalainen <ccr@tnsp.org>
parents:
116
diff
changeset
|
307 String text = "Game Over!"; |
|
973f567c7b9d
Change how gameboard is rendered, make it more OO-sensible.
Matti Hamalainen <ccr@tnsp.org>
parents:
116
diff
changeset
|
308 int textWidth = G.metrics[2].stringWidth(text); |
|
973f567c7b9d
Change how gameboard is rendered, make it more OO-sensible.
Matti Hamalainen <ccr@tnsp.org>
parents:
116
diff
changeset
|
309 g.setFont(G.fonts[2]); |
|
973f567c7b9d
Change how gameboard is rendered, make it more OO-sensible.
Matti Hamalainen <ccr@tnsp.org>
parents:
116
diff
changeset
|
310 |
|
973f567c7b9d
Change how gameboard is rendered, make it more OO-sensible.
Matti Hamalainen <ccr@tnsp.org>
parents:
116
diff
changeset
|
311 g.setPaint(new Color(0.0f, 0.0f, 0.0f, 0.5f)); |
|
973f567c7b9d
Change how gameboard is rendered, make it more OO-sensible.
Matti Hamalainen <ccr@tnsp.org>
parents:
116
diff
changeset
|
312 g.drawString(text, (G.screenDim.width - textWidth) / 2 + 5, G.screenDim.height / 2 + 5); |
|
973f567c7b9d
Change how gameboard is rendered, make it more OO-sensible.
Matti Hamalainen <ccr@tnsp.org>
parents:
116
diff
changeset
|
313 |
|
973f567c7b9d
Change how gameboard is rendered, make it more OO-sensible.
Matti Hamalainen <ccr@tnsp.org>
parents:
116
diff
changeset
|
314 double f = Math.sin(ptime * 0.1) * 4.0; |
|
973f567c7b9d
Change how gameboard is rendered, make it more OO-sensible.
Matti Hamalainen <ccr@tnsp.org>
parents:
116
diff
changeset
|
315 g.setPaint(Color.white); |
|
973f567c7b9d
Change how gameboard is rendered, make it more OO-sensible.
Matti Hamalainen <ccr@tnsp.org>
parents:
116
diff
changeset
|
316 g.drawString(text, (G.screenDim.width - textWidth) / 2 + (float) f, G.screenDim.height / 2 + (float) f); |
|
973f567c7b9d
Change how gameboard is rendered, make it more OO-sensible.
Matti Hamalainen <ccr@tnsp.org>
parents:
116
diff
changeset
|
317 } |
|
134
4c0dec72e2f0
Whitespace cosmetic cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents:
133
diff
changeset
|
318 |
|
117
973f567c7b9d
Change how gameboard is rendered, make it more OO-sensible.
Matti Hamalainen <ccr@tnsp.org>
parents:
116
diff
changeset
|
319 // Score |
|
154
48b91eabc029
Improve scaling a bit, not completely functional yet.
Matti Hamalainen <ccr@tnsp.org>
parents:
152
diff
changeset
|
320 String text = ""+ String.format("%05d", gameScore); |
|
48b91eabc029
Improve scaling a bit, not completely functional yet.
Matti Hamalainen <ccr@tnsp.org>
parents:
152
diff
changeset
|
321 int textWidth = G.metrics[2].stringWidth(text); |
|
117
973f567c7b9d
Change how gameboard is rendered, make it more OO-sensible.
Matti Hamalainen <ccr@tnsp.org>
parents:
116
diff
changeset
|
322 g.setFont(G.fonts[2]); |
|
973f567c7b9d
Change how gameboard is rendered, make it more OO-sensible.
Matti Hamalainen <ccr@tnsp.org>
parents:
116
diff
changeset
|
323 g.setPaint(Color.white); |
|
154
48b91eabc029
Improve scaling a bit, not completely functional yet.
Matti Hamalainen <ccr@tnsp.org>
parents:
152
diff
changeset
|
324 g.drawString(text, (G.screenDim.width * 0.85f) - textWidth / 2, G.screenDim.height * 0.3f); |
|
59
fd10a9422b60
Cleanups, bugfixes, etc etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
57
diff
changeset
|
325 } |
|
134
4c0dec72e2f0
Whitespace cosmetic cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents:
133
diff
changeset
|
326 |
| 75 | 327 public boolean contains(float x, float y) |
|
59
fd10a9422b60
Cleanups, bugfixes, etc etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
57
diff
changeset
|
328 { |
| 76 | 329 return (x >= getScaledX() && |
| 75 | 330 y >= getScaledY() && |
| 331 x < getScaledX() + boardSize * pscale && | |
| 332 y < getScaledY() + boardSize * pscale); | |
| 2 | 333 } |
|
134
4c0dec72e2f0
Whitespace cosmetic cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents:
133
diff
changeset
|
334 |
|
138
9eb791e2fa17
Optimize board updating logic, so that the old placed tiles need not to be
Matti Hamalainen <ccr@tnsp.org>
parents:
135
diff
changeset
|
335 public boolean isBoardDirty() |
|
9eb791e2fa17
Optimize board updating logic, so that the old placed tiles need not to be
Matti Hamalainen <ccr@tnsp.org>
parents:
135
diff
changeset
|
336 { |
|
9eb791e2fa17
Optimize board updating logic, so that the old placed tiles need not to be
Matti Hamalainen <ccr@tnsp.org>
parents:
135
diff
changeset
|
337 if (flagBoardIsDirty) |
|
9eb791e2fa17
Optimize board updating logic, so that the old placed tiles need not to be
Matti Hamalainen <ccr@tnsp.org>
parents:
135
diff
changeset
|
338 { |
|
9eb791e2fa17
Optimize board updating logic, so that the old placed tiles need not to be
Matti Hamalainen <ccr@tnsp.org>
parents:
135
diff
changeset
|
339 flagBoardIsDirty = false; |
|
9eb791e2fa17
Optimize board updating logic, so that the old placed tiles need not to be
Matti Hamalainen <ccr@tnsp.org>
parents:
135
diff
changeset
|
340 return true; |
|
9eb791e2fa17
Optimize board updating logic, so that the old placed tiles need not to be
Matti Hamalainen <ccr@tnsp.org>
parents:
135
diff
changeset
|
341 } |
|
9eb791e2fa17
Optimize board updating logic, so that the old placed tiles need not to be
Matti Hamalainen <ccr@tnsp.org>
parents:
135
diff
changeset
|
342 else |
|
9eb791e2fa17
Optimize board updating logic, so that the old placed tiles need not to be
Matti Hamalainen <ccr@tnsp.org>
parents:
135
diff
changeset
|
343 return false; |
|
9eb791e2fa17
Optimize board updating logic, so that the old placed tiles need not to be
Matti Hamalainen <ccr@tnsp.org>
parents:
135
diff
changeset
|
344 } |
|
9eb791e2fa17
Optimize board updating logic, so that the old placed tiles need not to be
Matti Hamalainen <ccr@tnsp.org>
parents:
135
diff
changeset
|
345 |
| 9 | 346 public void animate(float time) |
| 347 { | |
|
148
5b25561855c3
Move next piece animation call into better place.
Matti Hamalainen <ccr@tnsp.org>
parents:
147
diff
changeset
|
348 if (nextPiece != null) |
|
5b25561855c3
Move next piece animation call into better place.
Matti Hamalainen <ccr@tnsp.org>
parents:
147
diff
changeset
|
349 { |
|
5b25561855c3
Move next piece animation call into better place.
Matti Hamalainen <ccr@tnsp.org>
parents:
147
diff
changeset
|
350 nextPiece.animate(time); |
|
5b25561855c3
Move next piece animation call into better place.
Matti Hamalainen <ccr@tnsp.org>
parents:
147
diff
changeset
|
351 } |
|
5b25561855c3
Move next piece animation call into better place.
Matti Hamalainen <ccr@tnsp.org>
parents:
147
diff
changeset
|
352 |
|
117
973f567c7b9d
Change how gameboard is rendered, make it more OO-sensible.
Matti Hamalainen <ccr@tnsp.org>
parents:
116
diff
changeset
|
353 ptime = time; |
| 9 | 354 for (int y = 0; y < boardSize; y++) |
| 355 for (int x = 0; x < boardSize; x++) | |
| 356 if (board[x][y] != null) | |
| 357 { | |
| 358 board[x][y].animate(time); | |
|
138
9eb791e2fa17
Optimize board updating logic, so that the old placed tiles need not to be
Matti Hamalainen <ccr@tnsp.org>
parents:
135
diff
changeset
|
359 if (board[x][y] != currPiece && board[x][y].active) |
|
9eb791e2fa17
Optimize board updating logic, so that the old placed tiles need not to be
Matti Hamalainen <ccr@tnsp.org>
parents:
135
diff
changeset
|
360 flagBoardIsDirty = true; |
| 9 | 361 } |
|
134
4c0dec72e2f0
Whitespace cosmetic cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents:
133
diff
changeset
|
362 |
|
131
67b2322fda91
Add spawning of animated score elements when player finishes a turn.
Matti Hamalainen <ccr@tnsp.org>
parents:
124
diff
changeset
|
363 Lock write = pointLock.writeLock(); |
|
67b2322fda91
Add spawning of animated score elements when player finishes a turn.
Matti Hamalainen <ccr@tnsp.org>
parents:
124
diff
changeset
|
364 write.lock(); |
|
67b2322fda91
Add spawning of animated score elements when player finishes a turn.
Matti Hamalainen <ccr@tnsp.org>
parents:
124
diff
changeset
|
365 try |
|
67b2322fda91
Add spawning of animated score elements when player finishes a turn.
Matti Hamalainen <ccr@tnsp.org>
parents:
124
diff
changeset
|
366 { |
|
67b2322fda91
Add spawning of animated score elements when player finishes a turn.
Matti Hamalainen <ccr@tnsp.org>
parents:
124
diff
changeset
|
367 ArrayList<AnimatedPointElement> tmp = new ArrayList<AnimatedPointElement>(); |
|
67b2322fda91
Add spawning of animated score elements when player finishes a turn.
Matti Hamalainen <ccr@tnsp.org>
parents:
124
diff
changeset
|
368 |
|
67b2322fda91
Add spawning of animated score elements when player finishes a turn.
Matti Hamalainen <ccr@tnsp.org>
parents:
124
diff
changeset
|
369 for (AnimatedPointElement elem : pointElems) |
|
67b2322fda91
Add spawning of animated score elements when player finishes a turn.
Matti Hamalainen <ccr@tnsp.org>
parents:
124
diff
changeset
|
370 { |
|
67b2322fda91
Add spawning of animated score elements when player finishes a turn.
Matti Hamalainen <ccr@tnsp.org>
parents:
124
diff
changeset
|
371 elem.animate(time); |
|
67b2322fda91
Add spawning of animated score elements when player finishes a turn.
Matti Hamalainen <ccr@tnsp.org>
parents:
124
diff
changeset
|
372 if (elem.active) |
|
67b2322fda91
Add spawning of animated score elements when player finishes a turn.
Matti Hamalainen <ccr@tnsp.org>
parents:
124
diff
changeset
|
373 tmp.add(elem); |
|
67b2322fda91
Add spawning of animated score elements when player finishes a turn.
Matti Hamalainen <ccr@tnsp.org>
parents:
124
diff
changeset
|
374 } |
|
134
4c0dec72e2f0
Whitespace cosmetic cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents:
133
diff
changeset
|
375 |
|
131
67b2322fda91
Add spawning of animated score elements when player finishes a turn.
Matti Hamalainen <ccr@tnsp.org>
parents:
124
diff
changeset
|
376 pointElems = tmp; |
|
144
f01cb1ea26a5
Add some decorative animated elements.
Matti Hamalainen <ccr@tnsp.org>
parents:
140
diff
changeset
|
377 |
|
f01cb1ea26a5
Add some decorative animated elements.
Matti Hamalainen <ccr@tnsp.org>
parents:
140
diff
changeset
|
378 if (time % 32 == 1) |
|
f01cb1ea26a5
Add some decorative animated elements.
Matti Hamalainen <ccr@tnsp.org>
parents:
140
diff
changeset
|
379 { |
|
f01cb1ea26a5
Add some decorative animated elements.
Matti Hamalainen <ccr@tnsp.org>
parents:
140
diff
changeset
|
380 Random rnd = new Random(); |
|
f01cb1ea26a5
Add some decorative animated elements.
Matti Hamalainen <ccr@tnsp.org>
parents:
140
diff
changeset
|
381 pointElems.add(new AnimatedPointElement( |
|
f01cb1ea26a5
Add some decorative animated elements.
Matti Hamalainen <ccr@tnsp.org>
parents:
140
diff
changeset
|
382 new IDMPoint(10 + rnd.nextInt(400), 10 + rnd.nextInt(100)), ".")); |
|
f01cb1ea26a5
Add some decorative animated elements.
Matti Hamalainen <ccr@tnsp.org>
parents:
140
diff
changeset
|
383 } |
|
131
67b2322fda91
Add spawning of animated score elements when player finishes a turn.
Matti Hamalainen <ccr@tnsp.org>
parents:
124
diff
changeset
|
384 } |
|
67b2322fda91
Add spawning of animated score elements when player finishes a turn.
Matti Hamalainen <ccr@tnsp.org>
parents:
124
diff
changeset
|
385 finally |
|
67b2322fda91
Add spawning of animated score elements when player finishes a turn.
Matti Hamalainen <ccr@tnsp.org>
parents:
124
diff
changeset
|
386 { |
|
67b2322fda91
Add spawning of animated score elements when player finishes a turn.
Matti Hamalainen <ccr@tnsp.org>
parents:
124
diff
changeset
|
387 write.unlock(); |
|
67b2322fda91
Add spawning of animated score elements when player finishes a turn.
Matti Hamalainen <ccr@tnsp.org>
parents:
124
diff
changeset
|
388 } |
| 9 | 389 } |
|
134
4c0dec72e2f0
Whitespace cosmetic cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents:
133
diff
changeset
|
390 |
|
32
e480579cc460
More work on debugging the path resolving.
Matti Hamalainen <ccr@tnsp.org>
parents:
30
diff
changeset
|
391 public void pieceRotate(Piece.RotateDir dir) |
| 2 | 392 { |
|
59
fd10a9422b60
Cleanups, bugfixes, etc etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
57
diff
changeset
|
393 if (currPiece != null && !flagGameOver) |
|
fd10a9422b60
Cleanups, bugfixes, etc etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
57
diff
changeset
|
394 { |
| 41 | 395 currPiece.rotate(dir); |
|
59
fd10a9422b60
Cleanups, bugfixes, etc etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
57
diff
changeset
|
396 } |
| 2 | 397 } |
| 1 | 398 |
| 75 | 399 // Change coordinates based on the "outgoing" |
| 400 // piece connection point. | |
|
42
951a4d669af0
Initially working path solving algorithm.
Matti Hamalainen <ccr@tnsp.org>
parents:
41
diff
changeset
|
401 private void pieceMoveTo(int point) |
| 7 | 402 { |
| 46 | 403 switch (point) |
| 404 { | |
| 405 case 0: currY--; break; | |
| 406 case 1: currY--; break; | |
| 407 | |
| 408 case 2: currX++; break; | |
| 409 case 3: currX++; break; | |
| 410 | |
| 411 case 4: currY++; break; | |
| 412 case 5: currY++; break; | |
| 413 | |
| 414 case 6: currX--; break; | |
| 415 case 7: currX--; break; | |
| 416 } | |
|
42
951a4d669af0
Initially working path solving algorithm.
Matti Hamalainen <ccr@tnsp.org>
parents:
41
diff
changeset
|
417 } |
| 9 | 418 |
| 54 | 419 public void pieceCreateNew() |
| 420 { | |
| 421 currPiece = nextPiece; | |
|
106
41c6cca69d60
Make new pieces appear gradually, and same effect for swapping.
Matti Hamalainen <ccr@tnsp.org>
parents:
105
diff
changeset
|
422 currPiece.changed(); |
| 54 | 423 nextPiece = new Piece(PieceType.ACTIVE); |
|
138
9eb791e2fa17
Optimize board updating logic, so that the old placed tiles need not to be
Matti Hamalainen <ccr@tnsp.org>
parents:
135
diff
changeset
|
424 flagBoardIsDirty = true; |
| 54 | 425 } |
|
134
4c0dec72e2f0
Whitespace cosmetic cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents:
133
diff
changeset
|
426 |
| 54 | 427 public void pieceSwapCurrent() |
| 428 { | |
| 56 | 429 if (!flagGameOver) |
| 430 { | |
| 431 Piece tmp = currPiece; | |
| 432 currPiece = nextPiece; | |
| 433 nextPiece = tmp; | |
| 434 board[currX][currY] = currPiece; | |
|
106
41c6cca69d60
Make new pieces appear gradually, and same effect for swapping.
Matti Hamalainen <ccr@tnsp.org>
parents:
105
diff
changeset
|
435 currPiece.changed(); |
|
41c6cca69d60
Make new pieces appear gradually, and same effect for swapping.
Matti Hamalainen <ccr@tnsp.org>
parents:
105
diff
changeset
|
436 nextPiece.changed(); |
|
139
be9cc2ee3c16
Minor fixes in updating logic.
Matti Hamalainen <ccr@tnsp.org>
parents:
138
diff
changeset
|
437 flagBoardIsDirty = true; |
| 56 | 438 } |
| 54 | 439 } |
|
134
4c0dec72e2f0
Whitespace cosmetic cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents:
133
diff
changeset
|
440 |
| 75 | 441 // Check one piece, set connections, find the new placement |
| 442 // based on piece rotations etc. | |
| 443 private boolean pieceCheck(Piece piece) | |
| 48 | 444 { |
| 53 | 445 if (piece == null) |
| 48 | 446 { |
| 447 // Create new piece | |
| 56 | 448 pieceCreateNew(); |
| 48 | 449 board[currX][currY] = currPiece; |
| 450 return true; | |
| 451 } | |
| 452 else | |
| 53 | 453 if (piece.getType() == PieceType.START) |
| 48 | 454 { |
| 455 if (currPiece != null) | |
| 456 { | |
| 457 // Hit center starting piece, game over | |
| 458 flagGameOver = true; | |
| 459 return true; | |
| 460 } | |
| 461 else | |
| 462 { | |
| 463 // Start piece as first piece means game is starting | |
| 464 pieceMoveTo(currPoint); | |
| 54 | 465 pieceCreateNew(); |
| 48 | 466 board[currX][currY] = currPiece; |
| 467 return true; | |
| 468 } | |
| 469 } | |
| 470 | |
| 471 // Mark the current piece as locked | |
| 53 | 472 piece.setType(PieceType.LOCKED); |
| 48 | 473 |
| 474 // Solve connection (with rotations) through the piece | |
| 53 | 475 currPoint = piece.getRotatedPoint(piece.getMatchingPoint(currPoint)); |
| 48 | 476 |
| 477 // Mark connection as active | |
| 53 | 478 piece.setConnectionState(currPoint, true); |
| 48 | 479 |
| 480 // Solve exit point (with rotations) | |
| 53 | 481 currPoint = piece.getAntiRotatedPoint(piece.getConnection(currPoint)); |
| 48 | 482 |
| 483 // Move to next position accordingly | |
| 484 pieceMoveTo(currPoint); | |
| 485 return false; | |
| 486 } | |
| 487 | |
| 75 | 488 // Finish one move/turn of the game, resolve path and find placement |
| 489 // of the next piece, or set "game over" state if required. | |
|
42
951a4d669af0
Initially working path solving algorithm.
Matti Hamalainen <ccr@tnsp.org>
parents:
41
diff
changeset
|
490 public void pieceFinishTurn() |
|
951a4d669af0
Initially working path solving algorithm.
Matti Hamalainen <ccr@tnsp.org>
parents:
41
diff
changeset
|
491 { |
| 48 | 492 boolean finished = false; |
| 55 | 493 int connections = 0; |
|
59
fd10a9422b60
Cleanups, bugfixes, etc etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
57
diff
changeset
|
494 |
|
fd10a9422b60
Cleanups, bugfixes, etc etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
57
diff
changeset
|
495 if (currPiece != null) |
|
fd10a9422b60
Cleanups, bugfixes, etc etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
57
diff
changeset
|
496 { |
| 75 | 497 G.smgr.play(sndPlaced); |
|
59
fd10a9422b60
Cleanups, bugfixes, etc etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
57
diff
changeset
|
498 } |
|
134
4c0dec72e2f0
Whitespace cosmetic cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents:
133
diff
changeset
|
499 |
| 48 | 500 while (!finished) |
| 7 | 501 { |
|
42
951a4d669af0
Initially working path solving algorithm.
Matti Hamalainen <ccr@tnsp.org>
parents:
41
diff
changeset
|
502 if (currX >= 0 && currX < boardSize && currY >= 0 && currY < boardSize) |
| 27 | 503 { |
|
135
a33fdb1de11c
Fix where the animated point elements appear initially.
Matti Hamalainen <ccr@tnsp.org>
parents:
134
diff
changeset
|
504 int oldX = currX, oldY = currY; |
| 55 | 505 connections++; |
| 48 | 506 finished = pieceCheck(board[currX][currY]); |
|
134
4c0dec72e2f0
Whitespace cosmetic cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents:
133
diff
changeset
|
507 |
|
131
67b2322fda91
Add spawning of animated score elements when player finishes a turn.
Matti Hamalainen <ccr@tnsp.org>
parents:
124
diff
changeset
|
508 if (!finished) |
|
67b2322fda91
Add spawning of animated score elements when player finishes a turn.
Matti Hamalainen <ccr@tnsp.org>
parents:
124
diff
changeset
|
509 { |
|
67b2322fda91
Add spawning of animated score elements when player finishes a turn.
Matti Hamalainen <ccr@tnsp.org>
parents:
124
diff
changeset
|
510 Lock write = pointLock.writeLock(); |
|
67b2322fda91
Add spawning of animated score elements when player finishes a turn.
Matti Hamalainen <ccr@tnsp.org>
parents:
124
diff
changeset
|
511 write.lock(); |
|
67b2322fda91
Add spawning of animated score elements when player finishes a turn.
Matti Hamalainen <ccr@tnsp.org>
parents:
124
diff
changeset
|
512 try |
|
67b2322fda91
Add spawning of animated score elements when player finishes a turn.
Matti Hamalainen <ccr@tnsp.org>
parents:
124
diff
changeset
|
513 { |
|
67b2322fda91
Add spawning of animated score elements when player finishes a turn.
Matti Hamalainen <ccr@tnsp.org>
parents:
124
diff
changeset
|
514 pointElems.add(new AnimatedPointElement( |
|
67b2322fda91
Add spawning of animated score elements when player finishes a turn.
Matti Hamalainen <ccr@tnsp.org>
parents:
124
diff
changeset
|
515 new IDMPoint( |
|
135
a33fdb1de11c
Fix where the animated point elements appear initially.
Matti Hamalainen <ccr@tnsp.org>
parents:
134
diff
changeset
|
516 getScaledX() + ((oldX + 0.5f) * pscale), |
|
a33fdb1de11c
Fix where the animated point elements appear initially.
Matti Hamalainen <ccr@tnsp.org>
parents:
134
diff
changeset
|
517 getScaledY() + ((oldY + 0.5f) * pscale)), |
|
131
67b2322fda91
Add spawning of animated score elements when player finishes a turn.
Matti Hamalainen <ccr@tnsp.org>
parents:
124
diff
changeset
|
518 "" + connections)); |
|
67b2322fda91
Add spawning of animated score elements when player finishes a turn.
Matti Hamalainen <ccr@tnsp.org>
parents:
124
diff
changeset
|
519 } |
|
67b2322fda91
Add spawning of animated score elements when player finishes a turn.
Matti Hamalainen <ccr@tnsp.org>
parents:
124
diff
changeset
|
520 finally |
|
67b2322fda91
Add spawning of animated score elements when player finishes a turn.
Matti Hamalainen <ccr@tnsp.org>
parents:
124
diff
changeset
|
521 { |
|
67b2322fda91
Add spawning of animated score elements when player finishes a turn.
Matti Hamalainen <ccr@tnsp.org>
parents:
124
diff
changeset
|
522 write.unlock(); |
|
67b2322fda91
Add spawning of animated score elements when player finishes a turn.
Matti Hamalainen <ccr@tnsp.org>
parents:
124
diff
changeset
|
523 } |
|
67b2322fda91
Add spawning of animated score elements when player finishes a turn.
Matti Hamalainen <ccr@tnsp.org>
parents:
124
diff
changeset
|
524 } |
|
135
a33fdb1de11c
Fix where the animated point elements appear initially.
Matti Hamalainen <ccr@tnsp.org>
parents:
134
diff
changeset
|
525 |
| 27 | 526 } |
| 527 else | |
| 528 { | |
| 46 | 529 // Outside of the board, game over |
| 48 | 530 finished = true; |
|
42
951a4d669af0
Initially working path solving algorithm.
Matti Hamalainen <ccr@tnsp.org>
parents:
41
diff
changeset
|
531 flagGameOver = true; |
| 7 | 532 } |
| 533 } | |
|
134
4c0dec72e2f0
Whitespace cosmetic cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents:
133
diff
changeset
|
534 |
| 66 | 535 // Compute and add score |
| 55 | 536 gameScore += connections * connections; |
|
134
4c0dec72e2f0
Whitespace cosmetic cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents:
133
diff
changeset
|
537 |
| 66 | 538 // If game over, clear the game |
| 53 | 539 if (flagGameOver) |
| 540 { | |
| 541 currPiece = null; | |
| 542 } | |
|
139
be9cc2ee3c16
Minor fixes in updating logic.
Matti Hamalainen <ccr@tnsp.org>
parents:
138
diff
changeset
|
543 |
|
be9cc2ee3c16
Minor fixes in updating logic.
Matti Hamalainen <ccr@tnsp.org>
parents:
138
diff
changeset
|
544 flagBoardIsDirty = true; |
|
42
951a4d669af0
Initially working path solving algorithm.
Matti Hamalainen <ccr@tnsp.org>
parents:
41
diff
changeset
|
545 } |
| 66 | 546 |
|
59
fd10a9422b60
Cleanups, bugfixes, etc etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
57
diff
changeset
|
547 public boolean mouseWheelMoved(MouseWheelEvent e) |
|
fd10a9422b60
Cleanups, bugfixes, etc etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
57
diff
changeset
|
548 { |
|
fd10a9422b60
Cleanups, bugfixes, etc etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
57
diff
changeset
|
549 int notches = e.getWheelRotation(); |
|
fd10a9422b60
Cleanups, bugfixes, etc etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
57
diff
changeset
|
550 |
|
fd10a9422b60
Cleanups, bugfixes, etc etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
57
diff
changeset
|
551 if (notches < 0) |
|
fd10a9422b60
Cleanups, bugfixes, etc etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
57
diff
changeset
|
552 pieceRotate(Piece.RotateDir.LEFT); |
|
fd10a9422b60
Cleanups, bugfixes, etc etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
57
diff
changeset
|
553 else |
|
fd10a9422b60
Cleanups, bugfixes, etc etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
57
diff
changeset
|
554 pieceRotate(Piece.RotateDir.RIGHT); |
|
fd10a9422b60
Cleanups, bugfixes, etc etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
57
diff
changeset
|
555 |
|
fd10a9422b60
Cleanups, bugfixes, etc etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
57
diff
changeset
|
556 return true; |
|
fd10a9422b60
Cleanups, bugfixes, etc etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
57
diff
changeset
|
557 } |
|
134
4c0dec72e2f0
Whitespace cosmetic cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents:
133
diff
changeset
|
558 |
| 75 | 559 public void clicked() |
| 560 { | |
|
77
d17db72ac770
Fix the game continuing after gameover bug again due to refactoring.
Matti Hamalainen <ccr@tnsp.org>
parents:
76
diff
changeset
|
561 if (!flagGameOver) |
|
d17db72ac770
Fix the game continuing after gameover bug again due to refactoring.
Matti Hamalainen <ccr@tnsp.org>
parents:
76
diff
changeset
|
562 pieceFinishTurn(); |
| 75 | 563 } |
| 47 | 564 |
|
49
e6da5c71be28
Add more code to IDM widgets, do preliminary work for integrating them.
Matti Hamalainen <ccr@tnsp.org>
parents:
48
diff
changeset
|
565 public boolean keyPressed(KeyEvent e) |
| 47 | 566 { |
| 54 | 567 if (flagGameOver) |
| 568 return false; | |
| 569 | |
| 47 | 570 switch (e.getKeyCode()) |
| 571 { | |
| 572 case KeyEvent.VK_LEFT: | |
| 573 case KeyEvent.VK_UP: | |
| 574 pieceRotate(Piece.RotateDir.LEFT); | |
| 575 return true; | |
| 576 | |
| 577 case KeyEvent.VK_RIGHT: | |
| 578 case KeyEvent.VK_DOWN: | |
| 579 pieceRotate(Piece.RotateDir.RIGHT); | |
| 580 return true; | |
| 581 | |
| 582 case KeyEvent.VK_ENTER: | |
| 583 pieceFinishTurn(); | |
| 584 return true; | |
| 585 } | |
| 586 return false; | |
| 587 } | |
| 1 | 588 } |
| 589 | |
| 590 | |
| 9 | 591 public class Engine extends JPanel |
|
59
fd10a9422b60
Cleanups, bugfixes, etc etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
57
diff
changeset
|
592 implements Runnable, KeyListener, |
|
fd10a9422b60
Cleanups, bugfixes, etc etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
57
diff
changeset
|
593 MouseListener, MouseWheelListener |
| 1 | 594 { |
| 25 | 595 long startTime; |
|
144
f01cb1ea26a5
Add some decorative animated elements.
Matti Hamalainen <ccr@tnsp.org>
parents:
140
diff
changeset
|
596 float gameUpdates, gameFrames; |
| 75 | 597 |
| 8 | 598 Thread animThread; |
| 599 boolean animEnable = false; | |
| 25 | 600 |
| 4 | 601 GameBoard lauta = null; |
|
69
163232ec225b
Stream music data instead of loading to memory.
Matti Hamalainen <ccr@tnsp.org>
parents:
68
diff
changeset
|
602 InputStream musa; |
|
49
e6da5c71be28
Add more code to IDM widgets, do preliminary work for integrating them.
Matti Hamalainen <ccr@tnsp.org>
parents:
48
diff
changeset
|
603 IDMContainer widgets; |
| 75 | 604 AboutBox aboutBox; |
|
49
e6da5c71be28
Add more code to IDM widgets, do preliminary work for integrating them.
Matti Hamalainen <ccr@tnsp.org>
parents:
48
diff
changeset
|
605 |
| 147 | 606 public void dbg(String msg) |
| 607 { | |
| 608 System.out.print("Engine: " + msg); | |
| 609 } | |
| 610 | |
| 9 | 611 public Engine() |
| 2 | 612 { |
| 25 | 613 // Initialize globals |
| 614 System.out.print("Engine() constructor\n"); | |
|
134
4c0dec72e2f0
Whitespace cosmetic cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents:
133
diff
changeset
|
615 |
| 37 | 616 // Sound system |
|
133
881deac2daf8
Some more work on scaling widgets, etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
131
diff
changeset
|
617 G.smgr = new SoundManager(new AudioFormat(22050, 16, 1, true, false), 1); |
| 9 | 618 |
| 25 | 619 // Load resources |
| 4 | 620 try |
| 621 { | |
| 24 | 622 ResourceLoader res = new ResourceLoader("graphics/board.jpg"); |
| 75 | 623 G.lautaBG = ImageIO.read(res.getStream()); |
|
134
4c0dec72e2f0
Whitespace cosmetic cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents:
133
diff
changeset
|
624 |
| 25 | 625 try { |
| 626 res = new ResourceLoader("graphics/font.ttf"); | |
|
134
4c0dec72e2f0
Whitespace cosmetic cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents:
133
diff
changeset
|
627 |
| 75 | 628 G.fonts = new Font[G.numFonts]; |
| 629 G.fonts[0] = Font.createFont(Font.TRUETYPE_FONT, res.getStream()); | |
| 630 G.fonts[1] = G.fonts[0].deriveFont(24f); | |
| 631 G.fonts[2] = G.fonts[0].deriveFont(64f); | |
| 76 | 632 G.fonts[3] = G.fonts[0].deriveFont(32f); |
| 25 | 633 } |
| 634 catch (FontFormatException e) | |
| 635 { | |
| 147 | 636 dbg("Could not initialize fonts.\n"); |
| 25 | 637 } |
|
134
4c0dec72e2f0
Whitespace cosmetic cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents:
133
diff
changeset
|
638 |
|
69
163232ec225b
Stream music data instead of loading to memory.
Matti Hamalainen <ccr@tnsp.org>
parents:
68
diff
changeset
|
639 res = new ResourceLoader("sounds/gamemusic.wav"); |
|
163232ec225b
Stream music data instead of loading to memory.
Matti Hamalainen <ccr@tnsp.org>
parents:
68
diff
changeset
|
640 musa = res.getStream(); |
| 4 | 641 } |
| 642 catch (IOException e) | |
| 643 { | |
| 644 JOptionPane.showMessageDialog(null, | |
| 21 | 645 e.getMessage(), |
| 4 | 646 "Initialization error", |
| 647 JOptionPane.ERROR_MESSAGE); | |
| 37 | 648 |
| 147 | 649 dbg(e.getMessage()); |
| 18 | 650 } |
| 651 | |
| 52 | 652 // Create IDM GUI widgets |
|
49
e6da5c71be28
Add more code to IDM widgets, do preliminary work for integrating them.
Matti Hamalainen <ccr@tnsp.org>
parents:
48
diff
changeset
|
653 widgets = new IDMContainer(); |
| 52 | 654 |
|
117
973f567c7b9d
Change how gameboard is rendered, make it more OO-sensible.
Matti Hamalainen <ccr@tnsp.org>
parents:
116
diff
changeset
|
655 lauta = new GameBoard(new IDMPoint(95, 130), 63); |
|
973f567c7b9d
Change how gameboard is rendered, make it more OO-sensible.
Matti Hamalainen <ccr@tnsp.org>
parents:
116
diff
changeset
|
656 widgets.add(lauta); |
|
973f567c7b9d
Change how gameboard is rendered, make it more OO-sensible.
Matti Hamalainen <ccr@tnsp.org>
parents:
116
diff
changeset
|
657 |
| 75 | 658 widgets.add(new BtnSwapPiece(767f, 450f)); |
|
124
fa1b86b632aa
Slight changes in UI buttons placement to match the graphics changes.
Matti Hamalainen <ccr@tnsp.org>
parents:
119
diff
changeset
|
659 widgets.add(new BtnAbout (767f, 550f)); |
|
fa1b86b632aa
Slight changes in UI buttons placement to match the graphics changes.
Matti Hamalainen <ccr@tnsp.org>
parents:
119
diff
changeset
|
660 widgets.add(new BtnNewGame (767f, 630f)); |
| 50 | 661 |
| 75 | 662 aboutBox = new AboutBox(); |
|
134
4c0dec72e2f0
Whitespace cosmetic cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents:
133
diff
changeset
|
663 |
|
49
e6da5c71be28
Add more code to IDM widgets, do preliminary work for integrating them.
Matti Hamalainen <ccr@tnsp.org>
parents:
48
diff
changeset
|
664 // Game |
|
e6da5c71be28
Add more code to IDM widgets, do preliminary work for integrating them.
Matti Hamalainen <ccr@tnsp.org>
parents:
48
diff
changeset
|
665 startNewGame(); |
|
134
4c0dec72e2f0
Whitespace cosmetic cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents:
133
diff
changeset
|
666 |
|
49
e6da5c71be28
Add more code to IDM widgets, do preliminary work for integrating them.
Matti Hamalainen <ccr@tnsp.org>
parents:
48
diff
changeset
|
667 // Initialize event listeners |
| 18 | 668 addKeyListener(this); |
| 669 addMouseListener(this); | |
|
59
fd10a9422b60
Cleanups, bugfixes, etc etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
57
diff
changeset
|
670 addMouseWheelListener(this); |
| 18 | 671 |
| 93 | 672 // Start playing background music |
| 673 G.smgr.play(musa); | |
| 674 | |
| 18 | 675 // Get initial focus |
| 676 if (!hasFocus()) | |
| 677 { | |
| 147 | 678 dbg("Requesting focus.\n"); |
| 18 | 679 requestFocus(); |
| 4 | 680 } |
| 93 | 681 |
|
144
f01cb1ea26a5
Add some decorative animated elements.
Matti Hamalainen <ccr@tnsp.org>
parents:
140
diff
changeset
|
682 gameUpdates = 0; |
| 8 | 683 } |
| 684 | |
|
49
e6da5c71be28
Add more code to IDM widgets, do preliminary work for integrating them.
Matti Hamalainen <ccr@tnsp.org>
parents:
48
diff
changeset
|
685 public void startNewGame() |
|
e6da5c71be28
Add more code to IDM widgets, do preliminary work for integrating them.
Matti Hamalainen <ccr@tnsp.org>
parents:
48
diff
changeset
|
686 { |
|
e6da5c71be28
Add more code to IDM widgets, do preliminary work for integrating them.
Matti Hamalainen <ccr@tnsp.org>
parents:
48
diff
changeset
|
687 gameFrames = 0; |
|
e6da5c71be28
Add more code to IDM widgets, do preliminary work for integrating them.
Matti Hamalainen <ccr@tnsp.org>
parents:
48
diff
changeset
|
688 startTime = new Date().getTime(); |
|
59
fd10a9422b60
Cleanups, bugfixes, etc etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
57
diff
changeset
|
689 lauta.startNewGame(); |
|
49
e6da5c71be28
Add more code to IDM widgets, do preliminary work for integrating them.
Matti Hamalainen <ccr@tnsp.org>
parents:
48
diff
changeset
|
690 } |
| 25 | 691 |
| 692 public void paintComponent(Graphics g) | |
| 693 { | |
| 694 Graphics2D g2 = (Graphics2D) g; | |
|
138
9eb791e2fa17
Optimize board updating logic, so that the old placed tiles need not to be
Matti Hamalainen <ccr@tnsp.org>
parents:
135
diff
changeset
|
695 boolean scaleChanged = false, |
|
9eb791e2fa17
Optimize board updating logic, so that the old placed tiles need not to be
Matti Hamalainen <ccr@tnsp.org>
parents:
135
diff
changeset
|
696 updateBoard = lauta.isBoardDirty(); |
|
134
4c0dec72e2f0
Whitespace cosmetic cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents:
133
diff
changeset
|
697 |
| 52 | 698 // Rescale if parent component size has changed |
| 25 | 699 Dimension dim = getSize(); |
| 75 | 700 if (G.screenDim == null || !dim.equals(G.screenDim)) |
| 25 | 701 { |
|
133
881deac2daf8
Some more work on scaling widgets, etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
131
diff
changeset
|
702 float dw = dim.width / 1024.0f, |
|
881deac2daf8
Some more work on scaling widgets, etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
131
diff
changeset
|
703 dh = dim.height / 768.0f; |
|
134
4c0dec72e2f0
Whitespace cosmetic cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents:
133
diff
changeset
|
704 |
|
59
fd10a9422b60
Cleanups, bugfixes, etc etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
57
diff
changeset
|
705 // Rescale IDM GUI widgets |
|
133
881deac2daf8
Some more work on scaling widgets, etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
131
diff
changeset
|
706 widgets.setScale(dw, dh); |
| 75 | 707 G.screenDim = dim; |
|
59
fd10a9422b60
Cleanups, bugfixes, etc etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
57
diff
changeset
|
708 |
| 52 | 709 // Rescale background image |
|
133
881deac2daf8
Some more work on scaling widgets, etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
131
diff
changeset
|
710 // Rescale fonts |
|
881deac2daf8
Some more work on scaling widgets, etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
131
diff
changeset
|
711 G.fonts[1] = G.fonts[0].deriveFont(24f * dw); |
|
881deac2daf8
Some more work on scaling widgets, etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
131
diff
changeset
|
712 G.fonts[2] = G.fonts[0].deriveFont(64f * dw); |
|
881deac2daf8
Some more work on scaling widgets, etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
131
diff
changeset
|
713 G.fonts[3] = G.fonts[0].deriveFont(32f * dw); |
|
134
4c0dec72e2f0
Whitespace cosmetic cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents:
133
diff
changeset
|
714 |
| 147 | 715 dbg("Scale changed.\n"); |
|
133
881deac2daf8
Some more work on scaling widgets, etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
131
diff
changeset
|
716 scaleChanged = true; |
|
138
9eb791e2fa17
Optimize board updating logic, so that the old placed tiles need not to be
Matti Hamalainen <ccr@tnsp.org>
parents:
135
diff
changeset
|
717 updateBoard = true; |
|
9eb791e2fa17
Optimize board updating logic, so that the old placed tiles need not to be
Matti Hamalainen <ccr@tnsp.org>
parents:
135
diff
changeset
|
718 } |
|
9eb791e2fa17
Optimize board updating logic, so that the old placed tiles need not to be
Matti Hamalainen <ccr@tnsp.org>
parents:
135
diff
changeset
|
719 |
|
9eb791e2fa17
Optimize board updating logic, so that the old placed tiles need not to be
Matti Hamalainen <ccr@tnsp.org>
parents:
135
diff
changeset
|
720 if (updateBoard) |
|
9eb791e2fa17
Optimize board updating logic, so that the old placed tiles need not to be
Matti Hamalainen <ccr@tnsp.org>
parents:
135
diff
changeset
|
721 { |
| 147 | 722 // dbg("updateBoard()\n"); |
|
138
9eb791e2fa17
Optimize board updating logic, so that the old placed tiles need not to be
Matti Hamalainen <ccr@tnsp.org>
parents:
135
diff
changeset
|
723 G.lautaBGScaled = new BufferedImage(dim.width, dim.height, BufferedImage.TYPE_INT_RGB); |
|
9eb791e2fa17
Optimize board updating logic, so that the old placed tiles need not to be
Matti Hamalainen <ccr@tnsp.org>
parents:
135
diff
changeset
|
724 Graphics2D gimg = G.lautaBGScaled.createGraphics(); |
|
9eb791e2fa17
Optimize board updating logic, so that the old placed tiles need not to be
Matti Hamalainen <ccr@tnsp.org>
parents:
135
diff
changeset
|
725 gimg.setRenderingHint(RenderingHints.KEY_INTERPOLATION, |
|
9eb791e2fa17
Optimize board updating logic, so that the old placed tiles need not to be
Matti Hamalainen <ccr@tnsp.org>
parents:
135
diff
changeset
|
726 RenderingHints.VALUE_INTERPOLATION_BICUBIC); |
|
9eb791e2fa17
Optimize board updating logic, so that the old placed tiles need not to be
Matti Hamalainen <ccr@tnsp.org>
parents:
135
diff
changeset
|
727 |
|
9eb791e2fa17
Optimize board updating logic, so that the old placed tiles need not to be
Matti Hamalainen <ccr@tnsp.org>
parents:
135
diff
changeset
|
728 gimg.setRenderingHint(RenderingHints.KEY_ANTIALIASING, |
|
9eb791e2fa17
Optimize board updating logic, so that the old placed tiles need not to be
Matti Hamalainen <ccr@tnsp.org>
parents:
135
diff
changeset
|
729 RenderingHints.VALUE_ANTIALIAS_ON); |
|
9eb791e2fa17
Optimize board updating logic, so that the old placed tiles need not to be
Matti Hamalainen <ccr@tnsp.org>
parents:
135
diff
changeset
|
730 |
|
9eb791e2fa17
Optimize board updating logic, so that the old placed tiles need not to be
Matti Hamalainen <ccr@tnsp.org>
parents:
135
diff
changeset
|
731 gimg.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, |
|
9eb791e2fa17
Optimize board updating logic, so that the old placed tiles need not to be
Matti Hamalainen <ccr@tnsp.org>
parents:
135
diff
changeset
|
732 RenderingHints.VALUE_TEXT_ANTIALIAS_ON); |
|
9eb791e2fa17
Optimize board updating logic, so that the old placed tiles need not to be
Matti Hamalainen <ccr@tnsp.org>
parents:
135
diff
changeset
|
733 |
|
9eb791e2fa17
Optimize board updating logic, so that the old placed tiles need not to be
Matti Hamalainen <ccr@tnsp.org>
parents:
135
diff
changeset
|
734 gimg.drawImage(G.lautaBG, 0, 0, dim.width, dim.height, null); |
|
9eb791e2fa17
Optimize board updating logic, so that the old placed tiles need not to be
Matti Hamalainen <ccr@tnsp.org>
parents:
135
diff
changeset
|
735 lauta.paintBackPlate(gimg); |
|
9eb791e2fa17
Optimize board updating logic, so that the old placed tiles need not to be
Matti Hamalainen <ccr@tnsp.org>
parents:
135
diff
changeset
|
736 lauta.paintBoard(gimg, false); |
| 25 | 737 } |
|
134
4c0dec72e2f0
Whitespace cosmetic cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents:
133
diff
changeset
|
738 |
|
59
fd10a9422b60
Cleanups, bugfixes, etc etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
57
diff
changeset
|
739 // Get font metrics against current Graphics2D context |
|
133
881deac2daf8
Some more work on scaling widgets, etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
131
diff
changeset
|
740 if (G.metrics == null || scaleChanged) |
| 75 | 741 { |
| 742 G.metrics = new FontMetrics[G.numFonts]; | |
| 743 for (int i = 0; i < G.numFonts; i++) | |
| 744 G.metrics[i] = g2.getFontMetrics(G.fonts[i]); | |
| 745 } | |
|
134
4c0dec72e2f0
Whitespace cosmetic cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents:
133
diff
changeset
|
746 |
|
59
fd10a9422b60
Cleanups, bugfixes, etc etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
57
diff
changeset
|
747 // Draw background image, pieces, widgets |
| 75 | 748 g2.drawImage(G.lautaBGScaled, 0, 0, null); |
|
86
454a9fcd13ca
Turn antialiasing rendering hints on only for the needed elements to improve rendering speed and CPU usage.
Matti Hamalainen <ccr@tnsp.org>
parents:
82
diff
changeset
|
749 |
|
454a9fcd13ca
Turn antialiasing rendering hints on only for the needed elements to improve rendering speed and CPU usage.
Matti Hamalainen <ccr@tnsp.org>
parents:
82
diff
changeset
|
750 // Use antialiasing when rendering the game elements |
|
454a9fcd13ca
Turn antialiasing rendering hints on only for the needed elements to improve rendering speed and CPU usage.
Matti Hamalainen <ccr@tnsp.org>
parents:
82
diff
changeset
|
751 g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING, |
|
454a9fcd13ca
Turn antialiasing rendering hints on only for the needed elements to improve rendering speed and CPU usage.
Matti Hamalainen <ccr@tnsp.org>
parents:
82
diff
changeset
|
752 RenderingHints.VALUE_ANTIALIAS_ON); |
|
454a9fcd13ca
Turn antialiasing rendering hints on only for the needed elements to improve rendering speed and CPU usage.
Matti Hamalainen <ccr@tnsp.org>
parents:
82
diff
changeset
|
753 |
|
454a9fcd13ca
Turn antialiasing rendering hints on only for the needed elements to improve rendering speed and CPU usage.
Matti Hamalainen <ccr@tnsp.org>
parents:
82
diff
changeset
|
754 g2.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, |
|
454a9fcd13ca
Turn antialiasing rendering hints on only for the needed elements to improve rendering speed and CPU usage.
Matti Hamalainen <ccr@tnsp.org>
parents:
82
diff
changeset
|
755 RenderingHints.VALUE_TEXT_ANTIALIAS_ON); |
|
454a9fcd13ca
Turn antialiasing rendering hints on only for the needed elements to improve rendering speed and CPU usage.
Matti Hamalainen <ccr@tnsp.org>
parents:
82
diff
changeset
|
756 |
|
59
fd10a9422b60
Cleanups, bugfixes, etc etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
57
diff
changeset
|
757 widgets.paint(g2); |
| 55 | 758 |
| 75 | 759 |
| 760 // Frames per second counter | |
|
155
1ba6f56203f2
Disable FPS counter for now.
Matti Hamalainen <ccr@tnsp.org>
parents:
154
diff
changeset
|
761 /* |
| 75 | 762 g2.setFont(G.fonts[1]); |
| 25 | 763 long currTime = new Date().getTime(); |
|
117
973f567c7b9d
Change how gameboard is rendered, make it more OO-sensible.
Matti Hamalainen <ccr@tnsp.org>
parents:
116
diff
changeset
|
764 g2.drawString("fps = "+ ((gameFrames * 1000) / (currTime - startTime)), G.screenDim.width - 120, 20); |
|
155
1ba6f56203f2
Disable FPS counter for now.
Matti Hamalainen <ccr@tnsp.org>
parents:
154
diff
changeset
|
765 */ |
| 75 | 766 gameFrames++; |
| 25 | 767 } |
| 768 | |
| 8 | 769 public void startThreads() |
| 770 { | |
| 147 | 771 dbg("startThreads()\n"); |
| 8 | 772 if (animThread == null) |
| 773 { | |
| 774 animThread = new Thread(this); | |
| 775 animEnable = true; | |
| 776 animThread.start(); | |
| 777 } | |
| 778 } | |
|
134
4c0dec72e2f0
Whitespace cosmetic cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents:
133
diff
changeset
|
779 |
| 8 | 780 public void stopThreads() |
| 781 { | |
| 147 | 782 dbg("stopThreads()\n"); |
|
134
4c0dec72e2f0
Whitespace cosmetic cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents:
133
diff
changeset
|
783 |
| 37 | 784 // Stop animations |
| 8 | 785 if (animThread != null) |
| 786 { | |
| 787 animThread.interrupt(); | |
| 788 animEnable = false; | |
| 789 animThread = null; | |
| 790 } | |
| 22 | 791 |
| 37 | 792 // Shut down sound manager |
| 75 | 793 G.smgr.close(); |
| 2 | 794 } |
| 0 | 795 |
| 75 | 796 public void mouseEntered(MouseEvent e) |
| 797 { | |
| 798 widgets.mouseEntered(e); | |
| 799 } | |
| 800 public void mouseExited(MouseEvent e) | |
| 801 { | |
| 802 widgets.mouseExited(e); | |
| 803 } | |
|
49
e6da5c71be28
Add more code to IDM widgets, do preliminary work for integrating them.
Matti Hamalainen <ccr@tnsp.org>
parents:
48
diff
changeset
|
804 |
|
e6da5c71be28
Add more code to IDM widgets, do preliminary work for integrating them.
Matti Hamalainen <ccr@tnsp.org>
parents:
48
diff
changeset
|
805 public void mousePressed(MouseEvent e) |
|
e6da5c71be28
Add more code to IDM widgets, do preliminary work for integrating them.
Matti Hamalainen <ccr@tnsp.org>
parents:
48
diff
changeset
|
806 { |
| 75 | 807 if (widgets.containsObject(aboutBox)) |
| 808 aboutBox.mousePressed(e); | |
| 809 else | |
|
60
4a984e3b27d2
Cleanups. Add a ad-hoc about box, it's ugly.
Matti Hamalainen <ccr@tnsp.org>
parents:
59
diff
changeset
|
810 widgets.mousePressed(e); |
|
49
e6da5c71be28
Add more code to IDM widgets, do preliminary work for integrating them.
Matti Hamalainen <ccr@tnsp.org>
parents:
48
diff
changeset
|
811 } |
|
e6da5c71be28
Add more code to IDM widgets, do preliminary work for integrating them.
Matti Hamalainen <ccr@tnsp.org>
parents:
48
diff
changeset
|
812 |
|
e6da5c71be28
Add more code to IDM widgets, do preliminary work for integrating them.
Matti Hamalainen <ccr@tnsp.org>
parents:
48
diff
changeset
|
813 public void mouseReleased(MouseEvent e) |
|
e6da5c71be28
Add more code to IDM widgets, do preliminary work for integrating them.
Matti Hamalainen <ccr@tnsp.org>
parents:
48
diff
changeset
|
814 { |
| 75 | 815 if (widgets.containsObject(aboutBox)) |
| 816 aboutBox.mouseReleased(e); | |
| 817 else | |
|
60
4a984e3b27d2
Cleanups. Add a ad-hoc about box, it's ugly.
Matti Hamalainen <ccr@tnsp.org>
parents:
59
diff
changeset
|
818 widgets.mouseReleased(e); |
|
49
e6da5c71be28
Add more code to IDM widgets, do preliminary work for integrating them.
Matti Hamalainen <ccr@tnsp.org>
parents:
48
diff
changeset
|
819 } |
| 18 | 820 |
| 821 public void mouseClicked(MouseEvent e) | |
| 822 { | |
| 823 if (!hasFocus()) | |
| 824 { | |
| 147 | 825 dbg("Requesting focus.\n"); |
| 18 | 826 requestFocus(); |
| 827 } | |
|
59
fd10a9422b60
Cleanups, bugfixes, etc etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
57
diff
changeset
|
828 } |
|
fd10a9422b60
Cleanups, bugfixes, etc etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
57
diff
changeset
|
829 |
|
fd10a9422b60
Cleanups, bugfixes, etc etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
57
diff
changeset
|
830 public void mouseWheelMoved(MouseWheelEvent e) |
|
fd10a9422b60
Cleanups, bugfixes, etc etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
57
diff
changeset
|
831 { |
|
fd10a9422b60
Cleanups, bugfixes, etc etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
57
diff
changeset
|
832 lauta.mouseWheelMoved(e); |
| 18 | 833 } |
| 834 | |
| 75 | 835 public void keyTyped(KeyEvent e) { } |
| 836 public void keyReleased(KeyEvent e) { } | |
|
134
4c0dec72e2f0
Whitespace cosmetic cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents:
133
diff
changeset
|
837 |
| 9 | 838 public void keyPressed(KeyEvent e) |
| 2 | 839 { |
| 75 | 840 // Handle keyboard input |
| 841 if (widgets.containsObject(aboutBox)) | |
| 842 aboutBox.keyPressed(e); | |
|
60
4a984e3b27d2
Cleanups. Add a ad-hoc about box, it's ugly.
Matti Hamalainen <ccr@tnsp.org>
parents:
59
diff
changeset
|
843 else |
|
4a984e3b27d2
Cleanups. Add a ad-hoc about box, it's ugly.
Matti Hamalainen <ccr@tnsp.org>
parents:
59
diff
changeset
|
844 widgets.keyPressed(e); |
| 2 | 845 } |
|
134
4c0dec72e2f0
Whitespace cosmetic cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents:
133
diff
changeset
|
846 |
| 8 | 847 public void run() |
| 848 { | |
| 849 while (animEnable) | |
| 850 { | |
|
26
3d4cc47df31a
Cleanups, fix piece rendering and rotation.
Matti Hamalainen <ccr@tnsp.org>
parents:
25
diff
changeset
|
851 // Progress game animation clock |
|
144
f01cb1ea26a5
Add some decorative animated elements.
Matti Hamalainen <ccr@tnsp.org>
parents:
140
diff
changeset
|
852 gameUpdates++; |
| 9 | 853 |
|
26
3d4cc47df31a
Cleanups, fix piece rendering and rotation.
Matti Hamalainen <ccr@tnsp.org>
parents:
25
diff
changeset
|
854 // Animate components |
|
144
f01cb1ea26a5
Add some decorative animated elements.
Matti Hamalainen <ccr@tnsp.org>
parents:
140
diff
changeset
|
855 lauta.animate(gameUpdates); |
|
134
4c0dec72e2f0
Whitespace cosmetic cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents:
133
diff
changeset
|
856 |
|
26
3d4cc47df31a
Cleanups, fix piece rendering and rotation.
Matti Hamalainen <ccr@tnsp.org>
parents:
25
diff
changeset
|
857 // Repaint with a frame limiter |
|
144
f01cb1ea26a5
Add some decorative animated elements.
Matti Hamalainen <ccr@tnsp.org>
parents:
140
diff
changeset
|
858 if (gameUpdates % 4 == 1) |
| 10 | 859 repaint(); |
|
134
4c0dec72e2f0
Whitespace cosmetic cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents:
133
diff
changeset
|
860 |
|
26
3d4cc47df31a
Cleanups, fix piece rendering and rotation.
Matti Hamalainen <ccr@tnsp.org>
parents:
25
diff
changeset
|
861 // Sleep for a moment |
| 9 | 862 try { |
| 863 Thread.sleep(10); | |
| 864 } | |
| 865 catch (InterruptedException x) { | |
| 866 } | |
| 8 | 867 } |
| 868 } | |
|
134
4c0dec72e2f0
Whitespace cosmetic cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents:
133
diff
changeset
|
869 |
|
49
e6da5c71be28
Add more code to IDM widgets, do preliminary work for integrating them.
Matti Hamalainen <ccr@tnsp.org>
parents:
48
diff
changeset
|
870 class BtnNewGame extends IDMButton |
|
e6da5c71be28
Add more code to IDM widgets, do preliminary work for integrating them.
Matti Hamalainen <ccr@tnsp.org>
parents:
48
diff
changeset
|
871 { |
| 51 | 872 public BtnNewGame(float x, float y) |
|
49
e6da5c71be28
Add more code to IDM widgets, do preliminary work for integrating them.
Matti Hamalainen <ccr@tnsp.org>
parents:
48
diff
changeset
|
873 { |
| 75 | 874 super(x, y, KeyEvent.VK_ESCAPE, G.fonts[1], "New Game"); |
|
49
e6da5c71be28
Add more code to IDM widgets, do preliminary work for integrating them.
Matti Hamalainen <ccr@tnsp.org>
parents:
48
diff
changeset
|
875 } |
|
e6da5c71be28
Add more code to IDM widgets, do preliminary work for integrating them.
Matti Hamalainen <ccr@tnsp.org>
parents:
48
diff
changeset
|
876 |
|
e6da5c71be28
Add more code to IDM widgets, do preliminary work for integrating them.
Matti Hamalainen <ccr@tnsp.org>
parents:
48
diff
changeset
|
877 public void clicked() |
|
e6da5c71be28
Add more code to IDM widgets, do preliminary work for integrating them.
Matti Hamalainen <ccr@tnsp.org>
parents:
48
diff
changeset
|
878 { |
|
e6da5c71be28
Add more code to IDM widgets, do preliminary work for integrating them.
Matti Hamalainen <ccr@tnsp.org>
parents:
48
diff
changeset
|
879 startNewGame(); |
|
e6da5c71be28
Add more code to IDM widgets, do preliminary work for integrating them.
Matti Hamalainen <ccr@tnsp.org>
parents:
48
diff
changeset
|
880 } |
|
e6da5c71be28
Add more code to IDM widgets, do preliminary work for integrating them.
Matti Hamalainen <ccr@tnsp.org>
parents:
48
diff
changeset
|
881 } |
| 50 | 882 |
| 883 class BtnSwapPiece extends IDMButton | |
| 884 { | |
| 51 | 885 public BtnSwapPiece(float x, float y) |
| 50 | 886 { |
| 75 | 887 super(x, y, KeyEvent.VK_SPACE, G.fonts[1], "Swap"); |
| 50 | 888 } |
| 889 | |
| 890 public void clicked() | |
| 891 { | |
| 54 | 892 lauta.pieceSwapCurrent(); |
| 50 | 893 } |
| 894 } | |
|
60
4a984e3b27d2
Cleanups. Add a ad-hoc about box, it's ugly.
Matti Hamalainen <ccr@tnsp.org>
parents:
59
diff
changeset
|
895 |
|
4a984e3b27d2
Cleanups. Add a ad-hoc about box, it's ugly.
Matti Hamalainen <ccr@tnsp.org>
parents:
59
diff
changeset
|
896 class BtnAbout extends IDMButton |
|
4a984e3b27d2
Cleanups. Add a ad-hoc about box, it's ugly.
Matti Hamalainen <ccr@tnsp.org>
parents:
59
diff
changeset
|
897 { |
|
4a984e3b27d2
Cleanups. Add a ad-hoc about box, it's ugly.
Matti Hamalainen <ccr@tnsp.org>
parents:
59
diff
changeset
|
898 public BtnAbout(float x, float y) |
|
4a984e3b27d2
Cleanups. Add a ad-hoc about box, it's ugly.
Matti Hamalainen <ccr@tnsp.org>
parents:
59
diff
changeset
|
899 { |
| 75 | 900 super(x, y, KeyEvent.VK_A, G.fonts[1], "About"); |
|
60
4a984e3b27d2
Cleanups. Add a ad-hoc about box, it's ugly.
Matti Hamalainen <ccr@tnsp.org>
parents:
59
diff
changeset
|
901 } |
|
4a984e3b27d2
Cleanups. Add a ad-hoc about box, it's ugly.
Matti Hamalainen <ccr@tnsp.org>
parents:
59
diff
changeset
|
902 |
|
4a984e3b27d2
Cleanups. Add a ad-hoc about box, it's ugly.
Matti Hamalainen <ccr@tnsp.org>
parents:
59
diff
changeset
|
903 public void clicked() |
|
4a984e3b27d2
Cleanups. Add a ad-hoc about box, it's ugly.
Matti Hamalainen <ccr@tnsp.org>
parents:
59
diff
changeset
|
904 { |
| 75 | 905 if (!widgets.containsObject(aboutBox)) |
| 906 widgets.add(aboutBox); | |
|
60
4a984e3b27d2
Cleanups. Add a ad-hoc about box, it's ugly.
Matti Hamalainen <ccr@tnsp.org>
parents:
59
diff
changeset
|
907 } |
|
4a984e3b27d2
Cleanups. Add a ad-hoc about box, it's ugly.
Matti Hamalainen <ccr@tnsp.org>
parents:
59
diff
changeset
|
908 } |
| 0 | 909 } |