openeggbert-archive/open-eggbert-java
Archived
1
0
Fork 0
Code Pull Requests Projects Releases Activity

Fixed loading the background image

Browse Source
This commit is contained in:
Robert Vokac 2024-08-15 19:30:21 +02:00
parent 5132d09953
commit f940e42518
No known key found for this signature in database
GPG Key ID: C459E1E4B4A986BB
4 changed files with 30 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/main/java/com/openeggbert/main/OpenEggbertGame.java
View File

@ -40,6 +40,7 @@ import com.openeggbert.screens.InitScreen;
import com.openeggbert.gdx.storage.Storage;
import com.openeggbert.gdx.storage.StorageImplementationLoader;
import com.openeggbert.utils.OpenEggbertDisplayMode;
import com.openeggbert.utils.OpenEggbertUtils;
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
@ -156,7 +157,7 @@ public class OpenEggbertGame extends Game {
public void loadImageTexture(FileHandle fileHandle) {
Texture texture = new Texture(fileHandle);
imageTextures.put(fileHandle.name().toUpperCase(), texture);
imageTextures.put(OpenEggbertUtils.getFileNameWithoutExtension(fileHandle.name().toUpperCase()), texture);
}
public boolean existsImageTexture(String key) {

50
core/src/main/java/com/openeggbert/screens/AbstractOpenEggbertScreen.java
View File

@ -26,9 +26,12 @@ import com.badlogic.gdx.ScreenAdapter;
import com.badlogic.gdx.files.FileHandle;
import com.badlogic.gdx.graphics.Texture;
import com.badlogic.gdx.graphics.g2d.SpriteBatch;
import com.openeggbert.entity.common.GameFileType;
import com.openeggbert.entity.common.OpenEggbertException;
import com.openeggbert.entity.common.OpenEggbertScreenType;
import com.openeggbert.main.OpenEggbertGame;
import com.openeggbert.utils.OpenEggbertUtils;
import java.util.List;
import java.util.Optional;
/**
@ -63,54 +66,49 @@ public abstract class AbstractOpenEggbertScreen extends ScreenAdapter {
}
private void loadBackgroundTextureIfNeeded() {
if(true) return;//todo
//if(true) return;//todo
if (getBackgroundFileName().isEmpty()) {
return;
}
String fileName = getBackgroundFileName();
if (!game.existsImageTexture(fileName)) {
String nameUpperCase = game.getGameSpace().getImage08Directory() + "/" + fileName;
String nameLowerCase = game.getGameSpace().getImage08Directory() + "/" + fileName.toLowerCase();
List<String> possibleFileNames = OpenEggbertUtils.createPossibleFileNames(GameFileType.IMAGE8, fileName);
for(String possibleFileName: possibleFileNames) {
if (!game.existsImageTexture(possibleFileName)) {
String name = game.getGameSpace().getImage08Directory() + "/" + possibleFileName;
Gdx.app.setLogLevel(LOG_INFO);
Gdx.app.log("screen","nameUpperCase=" + nameUpperCase);
Gdx.app.log("screen","nameLowerCase=" + nameLowerCase);
FileHandle fileHandleUpperCase = null;
FileHandle fileHandleLowerCase = null;
Gdx.app.log("screen","name=" + name);
FileHandle fileHandle = null;
if (game.getGameSpace().isEmbeddedAssets()) {
if (Gdx.app.getType() == Application.ApplicationType.Android || Gdx.app.getType() == Application.ApplicationType.WebGL) {
Gdx.app.log("screen","loading from internal");
fileHandleUpperCase = Gdx.files.internal(nameUpperCase);
fileHandleLowerCase = Gdx.files.internal(nameLowerCase);
fileHandle = Gdx.files.internal(name);
} else {
Gdx.app.log("screen","loading from classpath");
fileHandleUpperCase = Gdx.files.classpath(nameUpperCase);
fileHandleLowerCase = Gdx.files.classpath(nameLowerCase);
fileHandle = Gdx.files.classpath(name);
}
} else {
Gdx.app.log("screen","loading from absolute");
fileHandleUpperCase = Gdx.files.absolute(nameUpperCase);
fileHandleLowerCase = Gdx.files.absolute(nameLowerCase);
fileHandle = Gdx.files.absolute(name);
}
Gdx.app.log("screen", "fileHandleUpperCase.exists()=" + fileHandleUpperCase.exists());
Gdx.app.log("screen", "fileHandleLowerCase.exists()=" + fileHandleLowerCase.exists());
Gdx.app.log("screen", "fileHandleUpperCase.exists()=" + fileHandle.exists());
if (fileHandleUpperCase.exists()) {
game.loadImageTexture(fileHandleUpperCase);
} else {
if (fileHandleLowerCase.exists()) {
game.loadImageTexture(fileHandleLowerCase);
} else {
throw new OpenEggbertException("Could not load file: " + fileName);
}
if (fileHandle.exists()) {
game.loadImageTexture(fileHandle);
break;
}
// else {
// throw new OpenEggbertException("Could not load file: " + fileName);
// }
}
}
}
}

2
core/src/main/java/com/openeggbert/screens/GameSpaceListScreen.java
View File

@ -177,7 +177,7 @@ public class GameSpaceListScreen extends AbstractOpenEggbertScreen {
@Override
public void renderOpenEggbertScreen(float delta) {
Gdx.app.log(getClass().getName(), game.getStorage().debug());
//Gdx.app.log(getClass().getName(), game.getStorage().debug());
timeSeconds += Gdx.graphics.getRawDeltaTime();
if (timeSeconds > 60) {

3
core/src/main/java/com/openeggbert/utils/OpenEggbertUtils.java
View File

@ -101,6 +101,9 @@ public class OpenEggbertUtils {
private static final String IMAGE = "IMAGE";
public static String getFileNameWithoutExtension(String fileName) {
if(!fileName.contains(".")) {
return fileName;
}
int dotIndex = -1;
for (int i = fileName.length() - 1; i >= 0; i--) {
char ch = fileName.charAt(i);