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

Revert "Use rendered cards for Adventure when no image file has been found."

Browse Source 
This reverts commit e3f14d5bdc
This commit is contained in:
Magpie
2022-04-05 22:21:51 +00:00
parent e3f14d5bdc
commit d5a5965c01
3 changed files with 1 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
forge-gui-mobile/src/forge/Forge.java
View File

@@ -27,16 +27,12 @@ import forge.assets.AssetsDownloader;
import forge.assets.FSkin;
import forge.assets.FSkinFont;
import forge.assets.ImageCache;
import forge.card.CardImageRenderer;
import forge.card.CardRenderer;
import forge.error.ExceptionHandler;
import forge.game.card.CardView;
import forge.gamemodes.limited.BoosterDraft;
import forge.gui.FThreads;
import forge.gui.GuiBase;
import forge.gui.error.BugReporter;
import forge.interfaces.IDeviceAdapter;
import forge.item.PaperCard;
import forge.localinstance.properties.ForgeConstants;
import forge.localinstance.properties.ForgePreferences;
import forge.localinstance.properties.ForgePreferences.FPref;
@@ -388,11 +384,6 @@ public class Forge implements ApplicationListener {
FThreads.invokeInEdtLater(new Runnable() {
@Override
public void run() {
//Force CardImageRenderer to render a card. This prevents a "fail on first run" scenario.
PaperCard dummy = StaticData.instance().fetchCard("Black Lotus", "LEB", "233");
graphics.getBatch().begin(); //Will throw an exception without this.
CardImageRenderer.drawCardImage(graphics, CardView.getCardForUi(dummy), false, 0, 0, 100, 100, CardRenderer.CardStackPosition.Top, false, false);
//selection
splashScreen.setShowModeSelector(true);
//start background music

2
forge-gui-mobile/src/forge/adventure/scene/RewardScene.java
View File

@@ -200,7 +200,6 @@ public class RewardScene extends UIScene {
float spacing = 2;
int i = 0;
Forge.getGraphics().startClip(); //This allows to draw placeholder cards.
for (Reward reward : new Array.ArrayIterator<>(newRewards)) {
boolean skipCard = false;
if (type == Type.Shop) {
@@ -239,7 +238,6 @@ public class RewardScene extends UIScene {
i++;
}
updateBuyButtons();
Forge.getGraphics().endClip();
}
private void updateBuyButtons() {

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

@@ -1,14 +1,11 @@
package forge.adventure.util;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.graphics.GL20;
import com.badlogic.gdx.graphics.Pixmap;
import com.badlogic.gdx.graphics.Texture;
import com.badlogic.gdx.graphics.g2d.Batch;
import com.badlogic.gdx.graphics.g2d.Sprite;
import com.badlogic.gdx.graphics.g2d.TextureAtlas;
import com.badlogic.gdx.graphics.g2d.TextureRegion;
import com.badlogic.gdx.graphics.glutils.FrameBuffer;
import com.badlogic.gdx.graphics.glutils.ShaderProgram;
import com.badlogic.gdx.math.MathUtils;
import com.badlogic.gdx.math.Matrix4;
@@ -24,17 +21,11 @@ import com.badlogic.gdx.scenes.scene2d.utils.TextureRegionDrawable;
import com.badlogic.gdx.utils.Align;
import com.badlogic.gdx.utils.Disposable;
import forge.Forge;
import forge.Graphics;
import forge.adventure.scene.RewardScene;
import forge.adventure.scene.Scene;
import forge.assets.FSkin;
import forge.assets.ImageCache;
import forge.card.CardImageRenderer;
import forge.card.CardRenderer;
import forge.game.card.Card;
import forge.game.card.CardView;
import forge.gui.GuiBase;
import forge.item.PaperCard;
import forge.util.ImageFetcher;
import static forge.adventure.util.Paths.ITEMS_ATLAS;
@@ -57,7 +48,6 @@ public class RewardActor extends Actor implements Disposable, ImageFetcher.Callb
boolean flipOnClick;
private boolean hover;
private FrameBuffer frameBuffer;
static final ImageFetcher fetcher = GuiBase.getInterface().getImageFetcher();
Image toolTipImage;
@@ -65,7 +55,6 @@ public class RewardActor extends Actor implements Disposable, ImageFetcher.Callb
public void dispose() {
if (needsToBeDisposed)
image.dispose();
if (frameBuffer != null) frameBuffer.dispose();
}
public Reward getReward() {
@@ -77,24 +66,6 @@ public class RewardActor extends Actor implements Disposable, ImageFetcher.Callb
setCardImage(ImageCache.getImage(reward.getCard().getImageKey(false), false));
}
public Texture renderPlaceholder(PaperCard card){
Gdx.gl.glDisable(GL20.GL_SCISSOR_TEST);
Graphics G = new Graphics();
Matrix4 m = new Matrix4();
if (frameBuffer == null)
this.frameBuffer = new FrameBuffer(Pixmap.Format.RGB888, 488, 680, false);
frameBuffer.begin();
m.setToOrtho2D(0,680,488, -680); //So it renders flipped.
G.begin(488, 680);
G.setProjectionMatrix(m);
CardImageRenderer.drawCardImage(G, CardView.getCardForUi(card), false, 0, 0, 488, 680, CardRenderer.CardStackPosition.Top, Forge.enableUIMask.equals("Art"), true);
G.end();
G.dispose();
setCardImage(frameBuffer.getColorBufferTexture());
frameBuffer.end();
Gdx.gl.glEnable(GL20.GL_SCISSOR_TEST);
return frameBuffer.getColorBufferTexture();
}
public RewardActor(Reward reward, boolean flippable) {
this.flipOnClick = flippable;
this.reward = reward;
@@ -108,11 +79,7 @@ public class RewardActor extends Actor implements Disposable, ImageFetcher.Callb
} else {
if (!ImageCache.imageKeyFileExists(reward.getCard().getImageKey(false))) {
//Cannot find an image file, set up a rendered card until (if) a file is downloaded.
PaperCard C = reward.getCard();
Texture T = renderPlaceholder(C);
setCardImage(T);
fetcher.fetchImage(C.getImageKey(false), this);
fetcher.fetchImage(reward.getCard().getImageKey(false), this);
}
}
break;