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

Improve mana cost rendering

Browse Source
This commit is contained in:
drdev
2014-04-19 17:59:10 +00:00
parent 42767532ac
commit 5a4eccf604
3 changed files with 51 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
forge-gui-mobile/src/forge/assets/CardFaceSymbols.java
View File

@@ -100,39 +100,38 @@ public class CardFaceSymbols {
MANA_IMAGES.put("foil20", FSkinImage.FOIL_20);
}
public static void draw(Graphics g, ManaCost manaCost, float x, float y, final float imageSize) {
public static void drawManaCost(Graphics g, ManaCost manaCost, float x, float y, final float imageSize) {
if (manaCost.isNoCost()) {
return;
}
float xpos = x;
final float offset = 14;
final int genericManaCost = manaCost.getGenericCost();
final boolean hasGeneric = (genericManaCost > 0) || manaCost.isPureGeneric();
final float dx = imageSize;
if (hasGeneric) {
for (final ManaCostShard s : manaCost) { //render X shards before generic
if (s == ManaCostShard.X) {
drawSymbol(s.getImageKey(), g, xpos, y, imageSize);
xpos += offset;
drawSymbol(s.getImageKey(), g, x, y, imageSize);
x += dx;
}
}
final String sGeneric = Integer.toString(genericManaCost);
drawSymbol(sGeneric, g, xpos, y, imageSize);
xpos += offset;
drawSymbol(sGeneric, g, x, y, imageSize);
x += dx;
for (final ManaCostShard s : manaCost) { //render non-X shards after generic
if (s != ManaCostShard.X) {
drawSymbol(s.getImageKey(), g, xpos, y, imageSize);
xpos += offset;
drawSymbol(s.getImageKey(), g, x, y, imageSize);
x += dx;
}
}
}
else { //if no generic, just render shards in order
for (final ManaCostShard s : manaCost) {
drawSymbol(s.getImageKey(), g, xpos, y, imageSize);
xpos += offset;
drawSymbol(s.getImageKey(), g, x, y, imageSize);
x += dx;
}
}
}
@@ -142,6 +141,8 @@ public class CardFaceSymbols {
return;
}
final float dx = imageSize;
StringTokenizer tok = new StringTokenizer(s, " ");
while (tok.hasMoreTokens()) {
String symbol = tok.nextToken();
@@ -151,7 +152,7 @@ public class CardFaceSymbols {
continue;
}
g.drawImage(image, x, y, imageSize, imageSize);
x += imageSize;
x += dx;
}
}

17
forge-gui-mobile/src/forge/assets/FSkinImage.java
View File

@@ -354,8 +354,23 @@ public enum FSkinImage implements FImage {
return h;
}
public float getNearestHQWidth(float baseWidth) {
return getNearestHQSize(baseWidth, w);
}
public float getNearestHQHeight(float baseHeight) {
return getNearestHQSize(baseHeight, h);
}
private float getNearestHQSize(float baseSize, float actualSize) {
//get nearest power of actualSize to baseSize so that the image renders good
float nearestSize = (float)Math.pow((double)Math.round(actualSize),
(double)Math.round(Math.log((double)baseSize) / Math.log((double)actualSize)));
return nearestSize;
}
@Override
public void draw(Graphics g, float x, float y, float w, float h) {
g.drawImage(this.textureRegion, x, y, w, h);
g.drawImage(textureRegion, x, y, w, h);
}
}

31
forge-gui-mobile/src/forge/screens/match/InputSelectCard.java
View File

@@ -13,8 +13,10 @@ import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment;
import com.badlogic.gdx.math.Vector2;
import forge.Forge.Graphics;
import forge.assets.CardFaceSymbols;
import forge.assets.FSkinColor;
import forge.assets.FSkinFont;
import forge.assets.FSkinImage;
import forge.assets.ImageCache;
import forge.assets.FSkinColor.Colors;
import forge.card.CardDetailUtil;
@@ -174,6 +176,8 @@ public class InputSelectCard {
private static final FSkinFont TEXT_FONT = TYPE_FONT;
private static final FSkinFont ID_FONT = TEXT_FONT;
private static final FSkinFont PT_FONT = NAME_FONT;
private static final float MANA_COST_PADDING = 3;
private static final float MANA_SYMBOL_SIZE = FSkinImage.MANA_1.getNearestHQWidth(2 * (NAME_FONT.getFont().getCapHeight() - MANA_COST_PADDING));
private static final Backdrop backdrop = new Backdrop();
@@ -486,7 +490,7 @@ public class InputSelectCard {
x += outerBorderThickness;
y += outerBorderThickness;
w -= 2 * outerBorderThickness;
h = 2 * (NAME_FONT.getFont().getCapHeight() + TYPE_FONT.getFont().getCapHeight());
h = Math.max(MANA_SYMBOL_SIZE + 2 * MANA_COST_PADDING, 2 * NAME_FONT.getFont().getCapHeight()) + 2 * TYPE_FONT.getFont().getCapHeight();
//draw name/type box
int nameManaCostStep = 100; //TODO: add better background colors to CardBorderColor enum
@@ -518,9 +522,17 @@ public class InputSelectCard {
}
g.drawRect(1, Color.BLACK, x, y, w, h);
x += h / 8;
h = 2 * NAME_FONT.getFont().getCapHeight();
g.drawText(card.getName(), NAME_FONT, Color.BLACK, x, y, w, h, false, HAlignment.LEFT, true);
float padding = h / 8;
//make sure name/mana cost row height is tall enough for both
h = Math.max(MANA_SYMBOL_SIZE + 2 * MANA_COST_PADDING, 2 * NAME_FONT.getFont().getCapHeight());
float manaCostWidth = CardFaceSymbols.getWidth(card.getManaCost(), MANA_SYMBOL_SIZE) + MANA_COST_PADDING;
CardFaceSymbols.drawManaCost(g, card.getManaCost(), x + w - manaCostWidth, y + (h - MANA_SYMBOL_SIZE) / 2, MANA_SYMBOL_SIZE);
x += padding;
w -= 2 * padding;
g.drawText(card.getName(), NAME_FONT, Color.BLACK, x, y, w - manaCostWidth - padding, h, false, HAlignment.LEFT, true);
y += h;
h = 2 * TYPE_FONT.getFont().getCapHeight();
g.drawText(CardDetailUtil.formatCardType(card), TYPE_FONT, Color.BLACK, x, y, w, h, false, HAlignment.LEFT, true);
@@ -530,11 +542,12 @@ public class InputSelectCard {
g.fillRect(Color.WHITE, x, y, w, h);
g.drawRect(1, Color.BLACK, x, y, w, h);
float padding = TEXT_FONT.getFont().getCapHeight() / 2;
x += padding;
y += padding;
w -= 2 * padding;
h -= 2 * padding;
float padX = TEXT_FONT.getFont().getCapHeight() / 2;
float padY = padX + 2; //add a little more vertical padding
x += padX;
y += padY;
w -= 2 * padX;
h -= 2 * padY;
g.drawText(CardDetailUtil.composeCardText(card, canShow), TEXT_FONT, Color.BLACK, x, y, w, h, true, HAlignment.LEFT, false);
}