external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 20:28:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Refactored the XLHQ card zoom code, moved GetImageXlhq to FImageUtil where it belongs more.

Browse Source
This commit is contained in:
Agetian
2015-01-13 18:04:45 +00:00
parent c9e4dd9ffc
commit 3c3a830d04
2 changed files with 60 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
forge-gui-desktop/src/main/java/forge/toolbox/imaging/FImageUtil.java
View File

@@ -23,12 +23,18 @@ import java.awt.image.BufferedImage;
import java.awt.image.ColorModel;
import forge.ImageCache;
import forge.ImageKeys;
import forge.game.card.CardView.CardStateView;
import forge.match.MatchUtil;
import forge.model.FModel;
import forge.properties.ForgePreferences;
import forge.toolbox.CardFaceSymbols;
import forge.toolbox.FSkin.SkinIcon;
import forge.util.ImageUtil;
import java.io.File;
import java.io.IOException;
import java.nio.file.Path;
import javax.imageio.ImageIO;
/**
* Common image-related routines specific to Forge images.
@@ -57,10 +63,62 @@ public final class FImageUtil {
return image;
}
public static BufferedImage getImageXlhq(final CardStateView state) {
String key = MatchUtil.getCardImageKey(state);
if (key.isEmpty() || key.length() < 3) {
return null;
}
String prefix = key.substring(0, 2);
if (!prefix.equals(ImageKeys.CARD_PREFIX) && !prefix.equals(ImageKeys.TOKEN_PREFIX)) {
return null;
}
boolean altState = key.endsWith(ImageKeys.BACKFACE_POSTFIX);
String imageKey = key;
if (prefix.equals(ImageKeys.CARD_PREFIX)) {
imageKey = ImageUtil.getImageKey(ImageUtil.getPaperCardFromImageKey(key.substring(2)), altState, true);
}
if(altState) {
imageKey = imageKey.substring(0, imageKey.length() - ImageKeys.BACKFACE_POSTFIX.length());
imageKey += "full.jpg";
}
File file = ImageKeys.getImageFile(imageKey);
BufferedImage img = null;
if (file != null) {
Path path = file.toPath();
String modPath = "";
if (prefix.equals(ImageKeys.CARD_PREFIX)) {
modPath = path.getRoot().toString() + path.subpath(0, path.getNameCount()-2).toString() + File.separator + "XLHQ" + File.separator + path.subpath(path.getNameCount()-2, path.getNameCount());
} else if (prefix.equals(ImageKeys.TOKEN_PREFIX)) {
modPath = path.getRoot().toString() + path.subpath(0, path.getNameCount()-1).toString() + File.separator + "XLHQ" + File.separator + path.subpath(path.getNameCount()-1, path.getNameCount());
}
File xlhqFile = new File(modPath.replace(".full.jpg", ".xlhq.jpg"));
if (xlhqFile != null && xlhqFile.exists()) {
try {
img = ImageIO.read(xlhqFile);
final int foilIndex = state.getFoilIndex();
if (img != null && foilIndex > 0) {
img = FImageUtil.getImageWithFoilEffect(img, foilIndex);
}
return img;
} catch (IOException ex) {
System.err.println("IO exception caught when trying to open a XLHQ image: " + xlhqFile.getName());
}
}
}
return null;
}
/**
* Applies a foil effect to a card image.
*/
public static BufferedImage getImageWithFoilEffect(BufferedImage plainImage, int foilIndex) {
private static BufferedImage getImageWithFoilEffect(BufferedImage plainImage, int foilIndex) {
if (!FModel.getPreferences().getPrefBoolean(ForgePreferences.FPref.UI_OVERLAY_FOIL_EFFECT)) {
return plainImage;
}

61
forge-gui-desktop/src/main/java/forge/toolbox/special/CardZoomer.java
View File

@@ -27,19 +27,14 @@ import java.awt.event.MouseEvent;
import java.awt.event.MouseWheelEvent;
import java.awt.event.MouseWheelListener;
import java.awt.image.BufferedImage;
import java.io.File;
import java.io.IOException;
import java.nio.file.Path;
import javax.swing.JPanel;
import javax.swing.Timer;
import javax.imageio.ImageIO;
import net.miginfocom.swing.MigLayout;
import forge.assets.FSkinProp;
import forge.game.card.CardView;
import forge.game.card.CardView.CardStateView;
import forge.gui.SOverlayUtils;
import forge.ImageKeys;
import forge.match.MatchUtil;
import forge.toolbox.FOverlay;
import forge.toolbox.FSkin;
@@ -47,7 +42,6 @@ import forge.toolbox.FSkin.SkinnedLabel;
import forge.toolbox.imaging.FImagePanel;
import forge.toolbox.imaging.FImagePanel.AutoSizeImageMode;
import forge.toolbox.imaging.FImageUtil;
import forge.util.ImageUtil;
/**
* Displays card image at its original size and correct orientation.
@@ -219,7 +213,7 @@ public enum CardZoomer {
private void setImage() {
imagePanel = new FImagePanel();
BufferedImage xlhqImage = getImageXlhq();
BufferedImage xlhqImage = FImageUtil.getImageXlhq(getState());
imagePanel.setImage(xlhqImage == null ? FImageUtil.getImage(getState()) : xlhqImage, getInitialRotation(), AutoSizeImageMode.SOURCE);
pnlMain.removeAll();
@@ -228,59 +222,6 @@ public enum CardZoomer {
setFlipIndicator();
}
private BufferedImage getImageXlhq() {
String key = MatchUtil.getCardImageKey(getState());
if (key.isEmpty() || key.length() < 3) {
return null;
}
String prefix = key.substring(0, 2);
if (!prefix.equals(ImageKeys.CARD_PREFIX) && !prefix.equals(ImageKeys.TOKEN_PREFIX)) {
return null;
}
boolean altState = key.endsWith(ImageKeys.BACKFACE_POSTFIX);
String imageKey = key;
if (prefix.equals(ImageKeys.CARD_PREFIX)) {
imageKey = ImageUtil.getImageKey(ImageUtil.getPaperCardFromImageKey(key.substring(2)), altState, true);
}
if(altState) {
imageKey = imageKey.substring(0, imageKey.length() - ImageKeys.BACKFACE_POSTFIX.length());
imageKey += "full.jpg";
}
File file = ImageKeys.getImageFile(imageKey);
BufferedImage img = null;
if (file != null) {
Path path = file.toPath();
String modPath = "";
if (prefix.equals(ImageKeys.CARD_PREFIX)) {
modPath = path.getRoot().toString() + path.subpath(0, path.getNameCount()-2).toString() + File.separator + "XLHQ" + File.separator + path.subpath(path.getNameCount()-2, path.getNameCount());
} else if (prefix.equals(ImageKeys.TOKEN_PREFIX)) {
modPath = path.getRoot().toString() + path.subpath(0, path.getNameCount()-1).toString() + File.separator + "XLHQ" + File.separator + path.subpath(path.getNameCount()-1, path.getNameCount());
}
File xlhqFile = new File(modPath.replace(".full.jpg", ".xlhq.jpg"));
if (xlhqFile != null && xlhqFile.exists()) {
try {
img = ImageIO.read(xlhqFile);
final int foilIndex = thisCard.getCurrentState().getFoilIndex();
if (img != null && foilIndex > 0) {
img = FImageUtil.getImageWithFoilEffect(img, foilIndex);
}
return img;
} catch (IOException ex) {
System.err.println("IO exception caught when trying to open a XLHQ image: " + xlhqFile.getName());
}
}
}
return null;
}
private int getInitialRotation() {
return (thisCard.isSplitCard() || thisCard.getCurrentState().getType().isPlane() || thisCard.getCurrentState().getType().isPhenomenon() ? 90 : 0);
}