External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-22 03:22:00 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

performance improvements for startup

Browse source 
added option to skip generating small icons that already exist, load symbol images multithreaded
This commit is contained in:
Christiaan 2018-03-27 17:26:19 +02:00
parent da54f97a9d
commit e69423af27
2 changed files with 50 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Mage.Client/src/main/java/mage/client/MageFrame.java
View file

@ -104,6 +104,7 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
private static final String LITE_MODE_ARG = "-lite"; private static final String LITE_MODE_ARG = "-lite";
private static final String GRAY_MODE_ARG = "-gray"; private static final String GRAY_MODE_ARG = "-gray";
private static final String FILL_SCREEN_ARG = "-fullscreen"; private static final String FILL_SCREEN_ARG = "-fullscreen";
private static final String SKIP_DONE_SYMBOLS = "-skipDoneSymbols";
private static final String NOT_CONNECTED_TEXT = "<not connected>"; private static final String NOT_CONNECTED_TEXT = "<not connected>";
private static MageFrame instance; private static MageFrame instance;
@ -121,6 +122,7 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
//TODO: make gray theme, implement theme selector in preferences dialog //TODO: make gray theme, implement theme selector in preferences dialog
private static boolean grayMode = false; private static boolean grayMode = false;
private static boolean fullscreenMode = false; private static boolean fullscreenMode = false;
private static boolean skipSmallSymbolGenerationForExisting = false;
private static final Map<UUID, ChatPanelBasic> CHATS = new HashMap<>(); private static final Map<UUID, ChatPanelBasic> CHATS = new HashMap<>();
private static final Map<UUID, GamePanel> GAMES = new HashMap<>(); private static final Map<UUID, GamePanel> GAMES = new HashMap<>();
@ -153,6 +155,10 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
return grayMode; return grayMode;
} }
public static boolean isSkipSmallSymbolGenerationForExisting() {
return skipSmallSymbolGenerationForExisting;
}
@Override @Override
public MageVersion getVersion() { public MageVersion getVersion() {
return VERSION; return VERSION;
@ -1191,6 +1197,9 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
if (arg.startsWith(FILL_SCREEN_ARG)) { if (arg.startsWith(FILL_SCREEN_ARG)) {
fullscreenMode = true; fullscreenMode = true;
} }
if (arg.startsWith(SKIP_DONE_SYMBOLS)) {
skipSmallSymbolGenerationForExisting = true;
}
} }
if (!liteMode) { if (!liteMode) {
final SplashScreen splash = SplashScreen.getSplashScreen(); final SplashScreen splash = SplashScreen.getSplashScreen();

36
Mage.Client/src/main/java/org/mage/card/arcane/ManaSymbols.java
View file

@ -31,10 +31,14 @@ import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.StringTokenizer; import java.util.StringTokenizer;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import java.util.stream.IntStream;
import javax.imageio.ImageIO; import javax.imageio.ImageIO;
import javax.swing.*; import javax.swing.*;
import mage.cards.repository.ExpansionRepository; import mage.cards.repository.ExpansionRepository;
import mage.client.MageFrame;
import mage.client.constants.Constants; import mage.client.constants.Constants;
import mage.client.constants.Constants.ResourceSetSize; import mage.client.constants.Constants.ResourceSetSize;
import mage.client.constants.Constants.ResourceSymbolSize; import mage.client.constants.Constants.ResourceSymbolSize;
@ -56,7 +60,7 @@ public final class ManaSymbols {
private static final Logger LOGGER = Logger.getLogger(ManaSymbols.class); private static final Logger LOGGER = Logger.getLogger(ManaSymbols.class);
private static final Map<Integer, Map<String, BufferedImage>> manaImages = new HashMap<>(); private static final Map<Integer, Map<String, BufferedImage>> manaImages = new HashMap<>();
private static final Map<String, Map<String, Image>> setImages = new HashMap<>(); private static final Map<String, Map<String, Image>> setImages = new ConcurrentHashMap<>();
private static final HashSet<String> onlyMythics = new HashSet<>(); private static final HashSet<String> onlyMythics = new HashSet<>();
private static final HashSet<String> withoutSymbols = new HashSet<>(); private static final HashSet<String> withoutSymbols = new HashSet<>();
@ -76,7 +80,7 @@ public final class ManaSymbols {
} }
private static final Map<String, Dimension> setImagesExist = new HashMap<>(); private static final Map<String, Dimension> setImagesExist = new HashMap<>();
private static final Pattern REPLACE_SYMBOLS_PATTERN = Pattern.compile("\\{([^}/]*)/?([^}]*)\\}"); private static final Pattern REPLACE_SYMBOLS_PATTERN = Pattern.compile("\\{([^}/]*)/?([^}]*)\\}");
private static String cachedPath;
private static final String[] symbols = new String[]{"0", "1", "10", "11", "12", "15", "16", "2", "3", "4", "5", "6", "7", "8", "9", private static final String[] symbols = new String[]{"0", "1", "10", "11", "12", "15", "16", "2", "3", "4", "5", "6", "7", "8", "9",
"B", "BG", "BR", "BP", "2B", "B", "BG", "BR", "BP", "2B",
"G", "GU", "GW", "GP", "2G", "G", "GU", "GW", "GP", "2G",
@ -173,8 +177,10 @@ public final class ManaSymbols {
if (!file.exists()) { if (!file.exists()) {
file.mkdirs(); file.mkdirs();
} }
String pathRoot = getResourceSetsPath(ResourceSetSize.SMALL) + set;
for (String code : codes) { for (String code : codes) {
File newFile = new File(pathRoot + '-' + code + ".png");
if(!(MageFrame.isSkipSmallSymbolGenerationForExisting() && newFile.exists())){// skip if option enabled and file already exists
file = new File(getResourceSetsPath(ResourceSetSize.MEDIUM) + set + '-' + code + ".png"); file = new File(getResourceSetsPath(ResourceSetSize.MEDIUM) + set + '-' + code + ".png");
if (file.exists()) { if (file.exists()) {
continue; continue;
@ -191,7 +197,6 @@ public final class ManaSymbols {
} }
Rectangle r = new Rectangle(15 + dx, (int) (height * (15.0f + dx) / width)); Rectangle r = new Rectangle(15 + dx, (int) (height * (15.0f + dx) / width));
BufferedImage resized = ImageHelper.getResizedImage(BufferedImageBuilder.bufferImage(image, BufferedImage.TYPE_INT_ARGB), r); BufferedImage resized = ImageHelper.getResizedImage(BufferedImageBuilder.bufferImage(image, BufferedImage.TYPE_INT_ARGB), r);
File newFile = new File(getResourceSetsPath(ResourceSetSize.SMALL) + set + '-' + code + ".png");
ImageIO.write(resized, "png", newFile); ImageIO.write(resized, "png", newFile);
} }
} catch (Exception e) { } catch (Exception e) {
@ -200,11 +205,11 @@ public final class ManaSymbols {
} }
} }
} }
}
} catch (Exception e) { } catch (Exception e) {
} }
} }
// mark loaded images // mark loaded images
// TODO: delete that code, images draw-show must dynamicly // TODO: delete that code, images draw-show must dynamicly
File file; File file;
@ -225,7 +230,6 @@ public final class ManaSymbols {
} }
public static BufferedImage loadSVG(File svgFile, int resizeToWidth, int resizeToHeight, boolean useShadow) throws IOException { public static BufferedImage loadSVG(File svgFile, int resizeToWidth, int resizeToHeight, boolean useShadow) throws IOException {
// debug: disable shadow gen, need to test it // debug: disable shadow gen, need to test it
useShadow = false; useShadow = false;
@ -419,17 +423,17 @@ public final class ManaSymbols {
} }
private static boolean loadSymbolImages(int size) { private static boolean loadSymbolImages(int size) {
// load all symbols to cash // load all symbols to cache
// priority: SVG -> GIF // priority: SVG -> GIF
// gif remain for backward compatibility // gif remain for backward compatibility
boolean fileErrors = false; //boolean fileErrors = false;
AtomicBoolean fileErrors = new AtomicBoolean(false);
HashMap<String, BufferedImage> sizedSymbols = new HashMap<>(); Map<String, BufferedImage> sizedSymbols = new ConcurrentHashMap<>();
for (String symbol : symbols) { IntStream.range(0, symbols.length).parallel().forEach(i-> {
String symbol = symbols[i];
BufferedImage image = null; BufferedImage image = null;
File file = null; File file;
// svg // svg
file = getSymbolFileNameAsSVG(symbol); file = getSymbolFileNameAsSVG(symbol);
@ -451,13 +455,13 @@ public final class ManaSymbols {
if (image != null) { if (image != null) {
sizedSymbols.put(symbol, image); sizedSymbols.put(symbol, image);
} else { } else {
fileErrors = true; fileErrors.set(true);
LOGGER.warn("SVG or GIF symbol can't be load: " + symbol); LOGGER.warn("SVG or GIF symbol can't be load: " + symbol);
} }
} });
manaImages.put(size, sizedSymbols); manaImages.put(size, sizedSymbols);
return !fileErrors; return !fileErrors.get();
} }
private static void renameSymbols(String path) { private static void renameSymbols(String path) {