mirror of
https://github.com/Card-Forge/forge.git
synced 2025-11-17 03:08:02 +00:00
Merge pull request #1287 from kevlahnota/master
fix black texture on card list view
This commit is contained in:
@@ -328,6 +328,9 @@ public class Forge implements ApplicationListener {
|
|||||||
altZoneTabs = true;
|
altZoneTabs = true;
|
||||||
//pixl cursor for adventure
|
//pixl cursor for adventure
|
||||||
setCursor(null, "0");
|
setCursor(null, "0");
|
||||||
|
loadAdventureResources(true);
|
||||||
|
}
|
||||||
|
private static void loadAdventureResources(boolean startScene) {
|
||||||
try {
|
try {
|
||||||
if(!adventureLoaded)
|
if(!adventureLoaded)
|
||||||
{
|
{
|
||||||
@@ -336,7 +339,8 @@ public class Forge implements ApplicationListener {
|
|||||||
}
|
}
|
||||||
adventureLoaded=true;
|
adventureLoaded=true;
|
||||||
}
|
}
|
||||||
switchScene(SceneType.StartScene.instance);
|
if (startScene)
|
||||||
|
switchScene(SceneType.StartScene.instance);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
}
|
}
|
||||||
@@ -362,6 +366,10 @@ public class Forge implements ApplicationListener {
|
|||||||
//load Drafts
|
//load Drafts
|
||||||
preloadBoosterDrafts();
|
preloadBoosterDrafts();
|
||||||
FThreads.invokeInEdtLater(() -> {
|
FThreads.invokeInEdtLater(() -> {
|
||||||
|
if (selector.equals("Adventure")) {
|
||||||
|
//preload adventure resources to speedup startup if selector is adventure. Needs in edt when setting up worldstage
|
||||||
|
loadAdventureResources(false);
|
||||||
|
}
|
||||||
//selection transition
|
//selection transition
|
||||||
setTransitionScreen(new TransitionScreen(() -> {
|
setTransitionScreen(new TransitionScreen(() -> {
|
||||||
if (selector.equals("Classic")) {
|
if (selector.equals("Classic")) {
|
||||||
@@ -944,10 +952,10 @@ public class Forge implements ApplicationListener {
|
|||||||
@Override
|
@Override
|
||||||
public void dispose() {
|
public void dispose() {
|
||||||
if (currentScreen != null) {
|
if (currentScreen != null) {
|
||||||
FOverlay.hideAll();
|
|
||||||
currentScreen.onClose(null);
|
currentScreen.onClose(null);
|
||||||
currentScreen = null;
|
currentScreen = null;
|
||||||
}
|
}
|
||||||
|
FOverlay.hideAll();
|
||||||
assets.dispose();
|
assets.dispose();
|
||||||
Dscreens.clear();
|
Dscreens.clear();
|
||||||
graphics.dispose();
|
graphics.dispose();
|
||||||
|
|||||||
@@ -327,6 +327,7 @@ public class ImageCache {
|
|||||||
syncQ.clear();
|
syncQ.clear();
|
||||||
cardsLoaded.clear();
|
cardsLoaded.clear();
|
||||||
counter = 0;
|
counter = 0;
|
||||||
|
CardRenderer.clearcardArtCache();
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
//e.printStackTrace();
|
//e.printStackTrace();
|
||||||
} finally {
|
} finally {
|
||||||
|
|||||||
Reference in New Issue
Block a user