RustyStriker/Klooni1010
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Do not use vanishDelta, fix vanishing on cross clear

Browse source
This commit is contained in:
Lonami Exo 2017-01-27 15:44:42 +01:00
parent 075bcd869c
commit 2d6c66a701
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
core/src/io/github/lonamiwebs/klooni/game/Cell.java
View file

@ -20,14 +20,13 @@ class Cell {
private float vanishElapsed; private float vanishElapsed;
private float vanishLifetime; private float vanishLifetime;
private static float vanishDelta = 0.1f;
Cell(float x, float y, float cellSize) { Cell(float x, float y, float cellSize) {
pos = new Vector2(x, y); pos = new Vector2(x, y);
size = cellSize; size = cellSize;
empty = true; empty = true;
color = Color.WHITE; color = Color.WHITE;
vanishElapsed = Float.POSITIVE_INFINITY;
} }
void set(Color c) { void set(Color c) {
@ -39,7 +38,7 @@ class Cell {
draw(color, batch, patch, pos.x, pos.y, size); draw(color, batch, patch, pos.x, pos.y, size);
// Draw the previous vanishing cell // Draw the previous vanishing cell
if (vanishSize > vanishDelta) { if (vanishElapsed <= vanishLifetime) {
vanishElapsed += Gdx.graphics.getDeltaTime(); vanishElapsed += Gdx.graphics.getDeltaTime();
// vanishElapsed might be < 0 (delay), so clamp to 0 // vanishElapsed might be < 0 (delay), so clamp to 0
@ -50,10 +49,6 @@ class Cell {
float centerOffset = size * 0.5f - vanishSize * 0.5f; float centerOffset = size * 0.5f - vanishSize * 0.5f;
draw(vanishColor, batch, patch, pos.x + centerOffset, pos.y + centerOffset, vanishSize); draw(vanishColor, batch, patch, pos.x + centerOffset, pos.y + centerOffset, vanishSize);
if (progress == 1f) {
vanishSize = 0f; // Stop vanishing
}
} }
} }
@ -72,8 +67,10 @@ class Cell {
// in this case, a piece was put. The closer it was put, the faster // in this case, a piece was put. The closer it was put, the faster
// this piece will vanish. // this piece will vanish.
void vanish(Vector2 vanishFrom) { void vanish(Vector2 vanishFrom) {
empty = true; if (empty) // We cannot vanish twice
return;
empty = true;
vanishSize = size; vanishSize = size;
vanishColor = color.cpy(); vanishColor = color.cpy();
vanishLifetime = 1f; vanishLifetime = 1f;