Mercurial > hg > ristipolku
annotate game/Piece.java @ 138:9eb791e2fa17
Optimize board updating logic, so that the old placed tiles need not to be
redrawn from scratch on each screen update, as they do not change usually.
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Fri, 25 Nov 2011 11:04:09 +0200 |
| parents | 4c0dec72e2f0 |
| children | 35374be74fdc |
| rev | line source |
|---|---|
| 1 | 1 /* |
| 2 * Ristipolku | |
| 3 * (C) Copyright 2011 Matti 'ccr' Hämäläinen <ccr@tnsp.org> | |
| 4 */ | |
| 5 package game; | |
| 6 | |
| 7 import java.awt.*; | |
| 7 | 8 import java.awt.geom.*; |
| 1 | 9 import java.util.*; |
| 6 | 10 import java.math.*; |
| 1 | 11 |
| 12 | |
| 13 public class Piece | |
| 14 { | |
|
32
e480579cc460
More work on debugging the path resolving.
Matti Hamalainen <ccr@tnsp.org>
parents:
30
diff
changeset
|
15 public enum RotateDir { LEFT, RIGHT } |
|
134
4c0dec72e2f0
Whitespace cosmetic cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents:
106
diff
changeset
|
16 |
| 3 | 17 static final int numConnections = 8; |
|
104
eb2e72dd8cae
Change how piece rotation works.
Matti Hamalainen <ccr@tnsp.org>
parents:
92
diff
changeset
|
18 static final float maxTime = 50.0f; |
| 9 | 19 |
| 3 | 20 int currRotation; |
| 21 int[] connections; | |
| 40 | 22 boolean[] states; |
|
32
e480579cc460
More work on debugging the path resolving.
Matti Hamalainen <ccr@tnsp.org>
parents:
30
diff
changeset
|
23 PieceType type, prevType; |
| 1 | 24 |
| 3 | 25 boolean rotationChanged, rotationActive, |
| 9 | 26 typeChanged, typeActive, |
|
138
9eb791e2fa17
Optimize board updating logic, so that the old placed tiles need not to be
Matti Hamalainen <ccr@tnsp.org>
parents:
134
diff
changeset
|
27 stateChanged, stateActive, |
|
9eb791e2fa17
Optimize board updating logic, so that the old placed tiles need not to be
Matti Hamalainen <ccr@tnsp.org>
parents:
134
diff
changeset
|
28 active; |
| 6 | 29 |
|
106
41c6cca69d60
Make new pieces appear gradually, and same effect for swapping.
Matti Hamalainen <ccr@tnsp.org>
parents:
104
diff
changeset
|
30 float currAngle, rotationTime, rotationSpeed, |
|
41c6cca69d60
Make new pieces appear gradually, and same effect for swapping.
Matti Hamalainen <ccr@tnsp.org>
parents:
104
diff
changeset
|
31 typeTime, typeValue, throbTime; |
| 91 | 32 |
|
106
41c6cca69d60
Make new pieces appear gradually, and same effect for swapping.
Matti Hamalainen <ccr@tnsp.org>
parents:
104
diff
changeset
|
33 Interpolate lerpRotation, |
|
41c6cca69d60
Make new pieces appear gradually, and same effect for swapping.
Matti Hamalainen <ccr@tnsp.org>
parents:
104
diff
changeset
|
34 lerpType; |
| 1 | 35 |
|
32
e480579cc460
More work on debugging the path resolving.
Matti Hamalainen <ccr@tnsp.org>
parents:
30
diff
changeset
|
36 |
| 3 | 37 public Piece(PieceType ptype) |
| 38 { | |
| 39 // Initialize | |
| 40 connections = new int[numConnections]; | |
| 40 | 41 states = new boolean[numConnections]; |
| 3 | 42 type = ptype; |
| 1 | 43 |
| 3 | 44 rotationChanged = false; |
| 6 | 45 rotationActive = false; |
|
104
eb2e72dd8cae
Change how piece rotation works.
Matti Hamalainen <ccr@tnsp.org>
parents:
92
diff
changeset
|
46 currRotation = 4 * 5000; |
|
eb2e72dd8cae
Change how piece rotation works.
Matti Hamalainen <ccr@tnsp.org>
parents:
92
diff
changeset
|
47 currAngle = getAngle(currRotation); |
| 6 | 48 |
| 3 | 49 typeChanged = false; |
| 50 typeActive = false; | |
|
134
4c0dec72e2f0
Whitespace cosmetic cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents:
106
diff
changeset
|
51 |
|
32
e480579cc460
More work on debugging the path resolving.
Matti Hamalainen <ccr@tnsp.org>
parents:
30
diff
changeset
|
52 throbTime = 0; |
| 1 | 53 |
|
106
41c6cca69d60
Make new pieces appear gradually, and same effect for swapping.
Matti Hamalainen <ccr@tnsp.org>
parents:
104
diff
changeset
|
54 lerpType = new Interpolate(1.0f, 0.0f, maxTime); |
| 1 | 55 |
| 3 | 56 // Initialize connections between endpoints of the paths inside the piece |
| 57 for (int i = 0; i < numConnections; i++) | |
| 58 connections[i] = -1; | |
| 1 | 59 |
|
26
3d4cc47df31a
Cleanups, fix piece rendering and rotation.
Matti Hamalainen <ccr@tnsp.org>
parents:
21
diff
changeset
|
60 |
| 6 | 61 // Randomize connections in the piece |
| 3 | 62 Random rnd = new Random(); |
| 63 for (int i = 0; i < numConnections; i++) | |
| 64 { | |
| 65 while (connections[i] < 0) | |
| 66 { | |
| 67 int tmp = rnd.nextInt(numConnections); | |
|
26
3d4cc47df31a
Cleanups, fix piece rendering and rotation.
Matti Hamalainen <ccr@tnsp.org>
parents:
21
diff
changeset
|
68 if (tmp != i && connections[tmp] < 0) |
| 3 | 69 { |
| 70 connections[i] = tmp; | |
| 71 connections[tmp] = i; | |
| 72 } | |
| 73 } | |
| 74 } | |
| 75 } | |
| 76 | |
| 77 public Piece() | |
| 78 { | |
| 79 this(PieceType.NONE); | |
| 80 } | |
| 1 | 81 |
|
106
41c6cca69d60
Make new pieces appear gradually, and same effect for swapping.
Matti Hamalainen <ccr@tnsp.org>
parents:
104
diff
changeset
|
82 |
|
41c6cca69d60
Make new pieces appear gradually, and same effect for swapping.
Matti Hamalainen <ccr@tnsp.org>
parents:
104
diff
changeset
|
83 public void changed() |
|
41c6cca69d60
Make new pieces appear gradually, and same effect for swapping.
Matti Hamalainen <ccr@tnsp.org>
parents:
104
diff
changeset
|
84 { |
|
41c6cca69d60
Make new pieces appear gradually, and same effect for swapping.
Matti Hamalainen <ccr@tnsp.org>
parents:
104
diff
changeset
|
85 typeChanged = true; |
|
41c6cca69d60
Make new pieces appear gradually, and same effect for swapping.
Matti Hamalainen <ccr@tnsp.org>
parents:
104
diff
changeset
|
86 } |
|
134
4c0dec72e2f0
Whitespace cosmetic cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents:
106
diff
changeset
|
87 |
| 3 | 88 public void setType(PieceType ptype) |
| 89 { | |
|
106
41c6cca69d60
Make new pieces appear gradually, and same effect for swapping.
Matti Hamalainen <ccr@tnsp.org>
parents:
104
diff
changeset
|
90 // typeChanged = (prevType != ptype) && (ptype == PieceType.LOCKED); |
|
32
e480579cc460
More work on debugging the path resolving.
Matti Hamalainen <ccr@tnsp.org>
parents:
30
diff
changeset
|
91 prevType = type; |
| 3 | 92 type = ptype; |
| 93 } | |
| 1 | 94 |
| 40 | 95 public void clearStates() |
| 96 { | |
| 97 for (int i = 0; i < numConnections; i++) | |
| 98 states[i] = false; | |
| 99 stateChanged = true; | |
| 100 } | |
| 101 | |
|
104
eb2e72dd8cae
Change how piece rotation works.
Matti Hamalainen <ccr@tnsp.org>
parents:
92
diff
changeset
|
102 public int getRotation() |
|
eb2e72dd8cae
Change how piece rotation works.
Matti Hamalainen <ccr@tnsp.org>
parents:
92
diff
changeset
|
103 { |
|
eb2e72dd8cae
Change how piece rotation works.
Matti Hamalainen <ccr@tnsp.org>
parents:
92
diff
changeset
|
104 return currRotation % 4; |
|
eb2e72dd8cae
Change how piece rotation works.
Matti Hamalainen <ccr@tnsp.org>
parents:
92
diff
changeset
|
105 } |
|
eb2e72dd8cae
Change how piece rotation works.
Matti Hamalainen <ccr@tnsp.org>
parents:
92
diff
changeset
|
106 |
| 40 | 107 public int getRotatedPoint(int in) |
| 3 | 108 { |
|
104
eb2e72dd8cae
Change how piece rotation works.
Matti Hamalainen <ccr@tnsp.org>
parents:
92
diff
changeset
|
109 int point = (in - (getRotation() * 2)) % 8; |
|
42
951a4d669af0
Initially working path solving algorithm.
Matti Hamalainen <ccr@tnsp.org>
parents:
40
diff
changeset
|
110 if (point < 0) point = 8 + point; |
|
951a4d669af0
Initially working path solving algorithm.
Matti Hamalainen <ccr@tnsp.org>
parents:
40
diff
changeset
|
111 return point; |
|
951a4d669af0
Initially working path solving algorithm.
Matti Hamalainen <ccr@tnsp.org>
parents:
40
diff
changeset
|
112 } |
|
951a4d669af0
Initially working path solving algorithm.
Matti Hamalainen <ccr@tnsp.org>
parents:
40
diff
changeset
|
113 |
|
951a4d669af0
Initially working path solving algorithm.
Matti Hamalainen <ccr@tnsp.org>
parents:
40
diff
changeset
|
114 public int getAntiRotatedPoint(int in) |
|
951a4d669af0
Initially working path solving algorithm.
Matti Hamalainen <ccr@tnsp.org>
parents:
40
diff
changeset
|
115 { |
|
104
eb2e72dd8cae
Change how piece rotation works.
Matti Hamalainen <ccr@tnsp.org>
parents:
92
diff
changeset
|
116 int point = (in + (getRotation() * 2)) % 8; |
| 40 | 117 if (point < 0) point = 8 + point; |
| 118 return point; | |
| 119 } | |
|
134
4c0dec72e2f0
Whitespace cosmetic cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents:
106
diff
changeset
|
120 |
|
42
951a4d669af0
Initially working path solving algorithm.
Matti Hamalainen <ccr@tnsp.org>
parents:
40
diff
changeset
|
121 public int getMatchingPoint(int point) |
|
951a4d669af0
Initially working path solving algorithm.
Matti Hamalainen <ccr@tnsp.org>
parents:
40
diff
changeset
|
122 { |
|
951a4d669af0
Initially working path solving algorithm.
Matti Hamalainen <ccr@tnsp.org>
parents:
40
diff
changeset
|
123 switch (point) |
|
951a4d669af0
Initially working path solving algorithm.
Matti Hamalainen <ccr@tnsp.org>
parents:
40
diff
changeset
|
124 { |
|
951a4d669af0
Initially working path solving algorithm.
Matti Hamalainen <ccr@tnsp.org>
parents:
40
diff
changeset
|
125 case 0: return 5; |
|
951a4d669af0
Initially working path solving algorithm.
Matti Hamalainen <ccr@tnsp.org>
parents:
40
diff
changeset
|
126 case 1: return 4; |
|
951a4d669af0
Initially working path solving algorithm.
Matti Hamalainen <ccr@tnsp.org>
parents:
40
diff
changeset
|
127 |
|
951a4d669af0
Initially working path solving algorithm.
Matti Hamalainen <ccr@tnsp.org>
parents:
40
diff
changeset
|
128 case 2: return 7; |
|
951a4d669af0
Initially working path solving algorithm.
Matti Hamalainen <ccr@tnsp.org>
parents:
40
diff
changeset
|
129 case 3: return 6; |
|
951a4d669af0
Initially working path solving algorithm.
Matti Hamalainen <ccr@tnsp.org>
parents:
40
diff
changeset
|
130 |
|
951a4d669af0
Initially working path solving algorithm.
Matti Hamalainen <ccr@tnsp.org>
parents:
40
diff
changeset
|
131 case 4: return 1; |
|
951a4d669af0
Initially working path solving algorithm.
Matti Hamalainen <ccr@tnsp.org>
parents:
40
diff
changeset
|
132 case 5: return 0; |
|
951a4d669af0
Initially working path solving algorithm.
Matti Hamalainen <ccr@tnsp.org>
parents:
40
diff
changeset
|
133 |
|
951a4d669af0
Initially working path solving algorithm.
Matti Hamalainen <ccr@tnsp.org>
parents:
40
diff
changeset
|
134 case 6: return 3; |
|
951a4d669af0
Initially working path solving algorithm.
Matti Hamalainen <ccr@tnsp.org>
parents:
40
diff
changeset
|
135 case 7: return 2; |
|
951a4d669af0
Initially working path solving algorithm.
Matti Hamalainen <ccr@tnsp.org>
parents:
40
diff
changeset
|
136 } |
|
951a4d669af0
Initially working path solving algorithm.
Matti Hamalainen <ccr@tnsp.org>
parents:
40
diff
changeset
|
137 return -1; |
|
951a4d669af0
Initially working path solving algorithm.
Matti Hamalainen <ccr@tnsp.org>
parents:
40
diff
changeset
|
138 } |
| 37 | 139 |
| 40 | 140 public void setConnectionState(int point, boolean state) |
| 141 { | |
| 142 states[point] = state; | |
| 143 states[connections[point]] = state; | |
| 144 stateChanged = true; | |
| 145 } | |
| 146 | |
| 147 public int getConnection(int point) | |
| 148 { | |
| 149 return connections[point]; | |
| 3 | 150 } |
|
104
eb2e72dd8cae
Change how piece rotation works.
Matti Hamalainen <ccr@tnsp.org>
parents:
92
diff
changeset
|
151 |
|
eb2e72dd8cae
Change how piece rotation works.
Matti Hamalainen <ccr@tnsp.org>
parents:
92
diff
changeset
|
152 private float getAngle(float rotation) |
|
eb2e72dd8cae
Change how piece rotation works.
Matti Hamalainen <ccr@tnsp.org>
parents:
92
diff
changeset
|
153 { |
|
eb2e72dd8cae
Change how piece rotation works.
Matti Hamalainen <ccr@tnsp.org>
parents:
92
diff
changeset
|
154 return (float) ((rotation * Math.PI) / 2.0f); |
|
eb2e72dd8cae
Change how piece rotation works.
Matti Hamalainen <ccr@tnsp.org>
parents:
92
diff
changeset
|
155 } |
|
134
4c0dec72e2f0
Whitespace cosmetic cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents:
106
diff
changeset
|
156 |
|
32
e480579cc460
More work on debugging the path resolving.
Matti Hamalainen <ccr@tnsp.org>
parents:
30
diff
changeset
|
157 public void rotate(RotateDir dir) |
| 3 | 158 { |
|
134
4c0dec72e2f0
Whitespace cosmetic cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents:
106
diff
changeset
|
159 // Only normal |
| 6 | 160 if (type != PieceType.LOCKED && type != PieceType.ACTIVE) |
| 3 | 161 return; |
| 1 | 162 |
|
104
eb2e72dd8cae
Change how piece rotation works.
Matti Hamalainen <ccr@tnsp.org>
parents:
92
diff
changeset
|
163 currRotation = (currRotation + (dir == RotateDir.RIGHT ? 1 : -1)); |
|
106
41c6cca69d60
Make new pieces appear gradually, and same effect for swapping.
Matti Hamalainen <ccr@tnsp.org>
parents:
104
diff
changeset
|
164 lerpRotation = new Interpolate(getAngle(currRotation), currAngle, maxTime); |
| 3 | 165 rotationChanged = true; |
| 5 | 166 } |
| 1 | 167 |
| 7 | 168 public Point2D getPointCoords(float x, float y, float dim, int index) |
| 5 | 169 { |
| 7 | 170 float ox = 0, oy = 0; |
| 171 float step = dim / 10; | |
|
134
4c0dec72e2f0
Whitespace cosmetic cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents:
106
diff
changeset
|
172 |
| 5 | 173 switch (index) { |
|
34
6f6c551cc14c
Fix piece connections rendering.
Matti Hamalainen <ccr@tnsp.org>
parents:
32
diff
changeset
|
174 // Normal line starting and ending points |
|
32
e480579cc460
More work on debugging the path resolving.
Matti Hamalainen <ccr@tnsp.org>
parents:
30
diff
changeset
|
175 case 0: ox = 3.0f; oy = 0.4f; break; |
|
e480579cc460
More work on debugging the path resolving.
Matti Hamalainen <ccr@tnsp.org>
parents:
30
diff
changeset
|
176 case 1: ox = 7.0f; oy = 0.4f; break; |
| 39 | 177 |
|
32
e480579cc460
More work on debugging the path resolving.
Matti Hamalainen <ccr@tnsp.org>
parents:
30
diff
changeset
|
178 case 2: ox = 9.6f; oy = 3.0f; break; |
|
e480579cc460
More work on debugging the path resolving.
Matti Hamalainen <ccr@tnsp.org>
parents:
30
diff
changeset
|
179 case 3: ox = 9.6f; oy = 7.0f; break; |
| 39 | 180 |
|
32
e480579cc460
More work on debugging the path resolving.
Matti Hamalainen <ccr@tnsp.org>
parents:
30
diff
changeset
|
181 case 4: ox = 7.0f; oy = 9.6f; break; |
|
e480579cc460
More work on debugging the path resolving.
Matti Hamalainen <ccr@tnsp.org>
parents:
30
diff
changeset
|
182 case 5: ox = 3.0f; oy = 9.6f; break; |
| 39 | 183 |
|
32
e480579cc460
More work on debugging the path resolving.
Matti Hamalainen <ccr@tnsp.org>
parents:
30
diff
changeset
|
184 case 6: ox = 0.4f; oy = 7.0f; break; |
|
e480579cc460
More work on debugging the path resolving.
Matti Hamalainen <ccr@tnsp.org>
parents:
30
diff
changeset
|
185 case 7: ox = 0.4f; oy = 3.0f; break; |
| 1 | 186 |
| 39 | 187 |
|
34
6f6c551cc14c
Fix piece connections rendering.
Matti Hamalainen <ccr@tnsp.org>
parents:
32
diff
changeset
|
188 // Matching control points for each point above (+8) |
| 39 | 189 case 8: ox = 3.0f; oy = 2.5f; break; |
| 190 case 9: ox = 7.0f; oy = 2.5f; break; | |
| 191 | |
| 192 case 10: ox = 7.5f; oy = 3.0f; break; | |
| 193 case 11: ox = 7.5f; oy = 7.0f; break; | |
| 194 | |
| 195 case 12: ox = 7.0f; oy = 7.5f; break; | |
| 196 case 13: ox = 3.0f; oy = 7.5f; break; | |
| 197 | |
| 198 case 14: ox = 2.5f; oy = 7.0f; break; | |
| 199 case 15: ox = 2.5f; oy = 3.0f; break; | |
| 5 | 200 } |
| 1 | 201 |
| 7 | 202 return new Point2D.Float(x + ox * step, y + oy * step); |
| 5 | 203 } |
|
134
4c0dec72e2f0
Whitespace cosmetic cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents:
106
diff
changeset
|
204 |
| 27 | 205 public PieceType getType() |
| 206 { | |
| 207 return type; | |
| 208 } | |
| 9 | 209 |
| 7 | 210 public void animate(float time) |
| 5 | 211 { |
|
138
9eb791e2fa17
Optimize board updating logic, so that the old placed tiles need not to be
Matti Hamalainen <ccr@tnsp.org>
parents:
134
diff
changeset
|
212 active = false; |
|
9eb791e2fa17
Optimize board updating logic, so that the old placed tiles need not to be
Matti Hamalainen <ccr@tnsp.org>
parents:
134
diff
changeset
|
213 |
| 5 | 214 if (rotationChanged) |
| 215 { | |
| 216 rotationTime = time; | |
| 217 rotationActive = true; | |
| 7 | 218 rotationChanged = false; |
|
104
eb2e72dd8cae
Change how piece rotation works.
Matti Hamalainen <ccr@tnsp.org>
parents:
92
diff
changeset
|
219 rotationSpeed = 1.0f; |
| 54 | 220 } |
| 221 | |
| 222 if (typeChanged && type == PieceType.LOCKED) | |
| 223 { | |
|
104
eb2e72dd8cae
Change how piece rotation works.
Matti Hamalainen <ccr@tnsp.org>
parents:
92
diff
changeset
|
224 rotationSpeed = 1.5f; |
| 5 | 225 } |
| 1 | 226 |
| 5 | 227 if (rotationActive) |
| 228 { | |
| 54 | 229 float t = (time - rotationTime) * rotationSpeed; |
| 11 | 230 |
| 9 | 231 if (t < maxTime) |
| 7 | 232 currAngle = lerpRotation.getValue(t); |
| 233 else | |
| 234 { | |
|
106
41c6cca69d60
Make new pieces appear gradually, and same effect for swapping.
Matti Hamalainen <ccr@tnsp.org>
parents:
104
diff
changeset
|
235 currAngle = lerpRotation.start; |
| 7 | 236 rotationActive = false; |
| 237 } | |
|
138
9eb791e2fa17
Optimize board updating logic, so that the old placed tiles need not to be
Matti Hamalainen <ccr@tnsp.org>
parents:
134
diff
changeset
|
238 |
|
9eb791e2fa17
Optimize board updating logic, so that the old placed tiles need not to be
Matti Hamalainen <ccr@tnsp.org>
parents:
134
diff
changeset
|
239 active = true; |
| 5 | 240 } |
| 54 | 241 |
| 6 | 242 if (typeChanged) |
| 243 { | |
| 244 typeTime = time; | |
| 245 typeActive = true; | |
| 7 | 246 typeChanged = false; |
| 6 | 247 } |
|
134
4c0dec72e2f0
Whitespace cosmetic cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents:
106
diff
changeset
|
248 |
| 6 | 249 if (typeActive) |
| 250 { | |
|
106
41c6cca69d60
Make new pieces appear gradually, and same effect for swapping.
Matti Hamalainen <ccr@tnsp.org>
parents:
104
diff
changeset
|
251 float t = (time - typeTime) * 2.0f; |
|
41c6cca69d60
Make new pieces appear gradually, and same effect for swapping.
Matti Hamalainen <ccr@tnsp.org>
parents:
104
diff
changeset
|
252 |
|
41c6cca69d60
Make new pieces appear gradually, and same effect for swapping.
Matti Hamalainen <ccr@tnsp.org>
parents:
104
diff
changeset
|
253 if (t < maxTime) |
|
41c6cca69d60
Make new pieces appear gradually, and same effect for swapping.
Matti Hamalainen <ccr@tnsp.org>
parents:
104
diff
changeset
|
254 typeValue = lerpType.getValue(t); |
|
41c6cca69d60
Make new pieces appear gradually, and same effect for swapping.
Matti Hamalainen <ccr@tnsp.org>
parents:
104
diff
changeset
|
255 else |
|
41c6cca69d60
Make new pieces appear gradually, and same effect for swapping.
Matti Hamalainen <ccr@tnsp.org>
parents:
104
diff
changeset
|
256 { |
|
41c6cca69d60
Make new pieces appear gradually, and same effect for swapping.
Matti Hamalainen <ccr@tnsp.org>
parents:
104
diff
changeset
|
257 typeValue = lerpType.start; |
|
41c6cca69d60
Make new pieces appear gradually, and same effect for swapping.
Matti Hamalainen <ccr@tnsp.org>
parents:
104
diff
changeset
|
258 typeActive = false; |
|
41c6cca69d60
Make new pieces appear gradually, and same effect for swapping.
Matti Hamalainen <ccr@tnsp.org>
parents:
104
diff
changeset
|
259 } |
|
138
9eb791e2fa17
Optimize board updating logic, so that the old placed tiles need not to be
Matti Hamalainen <ccr@tnsp.org>
parents:
134
diff
changeset
|
260 |
|
9eb791e2fa17
Optimize board updating logic, so that the old placed tiles need not to be
Matti Hamalainen <ccr@tnsp.org>
parents:
134
diff
changeset
|
261 |
|
9eb791e2fa17
Optimize board updating logic, so that the old placed tiles need not to be
Matti Hamalainen <ccr@tnsp.org>
parents:
134
diff
changeset
|
262 active = true; |
| 6 | 263 } |
|
134
4c0dec72e2f0
Whitespace cosmetic cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents:
106
diff
changeset
|
264 |
| 40 | 265 if (stateChanged) |
| 9 | 266 { |
| 267 } | |
|
134
4c0dec72e2f0
Whitespace cosmetic cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents:
106
diff
changeset
|
268 |
|
32
e480579cc460
More work on debugging the path resolving.
Matti Hamalainen <ccr@tnsp.org>
parents:
30
diff
changeset
|
269 throbTime = (time % 100) / 100.0f; |
| 5 | 270 } |
| 1 | 271 |
| 7 | 272 public void paint(Graphics2D g, float x, float y, float dim) |
| 5 | 273 { |
|
58
cde170f2f980
Clean up the piece rendering.
Matti Hamalainen <ccr@tnsp.org>
parents:
54
diff
changeset
|
274 AffineTransform save = g.getTransform(); |
|
106
41c6cca69d60
Make new pieces appear gradually, and same effect for swapping.
Matti Hamalainen <ccr@tnsp.org>
parents:
104
diff
changeset
|
275 Composite csave = g.getComposite(); |
|
41c6cca69d60
Make new pieces appear gradually, and same effect for swapping.
Matti Hamalainen <ccr@tnsp.org>
parents:
104
diff
changeset
|
276 |
|
41c6cca69d60
Make new pieces appear gradually, and same effect for swapping.
Matti Hamalainen <ccr@tnsp.org>
parents:
104
diff
changeset
|
277 // Change compositing alpha for the whole piece drawing |
|
41c6cca69d60
Make new pieces appear gradually, and same effect for swapping.
Matti Hamalainen <ccr@tnsp.org>
parents:
104
diff
changeset
|
278 // when the piece is being "introduced". |
|
41c6cca69d60
Make new pieces appear gradually, and same effect for swapping.
Matti Hamalainen <ccr@tnsp.org>
parents:
104
diff
changeset
|
279 if (typeActive) |
|
41c6cca69d60
Make new pieces appear gradually, and same effect for swapping.
Matti Hamalainen <ccr@tnsp.org>
parents:
104
diff
changeset
|
280 { |
|
41c6cca69d60
Make new pieces appear gradually, and same effect for swapping.
Matti Hamalainen <ccr@tnsp.org>
parents:
104
diff
changeset
|
281 g.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, typeValue)); |
|
41c6cca69d60
Make new pieces appear gradually, and same effect for swapping.
Matti Hamalainen <ccr@tnsp.org>
parents:
104
diff
changeset
|
282 } |
|
41c6cca69d60
Make new pieces appear gradually, and same effect for swapping.
Matti Hamalainen <ccr@tnsp.org>
parents:
104
diff
changeset
|
283 |
|
58
cde170f2f980
Clean up the piece rendering.
Matti Hamalainen <ccr@tnsp.org>
parents:
54
diff
changeset
|
284 |
| 45 | 285 // Transform drawing by current angle |
| 11 | 286 g.rotate(currAngle, x + dim / 2.0f, y + dim / 2.0f); |
| 1 | 287 |
| 45 | 288 // Color piece by type |
| 5 | 289 switch (type) { |
|
58
cde170f2f980
Clean up the piece rendering.
Matti Hamalainen <ccr@tnsp.org>
parents:
54
diff
changeset
|
290 case LOCKED: g.setPaint(new Color(0.3f, 0.8f, 0.3f, 0.35f)); break; |
|
cde170f2f980
Clean up the piece rendering.
Matti Hamalainen <ccr@tnsp.org>
parents:
54
diff
changeset
|
291 case ACTIVE: g.setPaint(new Color(0.9f, 0.3f, 0.3f, 0.35f)); break; |
|
92
d5f51370617b
Change start piece rendering.
Matti Hamalainen <ccr@tnsp.org>
parents:
91
diff
changeset
|
292 case START: g.setPaint(new Color(1.0f, 0.6f, 0.0f, 0.95f)); break; |
| 5 | 293 } |
| 6 | 294 |
| 7 | 295 g.fill(new RoundRectangle2D.Float(x, y, dim, dim, dim / 10, dim / 10)); |
| 1 | 296 |
|
92
d5f51370617b
Change start piece rendering.
Matti Hamalainen <ccr@tnsp.org>
parents:
91
diff
changeset
|
297 // Start pieces (center piece) have a different kind of border |
|
d5f51370617b
Change start piece rendering.
Matti Hamalainen <ccr@tnsp.org>
parents:
91
diff
changeset
|
298 // and no connections drawn inside |
|
d5f51370617b
Change start piece rendering.
Matti Hamalainen <ccr@tnsp.org>
parents:
91
diff
changeset
|
299 if (type == PieceType.START) |
|
d5f51370617b
Change start piece rendering.
Matti Hamalainen <ccr@tnsp.org>
parents:
91
diff
changeset
|
300 { |
|
d5f51370617b
Change start piece rendering.
Matti Hamalainen <ccr@tnsp.org>
parents:
91
diff
changeset
|
301 // Draw piece border |
|
d5f51370617b
Change start piece rendering.
Matti Hamalainen <ccr@tnsp.org>
parents:
91
diff
changeset
|
302 g.setPaint(Color.black); |
|
d5f51370617b
Change start piece rendering.
Matti Hamalainen <ccr@tnsp.org>
parents:
91
diff
changeset
|
303 g.setStroke(new BasicStroke(2.0f)); |
|
d5f51370617b
Change start piece rendering.
Matti Hamalainen <ccr@tnsp.org>
parents:
91
diff
changeset
|
304 g.draw(new RoundRectangle2D.Float(x, y, dim, dim, dim / 10, dim / 10)); |
|
d5f51370617b
Change start piece rendering.
Matti Hamalainen <ccr@tnsp.org>
parents:
91
diff
changeset
|
305 } |
|
d5f51370617b
Change start piece rendering.
Matti Hamalainen <ccr@tnsp.org>
parents:
91
diff
changeset
|
306 else |
| 5 | 307 { |
|
58
cde170f2f980
Clean up the piece rendering.
Matti Hamalainen <ccr@tnsp.org>
parents:
54
diff
changeset
|
308 // Active piece has a throbbing "ghost" border |
|
cde170f2f980
Clean up the piece rendering.
Matti Hamalainen <ccr@tnsp.org>
parents:
54
diff
changeset
|
309 if (type == PieceType.ACTIVE) |
|
cde170f2f980
Clean up the piece rendering.
Matti Hamalainen <ccr@tnsp.org>
parents:
54
diff
changeset
|
310 { |
|
cde170f2f980
Clean up the piece rendering.
Matti Hamalainen <ccr@tnsp.org>
parents:
54
diff
changeset
|
311 float offs1 = throbTime * 10.0f, |
|
cde170f2f980
Clean up the piece rendering.
Matti Hamalainen <ccr@tnsp.org>
parents:
54
diff
changeset
|
312 offs2 = throbTime * 20.0f; |
| 27 | 313 |
|
58
cde170f2f980
Clean up the piece rendering.
Matti Hamalainen <ccr@tnsp.org>
parents:
54
diff
changeset
|
314 g.setPaint(new Color(0.0f, 0.0f, 0.0f, (float) (1.0f - throbTime) )); |
|
cde170f2f980
Clean up the piece rendering.
Matti Hamalainen <ccr@tnsp.org>
parents:
54
diff
changeset
|
315 g.setStroke(new BasicStroke(2.0f + throbTime * 2.0f)); |
|
cde170f2f980
Clean up the piece rendering.
Matti Hamalainen <ccr@tnsp.org>
parents:
54
diff
changeset
|
316 g.draw(new RoundRectangle2D.Float( |
|
cde170f2f980
Clean up the piece rendering.
Matti Hamalainen <ccr@tnsp.org>
parents:
54
diff
changeset
|
317 x - offs1, y - offs1, |
|
cde170f2f980
Clean up the piece rendering.
Matti Hamalainen <ccr@tnsp.org>
parents:
54
diff
changeset
|
318 dim + offs2, dim + offs2, |
|
cde170f2f980
Clean up the piece rendering.
Matti Hamalainen <ccr@tnsp.org>
parents:
54
diff
changeset
|
319 dim / 10, dim / 10)); |
|
cde170f2f980
Clean up the piece rendering.
Matti Hamalainen <ccr@tnsp.org>
parents:
54
diff
changeset
|
320 } |
|
cde170f2f980
Clean up the piece rendering.
Matti Hamalainen <ccr@tnsp.org>
parents:
54
diff
changeset
|
321 |
|
cde170f2f980
Clean up the piece rendering.
Matti Hamalainen <ccr@tnsp.org>
parents:
54
diff
changeset
|
322 // Draw piece border |
|
cde170f2f980
Clean up the piece rendering.
Matti Hamalainen <ccr@tnsp.org>
parents:
54
diff
changeset
|
323 g.setPaint(new Color(0.0f, 0.0f, 0.0f, 0.6f)); |
|
cde170f2f980
Clean up the piece rendering.
Matti Hamalainen <ccr@tnsp.org>
parents:
54
diff
changeset
|
324 g.setStroke(new BasicStroke(5.0f)); |
|
cde170f2f980
Clean up the piece rendering.
Matti Hamalainen <ccr@tnsp.org>
parents:
54
diff
changeset
|
325 g.draw(new RoundRectangle2D.Float(x, y, dim, dim, dim / 10, dim / 10)); |
| 1 | 326 |
|
58
cde170f2f980
Clean up the piece rendering.
Matti Hamalainen <ccr@tnsp.org>
parents:
54
diff
changeset
|
327 // Draw the connections |
|
cde170f2f980
Clean up the piece rendering.
Matti Hamalainen <ccr@tnsp.org>
parents:
54
diff
changeset
|
328 g.setStroke(new BasicStroke(5.5f)); |
|
cde170f2f980
Clean up the piece rendering.
Matti Hamalainen <ccr@tnsp.org>
parents:
54
diff
changeset
|
329 CubicCurve2D curve = new CubicCurve2D.Float(); |
|
cde170f2f980
Clean up the piece rendering.
Matti Hamalainen <ccr@tnsp.org>
parents:
54
diff
changeset
|
330 boolean[] drawn = new boolean[numConnections]; |
|
cde170f2f980
Clean up the piece rendering.
Matti Hamalainen <ccr@tnsp.org>
parents:
54
diff
changeset
|
331 for (int i = 0; i < numConnections; i++) |
|
cde170f2f980
Clean up the piece rendering.
Matti Hamalainen <ccr@tnsp.org>
parents:
54
diff
changeset
|
332 if (!drawn[i]) |
|
cde170f2f980
Clean up the piece rendering.
Matti Hamalainen <ccr@tnsp.org>
parents:
54
diff
changeset
|
333 { |
|
cde170f2f980
Clean up the piece rendering.
Matti Hamalainen <ccr@tnsp.org>
parents:
54
diff
changeset
|
334 Point2D start, cp1, cp2, end; |
|
cde170f2f980
Clean up the piece rendering.
Matti Hamalainen <ccr@tnsp.org>
parents:
54
diff
changeset
|
335 boolean isActive = states[i] || states[connections[i]]; |
|
cde170f2f980
Clean up the piece rendering.
Matti Hamalainen <ccr@tnsp.org>
parents:
54
diff
changeset
|
336 |
|
cde170f2f980
Clean up the piece rendering.
Matti Hamalainen <ccr@tnsp.org>
parents:
54
diff
changeset
|
337 g.setPaint(isActive ? Color.white : Color.black); |
| 9 | 338 |
|
58
cde170f2f980
Clean up the piece rendering.
Matti Hamalainen <ccr@tnsp.org>
parents:
54
diff
changeset
|
339 start = getPointCoords(x, y, dim, i); |
|
cde170f2f980
Clean up the piece rendering.
Matti Hamalainen <ccr@tnsp.org>
parents:
54
diff
changeset
|
340 end = getPointCoords(x, y, dim, connections[i]); |
|
cde170f2f980
Clean up the piece rendering.
Matti Hamalainen <ccr@tnsp.org>
parents:
54
diff
changeset
|
341 cp1 = getPointCoords(x, y, dim, i + 8); |
|
cde170f2f980
Clean up the piece rendering.
Matti Hamalainen <ccr@tnsp.org>
parents:
54
diff
changeset
|
342 cp2 = getPointCoords(x, y, dim, connections[i] + 8); |
|
cde170f2f980
Clean up the piece rendering.
Matti Hamalainen <ccr@tnsp.org>
parents:
54
diff
changeset
|
343 |
|
cde170f2f980
Clean up the piece rendering.
Matti Hamalainen <ccr@tnsp.org>
parents:
54
diff
changeset
|
344 curve.setCurve(start, cp1, cp2, end); |
|
cde170f2f980
Clean up the piece rendering.
Matti Hamalainen <ccr@tnsp.org>
parents:
54
diff
changeset
|
345 g.draw(curve); |
|
34
6f6c551cc14c
Fix piece connections rendering.
Matti Hamalainen <ccr@tnsp.org>
parents:
32
diff
changeset
|
346 |
|
58
cde170f2f980
Clean up the piece rendering.
Matti Hamalainen <ccr@tnsp.org>
parents:
54
diff
changeset
|
347 // Mark connection drawn, so we don't overdraw |
|
cde170f2f980
Clean up the piece rendering.
Matti Hamalainen <ccr@tnsp.org>
parents:
54
diff
changeset
|
348 drawn[i] = true; |
|
cde170f2f980
Clean up the piece rendering.
Matti Hamalainen <ccr@tnsp.org>
parents:
54
diff
changeset
|
349 drawn[connections[i]] = true; |
|
cde170f2f980
Clean up the piece rendering.
Matti Hamalainen <ccr@tnsp.org>
parents:
54
diff
changeset
|
350 } |
|
134
4c0dec72e2f0
Whitespace cosmetic cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents:
106
diff
changeset
|
351 |
|
58
cde170f2f980
Clean up the piece rendering.
Matti Hamalainen <ccr@tnsp.org>
parents:
54
diff
changeset
|
352 } // !PieceType.START |
|
cde170f2f980
Clean up the piece rendering.
Matti Hamalainen <ccr@tnsp.org>
parents:
54
diff
changeset
|
353 |
|
cde170f2f980
Clean up the piece rendering.
Matti Hamalainen <ccr@tnsp.org>
parents:
54
diff
changeset
|
354 g.setTransform(save); |
|
106
41c6cca69d60
Make new pieces appear gradually, and same effect for swapping.
Matti Hamalainen <ccr@tnsp.org>
parents:
104
diff
changeset
|
355 g.setComposite(csave); |
| 5 | 356 } |
| 1 | 357 } |