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

Merge branch 'master' into newmaster

Browse Source
This commit is contained in:
Anthony Calosa
2022-07-26 01:19:39 +08:00
parent 027312e34c bcb9ba16e8
commit 9d2024b1ab
2 changed files with 36 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
forge-gui-mobile/src/forge/adventure/util/RewardActor.java
View File

@@ -52,7 +52,7 @@ public class RewardActor extends Actor implements Disposable, ImageFetcher.Callb
final int preview_h = 680; final int preview_h = 680;
static TextureRegion backTexture; static TextureRegion backTexture;
Texture image; Texture image, T;
Texture generatedTooltip = null; //Storage for a generated tooltip. To dispose of on exit. Texture generatedTooltip = null; //Storage for a generated tooltip. To dispose of on exit.
boolean needsToBeDisposed; boolean needsToBeDisposed;
float flipProcess = 0; float flipProcess = 0;
@@ -104,8 +104,14 @@ public class RewardActor extends Actor implements Disposable, ImageFetcher.Callb
CardImageRenderer.drawCardImage(G, CardView.getCardForUi(reward.getCard()), false, -(preview_w + 20), 0, preview_w, preview_h, CardRenderer.CardStackPosition.Top, Forge.enableUIMask.equals("Art"), true); CardImageRenderer.drawCardImage(G, CardView.getCardForUi(reward.getCard()), false, -(preview_w + 20), 0, preview_w, preview_h, CardRenderer.CardStackPosition.Top, Forge.enableUIMask.equals("Art"), true);
G.end(); G.end();
} }
Texture T = renderPlaceholder(G, reward.getCard()); //Now we can render the card. T = renderPlaceholder(G, reward.getCard()); //Now we can render the card.
setCardImage(T); setCardImage(T);
if (image == null) {
if (T == null)
System.err.println("Error generating placeholder image for card: "+reward.getCard().getName());
else
image = T;
}
//Set the fetcher regardless. It'll replace the preview once it lands. //Set the fetcher regardless. It'll replace the preview once it lands.
fetcher.fetchImage(reward.getCard().getImageKey(false), this); fetcher.fetchImage(reward.getCard().getImageKey(false), this);
} }
@@ -202,23 +208,27 @@ public class RewardActor extends Actor implements Disposable, ImageFetcher.Callb
} }
private void setCardImage(Texture img) { private void setCardImage(Texture img) {
image = img; try {
if (Forge.isTextureFilteringEnabled()) image = img;
image.setFilter(Texture.TextureFilter.MipMapLinearLinear, Texture.TextureFilter.Linear); if (Forge.isTextureFilteringEnabled())
TextureRegionDrawable drawable = new TextureRegionDrawable(ImageCache.croppedBorderImage(image)); image.setFilter(Texture.TextureFilter.MipMapLinearLinear, Texture.TextureFilter.Linear);
if(Forge.isLandscapeMode()) TextureRegionDrawable drawable = new TextureRegionDrawable(ImageCache.croppedBorderImage(image));
drawable.setMinSize((Scene.getIntendedHeight() / RewardScene.CARD_WIDTH_TO_HEIGHT) * 0.95f, Scene.getIntendedHeight() * 0.95f); if(Forge.isLandscapeMode())
else drawable.setMinSize((Scene.getIntendedHeight() / RewardScene.CARD_WIDTH_TO_HEIGHT) * 0.95f, Scene.getIntendedHeight() * 0.95f);
drawable.setMinSize(Scene.getIntendedWidth() * 0.95f, Scene.getIntendedWidth()* RewardScene.CARD_WIDTH_TO_HEIGHT * 0.95f);
toolTipImage = new Image(drawable);
tooltip = new Tooltip<Image>(toolTipImage);
holdTooltip = new HoldTooltip(new Image(drawable));
tooltip.setInstant(true);
if (frontSideUp()) {
if (GuiBase.isAndroid())
addListener(holdTooltip);
else else
addListener(tooltip); drawable.setMinSize(Scene.getIntendedWidth() * 0.95f, Scene.getIntendedWidth()* RewardScene.CARD_WIDTH_TO_HEIGHT * 0.95f);
toolTipImage = new Image(drawable);
tooltip = new Tooltip<Image>(toolTipImage);
holdTooltip = new HoldTooltip(new Image(drawable));
tooltip.setInstant(true);
if (frontSideUp()) {
if (GuiBase.isAndroid())
addListener(holdTooltip);
else
addListener(tooltip);
}
} catch (Exception e) {
e.printStackTrace();
} }
} }
@@ -388,9 +398,14 @@ public class RewardActor extends Actor implements Disposable, ImageFetcher.Callb
batch.setShader(null); batch.setShader(null);
batch.begin(); batch.begin();
} }
} else {
if (Reward.Type.Card.equals(reward.getType())) {
if (T == null) {
T = renderPlaceholder(new Graphics(), reward.getCard());
}
batch.draw(T, x, -getHeight() / 2, width, getHeight());
}
} }
else
batch.draw(ImageCache.defaultImage, x, -getHeight() / 2, width, getHeight());
switch (reward.getType()) { switch (reward.getType()) {
case Card: case Card:
break; break;

2
forge-gui-mobile/src/forge/assets/ImageCache.java
View File

@@ -143,7 +143,7 @@ public class ImageCache {
String imageKey = ii.getImageKey(false); String imageKey = ii.getImageKey(false);
if (imageKey != null) { if (imageKey != null) {
if(imageKey.startsWith(ImageKeys.CARD_PREFIX) || imageKey.startsWith(ImageKeys.TOKEN_PREFIX)) if(imageKey.startsWith(ImageKeys.CARD_PREFIX) || imageKey.startsWith(ImageKeys.TOKEN_PREFIX))
return getImage(ii.getImageKey(false), true, false); return getImage(ii.getImageKey(false), false, false);
} }
return getImage(ii.getImageKey(false), true, true); return getImage(ii.getImageKey(false), true, true);
} }