Droog71
/
magarena
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

always load CardBuilder when setting up a new game (closes #1046).

master
lodici 2017-01-27 12:48:32 +00:00
parent 47bfd4132c
commit b7ce5c0ed7
2 changed files with 14 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/magic/ui/screen/duel/decks/NewGameWorker.java
View File

@ -1,15 +1,12 @@
package magic.ui.screen.duel.decks;
import java.util.Optional;
import java.util.concurrent.CancellationException;
import java.util.concurrent.ExecutionException;
import javax.swing.SwingWorker;
import magic.cardBuilder.renderers.CardBuilder;
import magic.model.MagicCardDefinition;
import magic.model.MagicDeck;
import magic.model.MagicDuel;
import magic.model.MagicGame;
import magic.ui.MagicImages;
import magic.utility.MagicSystem;
class NewGameWorker extends SwingWorker<MagicGame, Void> {
@ -22,27 +19,19 @@ class NewGameWorker extends SwingWorker<MagicGame, Void> {
screen = aScreen;
}
private Optional<MagicCardDefinition> findFirstProxyCard(MagicDeck aDeck) {
return aDeck.stream()
.filter(card -> MagicImages.isProxyImage(card.getCardDefinition()))
.findFirst();
}
private Optional<MagicCardDefinition> findFirstProxyCardInDecks() {
Optional<MagicCardDefinition> proxy = findFirstProxyCard(duel.getPlayer(0).getDeck());
return proxy.isPresent() ? proxy : findFirstProxyCard(duel.getPlayer(1).getDeck());
}
private void loadCardBuilderIfRequired() {
private void doLoadCardBuilder() {
if (!CardBuilder.IS_LOADED) {
Optional<MagicCardDefinition> proxy = findFirstProxyCardInDecks();
proxy.ifPresent(CardBuilder::getCardBuilderImage);
long start_time = System.currentTimeMillis();
System.out.println("loading CardBuilder (" + MagicSystem.getHeapUtilizationStats() + ")");
CardBuilder.getCardBuilderImage(MagicCardDefinition.UNKNOWN);
double duration = (double) (System.currentTimeMillis() - start_time) / 1000;
System.out.println("done in " + duration + "s (" + MagicSystem.getHeapUtilizationStats() + ")");
}
}
@Override
protected MagicGame doInBackground() throws Exception {
loadCardBuilderIfRequired();
doLoadCardBuilder();
return duel.nextGame();
}

12
src/magic/utility/MagicSystem.java
View File

@ -120,12 +120,14 @@ final public class MagicSystem {
}
public static String getHeapUtilizationStats() {
final int mb = 1024*1024;
final float mb = 1024 * 1024;
final Runtime runtime = Runtime.getRuntime();
return "Used Memory: " + (runtime.totalMemory() - runtime.freeMemory()) / mb + "M" +
"\nFree Memory: " + runtime.freeMemory() / mb + "M" +
"\nTotal Memory: " + runtime.totalMemory() / mb + "M" +
"\nMax Memory: " + runtime.maxMemory() / mb + "M";
return String.format("Used: %.1f • Free: %.1f • Total: %.1f • Max: %.1f",
(runtime.totalMemory() - runtime.freeMemory()) / mb,
runtime.freeMemory() / mb,
runtime.totalMemory() / mb,
runtime.maxMemory() / mb
);
}
/**