xZero707/droidfish
1
0
Fork 0
mirror of https://github.com/peterosterlund2/droidfish.git synced 2024-11-27 06:10:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Improve en passant capture animation

Browse Source 
The captured pawn is not removed from the board until the moving pawn
has reached its target square.
This commit is contained in:
Peter Osterlund 2020-02-02 11:31:19 +01:00
parent 546c3a7251
commit 514d81b8fe
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
DroidFishApp/src/main/java/org/petero/droidfish/view/ChessBoard.java
View File

@ -154,9 +154,7 @@ public abstract class ChessBoard extends View {
return animActive(); return animActive();
} }
private boolean animActive() { private boolean animActive() {
if (paused || (startTime < 0) || (now >= stopTime) || (posHash != pos.zobristHash())) return !paused && startTime >= 0 && now < stopTime && posHash == pos.zobristHash();
return false;
return true;
} }
public final boolean squareHidden(int sq) { public final boolean squareHidden(int sq) {
if (!animActive()) if (!animActive())
@ -170,10 +168,10 @@ public abstract class ChessBoard extends View {
drawAnimPiece(canvas, piece2, from2, to2, animState); drawAnimPiece(canvas, piece2, from2, to2, animState);
drawAnimPiece(canvas, piece1, from1, to1, animState); drawAnimPiece(canvas, piece1, from1, to1, animState);
long now2 = System.currentTimeMillis(); long now2 = System.currentTimeMillis();
long delay = 20 - (now2 - now); long delay = 10 - (now2 - now);
// System.out.printf("delay:%d\n", delay); // System.out.printf("delay:%d\n", delay);
if (delay < 1) delay = 1; if (delay < 1) delay = 1;
handlerTimer.postDelayed(() -> invalidate(), delay); handlerTimer.postDelayed(ChessBoard.this::invalidate, delay);
} }
private void drawAnimPiece(Canvas canvas, int piece, int from, int to, double animState) { private void drawAnimPiece(Canvas canvas, int piece, int from, int to, double animState) {
if (piece == Piece.EMPTY) if (piece == Piece.EMPTY)
@ -235,6 +233,14 @@ public abstract class ChessBoard extends View {
anim.piece2 = p2; anim.piece2 = p2;
anim.from2 = move.to; anim.from2 = move.to;
anim.to2 = move.to; anim.to2 = move.to;
} else if (move.to == sourcePos.getEpSquare()) {
if (sourcePos.whiteMove) {
anim.piece2 = Piece.BPAWN;
anim.from2 = anim.to2 = move.to - 8;
} else {
anim.piece2 = Piece.WPAWN;
anim.from2 = anim.to2 = move.to + 8;
}
} else if ((p == Piece.WKING) || (p == Piece.BKING)) { } else if ((p == Piece.WKING) || (p == Piece.BKING)) {
boolean wtm = Piece.isWhite(p); boolean wtm = Piece.isWhite(p);
if (move.to == move.from + 2) { // O-O if (move.to == move.from + 2) { // O-O