ydeng/rhythmbullet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

changed how assets are organized and made minor code clean ups

Browse Source
This commit is contained in:
Harrison Deng
2017-05-27 19:49:35 -05:00
parent f7e5e5e35e
commit 92c80b5b32
101 changed files with 82 additions and 1922 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
core/src/zero1hd/polyjet/Polyjet.java
View File

@@ -6,6 +6,7 @@ import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.Preferences;
import com.badlogic.gdx.assets.AssetManager;
import com.badlogic.gdx.assets.loaders.ParticleEffectLoader;
import com.badlogic.gdx.assets.loaders.SoundLoader;
import com.badlogic.gdx.assets.loaders.TextureAtlasLoader;
import com.badlogic.gdx.assets.loaders.TextureLoader;
import com.badlogic.gdx.assets.loaders.resolvers.InternalFileHandleResolver;
@@ -31,6 +32,7 @@ import com.badlogic.gdx.scenes.scene2d.ui.TextField.TextFieldStyle;
import com.badlogic.gdx.scenes.scene2d.ui.Window.WindowStyle;
import zero1hd.polyjet.screens.MainMenu;
import zero1hd.polyjet.util.GenericFileTypeHandler;
import zero1hd.polyjet.util.RoundingResolutionHandler;
import zero1hd.polyjet.screens.LoadingScreen;
@@ -75,13 +77,16 @@ public class Polyjet extends Game {
new Resolution(2560, 1440, "2560x1440"),
new Resolution(3840, 2160, "3840x2160"),
};
InternalFileHandleResolver internalFileResolver = new InternalFileHandleResolver();
RoundingResolutionHandler rRHandler = new RoundingResolutionHandler(internalFileResolver, resolution);
GenericFileTypeHandler genericFileFinder = new GenericFileTypeHandler(internalFileResolver);
assetManager.setLoader(TextureAtlas.class, new TextureAtlasLoader(rRHandler));
assetManager.setLoader(Texture.class, new TextureLoader(rRHandler));
assetManager.setLoader(ParticleEffect.class, new ParticleEffectLoader(genericFileFinder));
assetManager.setLoader(Sound.class, new SoundLoader(genericFileFinder));
RoundingResolutionHandler resolver = new RoundingResolutionHandler(new InternalFileHandleResolver(), resolution);
assetManager.setLoader(TextureAtlas.class, new TextureAtlasLoader(resolver));
assetManager.setLoader(Texture.class, new TextureLoader(resolver));
assetManager.setLoader(ParticleEffect.class, new ParticleEffectLoader(resolver));
default_fontGenerator = new FreeTypeFontGenerator(Gdx.files.internal("fonts/Gasalt-Regular.ttf"));
darktech_ldr_fontGenerator = new FreeTypeFontGenerator(Gdx.files.internal("fonts/darktech_ldr.ttf"));
@@ -116,8 +121,8 @@ public class Polyjet extends Game {
assetManager.load("cybercircle1.png", Texture.class);
assetManager.load("defaultCover.png", Texture.class);
assetManager.load("teleport-cloak.p", ParticleEffect.class);
assetManager.load("sounds/pop_open.ogg", Sound.class);
assetManager.load("sounds/pop_close.ogg", Sound.class);
assetManager.load("pop_open.ogg", Sound.class);
assetManager.load("pop_close.ogg", Sound.class);
}
public void generateFonts() {
initComplete = true;

8
core/src/zero1hd/polyjet/ui/windows/LoadingWindow.java
View File

@@ -18,8 +18,8 @@ public class LoadingWindow extends Window implements Disposable {
public LoadingWindow(Skin skin, boolean progress, AssetManager assets, float vol) {
super("loading...", skin);
this.openSound = assets.get("sounds/pop_open.ogg", Sound.class);
this.closeSound = assets.get("sounds/pop_close.ogg", Sound.class);
this.openSound = assets.get("pop_open.ogg", Sound.class);
this.closeSound = assets.get("pop_close.ogg", Sound.class);
this.vol = vol;
Image loading = new Image(skin, "loading");
loading.addAction(Actions.forever(Actions.rotateBy(-360f, 2f)));
@@ -43,8 +43,8 @@ public class LoadingWindow extends Window implements Disposable {
public LoadingWindow(Skin skin, String styleName, boolean progress, AssetManager assets, float vol) {
super("loading...", skin, styleName);
this.openSound = assets.get("sounds/pop_open.ogg", Sound.class);
this.closeSound = assets.get("sounds/pop_close.ogg", Sound.class);
this.openSound = assets.get("pop_open.ogg", Sound.class);
this.closeSound = assets.get("pop_close.ogg", Sound.class);
this.vol = vol;
Image loading = new Image(skin, "loading");
loading.addAction(Actions.forever(Actions.rotateBy(-360f, 2f)));

25
core/src/zero1hd/polyjet/util/GenericFileTypeHandler.java Executable file
View File

@@ -0,0 +1,25 @@
package zero1hd.polyjet.util;
import com.badlogic.gdx.assets.loaders.FileHandleResolver;
import com.badlogic.gdx.files.FileHandle;
public class GenericFileTypeHandler implements FileHandleResolver {
private final FileHandleResolver resolver;
public GenericFileTypeHandler(FileHandleResolver fileResolver) {
resolver = fileResolver;
}
@Override
public FileHandle resolve(String fileName) {
if (fileName.endsWith(".p")) {
return resolver.resolve("particles/" +fileName);
} else if (fileName.endsWith(".ogg")) {
return resolver.resolve("sounds/" + fileName);
} else {
return null;
}
}
}

3
core/src/zero1hd/polyjet/util/RoundingResolutionHandler.java
View File

@@ -57,9 +57,8 @@ public class RoundingResolutionHandler implements FileHandleResolver {
public FileHandle resolve(String fileName) {
Gdx.app.debug("RResolution Handler", "Finding best match for resolution: " + Gdx.graphics.getWidth() + "x" + Gdx.graphics.getHeight() + " for file: " + fileName);
Resolution bestRes = chooseRounded(descriptors);
FileHandle initialHandle = new FileHandle(fileName);
Gdx.app.debug("RResolution Handler", "Selected folder: " + bestRes.folder);
FileHandle resSpecificFile = resolver.resolve(bestRes.folder + "/" + initialHandle.name());
FileHandle resSpecificFile = resolver.resolve(bestRes.folder + "/" + fileName);
if (!resSpecificFile.exists()) resSpecificFile = resolver.resolve(fileName);
return resSpecificFile;
}