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

change in structure for different platform support; major change

Browse Source
This commit is contained in:
Harrison Deng 2018-01-03 16:58:58 -06:00
parent cebf36dff9
commit 15a35f65dc
76 changed files with 225 additions and 208 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
android/src/zero1hd/rhythmbullet/AndroidLauncher.java
View File

@ -1,16 +1,14 @@
package zero1hd.rhythmbullet;
import android.os.Bundle;
import zero1hd.rhythmbullet.RhythmBullet;
import com.badlogic.gdx.backends.android.AndroidApplication;
import com.badlogic.gdx.backends.android.AndroidApplicationConfiguration;
public class AndroidLauncher extends AndroidApplication {
@Override
protected void onCreate (Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
AndroidApplicationConfiguration config = new AndroidApplicationConfiguration();
initialize(new RhythmBullet(), config);
// AndroidApplicationConfiguration config = new AndroidApplicationConfiguration();
// initialize(new RhythmBullet(), config);
}
}

2
build.gradle
View File

@ -72,8 +72,6 @@ project(":core") {
compile "com.badlogicgames.gdx:gdx:$gdxVersion"
compile "com.badlogicgames.gdx:gdx-freetype:$gdxVersion"
compile group: 'com.badlogicgames.jlayer', name: 'jlayer', version: '1.0.1-gdx'
compile group: 'com.googlecode.soundlibs', name: 'mp3spi', version: '1.9.5-1'
compile "org.apache.commons:commons-math3:3.2"
compile "com.github.rwl:jtransforms:2.4.0"

2
core/src/zero1hd/rhythmbullet/audio/AudioDataPackage.java
View File

@ -4,6 +4,8 @@ import java.security.InvalidParameterException;
import com.badlogic.gdx.utils.FloatArray;
import zero1hd.rhythmbullet.util.MusicManager;
public class AudioDataPackage {
private FloatArray bassPeaks;
private FloatArray mPeaks;

2
core/src/zero1hd/rhythmbullet/audio/analyzer/AudioAnalyzer.java
View File

@ -5,7 +5,7 @@ import java.util.concurrent.Executors;
import com.badlogic.gdx.utils.Disposable;
import zero1hd.rhythmbullet.audio.MusicManager;
import zero1hd.rhythmbullet.util.MusicManager;
public class AudioAnalyzer implements Disposable {
private ExecutorService exec;

2
core/src/zero1hd/rhythmbullet/audio/analyzer/PeakDetectionRunnable.java
View File

@ -4,7 +4,7 @@ import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.utils.FloatArray;
import zero1hd.rhythmbullet.audio.AudioDataPackage;
import zero1hd.rhythmbullet.audio.MusicManager;
import zero1hd.rhythmbullet.util.MusicManager;
public class PeakDetectionRunnable implements Runnable {
boolean work = true, done;

2
core/src/zero1hd/rhythmbullet/audio/analyzer/PruneFluxRunnable.java
View File

@ -3,7 +3,7 @@ package zero1hd.rhythmbullet.audio.analyzer;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.utils.FloatArray;
import zero1hd.rhythmbullet.audio.MusicManager;
import zero1hd.rhythmbullet.util.MusicManager;
public class PruneFluxRunnable implements Runnable {
boolean work = true;

2
core/src/zero1hd/rhythmbullet/audio/analyzer/SpectralFluxAnalysisRunnable.java
View File

@ -4,7 +4,7 @@ import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.utils.FloatArray;
import edu.emory.mathcs.jtransforms.fft.FloatFFT_1D;
import zero1hd.rhythmbullet.audio.MusicManager;
import zero1hd.rhythmbullet.util.MusicManager;
public class SpectralFluxAnalysisRunnable implements Runnable {
boolean work = true;

2
core/src/zero1hd/rhythmbullet/audio/analyzer/ThresholdCalcRunnable.java
View File

@ -3,7 +3,7 @@ package zero1hd.rhythmbullet.audio.analyzer;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.utils.FloatArray;
import zero1hd.rhythmbullet.audio.MusicManager;
import zero1hd.rhythmbullet.util.MusicManager;
public class ThresholdCalcRunnable implements Runnable {
boolean work = true;

2
core/src/zero1hd/rhythmbullet/audio/visualizer/BasicVisualizer.java
View File

@ -11,7 +11,7 @@ import com.badlogic.gdx.math.MathUtils;
import com.badlogic.gdx.math.Vector2;
import com.badlogic.gdx.utils.Array;
import zero1hd.rhythmbullet.audio.MusicManager;
import zero1hd.rhythmbullet.util.MusicManager;
public class BasicVisualizer extends VisualizerCore {
private Pixmap pixmap;

3
core/src/zero1hd/rhythmbullet/audio/visualizer/VisualizerCore.java
View File

@ -6,7 +6,7 @@ import com.badlogic.gdx.graphics.g2d.Batch;
import com.badlogic.gdx.utils.Disposable;
import edu.emory.mathcs.jtransforms.fft.FloatFFT_1D;
import zero1hd.rhythmbullet.audio.MusicManager;
import zero1hd.rhythmbullet.util.MusicManager;
public class VisualizerCore implements Disposable {
protected MusicManager mm;
@ -33,6 +33,7 @@ public class VisualizerCore implements Disposable {
updateTimer += delta;
if (updateTimer >= updateRate) {
mm.playbackIndexUpdate();
System.out.println(mm.getPlaybackIndexPosition() + "vs" + mm.getReadIndex());
while (mm.getPlaybackIndexPosition() > mm.getReadIndex()) {
mm.skipReadWindow();
}

2
core/src/zero1hd/rhythmbullet/audio/MusicManager.java → core/src/zero1hd/rhythmbullet/util/MusicManager.java
View File

@ -1,5 +1,5 @@
package zero1hd.rhythmbullet.audio;
package zero1hd.rhythmbullet.util;
import com.badlogic.gdx.audio.Music.OnCompletionListener;
import com.badlogic.gdx.files.FileHandle;

8
core/src/zero1hd/rhythmbullet/util/RoundingResolutionHandler.java
View File

@ -8,7 +8,7 @@ import com.badlogic.gdx.files.FileHandle;
public class RoundingResolutionHandler implements FileHandleResolver {
private final Resolution[] descriptors;
private final FileHandleResolver resolver;
private boolean silent = true;
private int width, height;
public RoundingResolutionHandler(FileHandleResolver fileResolver, Resolution... descriptors) {
if (descriptors.length == 0) throw new IllegalArgumentException("At least one Resolution needs to be supplied.");
@ -65,9 +65,11 @@ public class RoundingResolutionHandler implements FileHandleResolver {
@Override
public FileHandle resolve(String fileName) {
Gdx.app.debug("RResolution Handler", "Finding best match for resolution: " + width + "x" + height + " for file: " + fileName);
Resolution bestRes = chooseRounded(descriptors);
Gdx.app.debug("RResolution Handler", "Selected folder: " + bestRes.folder);
if (!silent) {
Gdx.app.debug("RResolution Handler", "Finding best match for resolution: " + width + "x" + height + " for file: " + fileName);
Gdx.app.debug("RResolution Handler", "Selected folder: " + bestRes.folder);
}
FileHandle resSpecificFile = resolver.resolve(bestRes.folder + "/" + fileName);
if (!resSpecificFile.exists()) resSpecificFile = resolver.resolve(fileName);
return resSpecificFile;

2
desktop/src/zero1hd/rhythmbullet/desktop/DesktopLauncher.java
View File

@ -3,8 +3,6 @@ package zero1hd.rhythmbullet.desktop;
import com.badlogic.gdx.backends.lwjgl.LwjglApplication;
import com.badlogic.gdx.backends.lwjgl.LwjglApplicationConfiguration;
import zero1hd.rhythmbullet.RhythmBullet;
public class DesktopLauncher {
public static void main (String[] arg) {
LwjglApplicationConfiguration config = new LwjglApplicationConfiguration();

4
core/src/zero1hd/rhythmbullet/RhythmBullet.java → desktop/src/zero1hd/rhythmbullet/desktop/RhythmBullet.java
View File

@ -1,4 +1,4 @@
package zero1hd.rhythmbullet;
package zero1hd.rhythmbullet.desktop;
import java.util.logging.Level;
import java.util.logging.Logger;
@ -34,7 +34,7 @@ import com.badlogic.gdx.scenes.scene2d.ui.TextButton.TextButtonStyle;
import com.badlogic.gdx.scenes.scene2d.ui.TextField.TextFieldStyle;
import com.badlogic.gdx.scenes.scene2d.ui.Window.WindowStyle;
import zero1hd.rhythmbullet.screens.LoadingScreen;
import zero1hd.rhythmbullet.desktop.screens.LoadingScreen;
import zero1hd.rhythmbullet.util.GenericFileTypeHandler;
import zero1hd.rhythmbullet.util.RoundingResolutionHandler;
import zero1hd.rhythmbullet.util.TransitionAdapter;

42
core/src/zero1hd/rhythmbullet/audio/Mp3Manager.java → desktop/src/zero1hd/rhythmbullet/desktop/audio/Mp3Manager.java
View File

@ -1,14 +1,15 @@
package zero1hd.rhythmbullet.audio;
package zero1hd.rhythmbullet.desktop.audio;
import java.io.IOException;
import java.util.Map;
import javax.sound.sampled.AudioFileFormat;
import javax.sound.sampled.AudioFormat;
import javax.sound.sampled.AudioInputStream;
import javax.sound.sampled.AudioSystem;
import javax.sound.sampled.UnsupportedAudioFileException;
import org.tritonus.share.sampled.TAudioFormat;
import org.tritonus.share.sampled.file.TAudioFileFormat;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.audio.Music;
@ -17,6 +18,7 @@ import com.badlogic.gdx.files.FileHandle;
import com.badlogic.gdx.math.MathUtils;
import zero1hd.rhythmbullet.audio.wavedecoder.AudioSampleReader;
import zero1hd.rhythmbullet.util.MusicManager;
public class Mp3Manager implements MusicManager {
@ -24,30 +26,41 @@ public class Mp3Manager implements MusicManager {
private Music music;
private int playbackIndex, readIndex;
private FileHandle fileHandle;
AudioInputStream in;
private AudioInputStream in;
private AudioInputStream ais;
private AudioFormat af;
private AudioSampleReader d;
private Map<String, Object> properties;
public Mp3Manager(FileHandle file) {
this.fileHandle = file;
try {
in = AudioSystem.getAudioInputStream(file.file());
AudioFormat baseFormat = in.getFormat();
properties = ((TAudioFormat)baseFormat).properties();
af = new AudioFormat(
af = new AudioFormat(
AudioFormat.Encoding.PCM_SIGNED,
baseFormat.getSampleRate(),
16, baseFormat.getChannels(),
baseFormat.getChannels()*2,
baseFormat.getSampleRate(), false);
ais = AudioSystem.getAudioInputStream(baseFormat, in);
ais = AudioSystem.getAudioInputStream(af, in);
d = new AudioSampleReader(ais);
music = Gdx.audio.newMusic(file);
} catch (IOException | UnsupportedAudioFileException e) {
e.printStackTrace();
}
try {
// TAudioFileFormat properties
AudioFileFormat baseFileFormat = AudioSystem.getAudioFileFormat(file.file());
if (baseFileFormat instanceof TAudioFileFormat) {
properties = ((TAudioFileFormat)baseFileFormat).properties();
}
} catch (UnsupportedAudioFileException | IOException e) {
e.printStackTrace();
}
Gdx.app.debug("Property Count", String.valueOf(properties.size()));
}
@Override
@ -63,14 +76,19 @@ public class Mp3Manager implements MusicManager {
@Override
public void playbackIndexUpdate() {
playbackIndex = (int) ((getDuration()*getSampleRate())/getReadWindowSize());
playbackIndex = (int) ((getPositionInSeconds()*getSampleRate())/getReadWindowSize());
}
@Override
public int getPlaybackIndexPosition() {
return playbackIndex;
}
@Override
public int getReadIndex() {
return readIndex;
}
@Override
public int getReadWindowSize() {
return readWindowSize;
@ -184,15 +202,9 @@ public class Mp3Manager implements MusicManager {
seek(MathUtils.round(((Integer) properties.get("audio.length.bytes")).intValue() * (getPositionInSeconds()/getDuration())));
}
@Override
public int getReadIndex() {
return readIndex;
}
public void skip(long bytes) {
long totalSkipped = 0;
long skipped = 0;
while (totalSkipped < bytes) {
try {
skipped = ais.skip(bytes-totalSkipped);

4
core/src/zero1hd/rhythmbullet/audio/MusicInfoController.java → desktop/src/zero1hd/rhythmbullet/desktop/audio/MusicInfoController.java
View File

@ -1,4 +1,4 @@
package zero1hd.rhythmbullet.audio;
package zero1hd.rhythmbullet.desktop.audio;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
@ -8,6 +8,8 @@ import com.badlogic.gdx.Preferences;
import com.badlogic.gdx.utils.Array;
import com.badlogic.gdx.utils.Disposable;
import zero1hd.rhythmbullet.audio.MusicInfo;
public class MusicInfoController implements Disposable {
private MusicList musicList;
private ExecutorService exec;

3
core/src/zero1hd/rhythmbullet/audio/MusicList.java → desktop/src/zero1hd/rhythmbullet/desktop/audio/MusicList.java
View File

@ -1,4 +1,4 @@
package zero1hd.rhythmbullet.audio;
package zero1hd.rhythmbullet.desktop.audio;
import java.util.Observable;
import java.util.concurrent.ExecutorService;
@ -10,6 +10,7 @@ import com.badlogic.gdx.utils.Array;
import com.badlogic.gdx.utils.Sort;
import zero1hd.rhythmbullet.util.FileHandleAlphabeticalComparator;
import zero1hd.rhythmbullet.util.MusicManager;
public class MusicList extends Observable {
private Array<FileHandle> musicList;

4
core/src/zero1hd/rhythmbullet/audio/MusicListController.java → desktop/src/zero1hd/rhythmbullet/desktop/audio/MusicListController.java
View File

@ -1,4 +1,4 @@
package zero1hd.rhythmbullet.audio;
package zero1hd.rhythmbullet.desktop.audio;
import java.util.Observable;
import java.util.Observer;
@ -9,6 +9,8 @@ import com.badlogic.gdx.Preferences;
import com.badlogic.gdx.audio.Music;
import com.badlogic.gdx.audio.Music.OnCompletionListener;
import zero1hd.rhythmbullet.util.MusicManager;
public class MusicListController extends Observable implements OnCompletionListener, Observer {
private MusicList musicList;
private MusicManager mm;

3
core/src/zero1hd/rhythmbullet/audio/WAVManager.java → desktop/src/zero1hd/rhythmbullet/desktop/audio/WAVManager.java
View File

@ -1,4 +1,4 @@
package zero1hd.rhythmbullet.audio;
package zero1hd.rhythmbullet.desktop.audio;
import java.io.IOException;
@ -14,6 +14,7 @@ import com.badlogic.gdx.files.FileHandle;
import com.badlogic.gdx.math.MathUtils;
import zero1hd.rhythmbullet.audio.wavedecoder.AudioSampleReader;
import zero1hd.rhythmbullet.util.MusicManager;
public class WAVManager implements MusicManager {
private int readWindowSize = 1024;

10
core/src/zero1hd/rhythmbullet/audio/map/EntitySpawnInfo.java → desktop/src/zero1hd/rhythmbullet/desktop/audio/map/EntitySpawnInfo.java
View File

@ -1,11 +1,11 @@
package zero1hd.rhythmbullet.audio.map;
package zero1hd.rhythmbullet.desktop.audio.map;
import java.util.HashMap;
import zero1hd.rhythmbullet.entity.Entity;
import zero1hd.rhythmbullet.entity.EntityFrame;
import zero1hd.rhythmbullet.entity.coordinator.Coordinator;
import zero1hd.rhythmbullet.entity.coordinator.CoordinatorFrame;
import zero1hd.rhythmbullet.desktop.entity.Entity;
import zero1hd.rhythmbullet.desktop.entity.EntityFrame;
import zero1hd.rhythmbullet.desktop.entity.coordinator.Coordinator;
import zero1hd.rhythmbullet.desktop.entity.coordinator.CoordinatorFrame;
public class EntitySpawnInfo {
private EntityFrame<? extends Entity> entityToSpawn;

12
core/src/zero1hd/rhythmbullet/audio/map/GamePlayMap.java → desktop/src/zero1hd/rhythmbullet/desktop/audio/map/GamePlayMap.java
View File

@ -1,10 +1,10 @@
package zero1hd.rhythmbullet.audio.map;
package zero1hd.rhythmbullet.desktop.audio.map;
import zero1hd.rhythmbullet.audio.MusicManager;
import zero1hd.rhythmbullet.entity.Entity;
import zero1hd.rhythmbullet.entity.EntityFrame;
import zero1hd.rhythmbullet.entity.coordinator.Coordinator;
import zero1hd.rhythmbullet.entity.coordinator.CoordinatorFrame;
import zero1hd.rhythmbullet.desktop.entity.Entity;
import zero1hd.rhythmbullet.desktop.entity.EntityFrame;
import zero1hd.rhythmbullet.desktop.entity.coordinator.Coordinator;
import zero1hd.rhythmbullet.desktop.entity.coordinator.CoordinatorFrame;
import zero1hd.rhythmbullet.util.MusicManager;
public class GamePlayMap {
private MusicManager musicData;

2
core/src/zero1hd/rhythmbullet/audio/map/MapWindowData.java → desktop/src/zero1hd/rhythmbullet/desktop/audio/map/MapWindowData.java
View File

@ -1,4 +1,4 @@
package zero1hd.rhythmbullet.audio.map;
package zero1hd.rhythmbullet.desktop.audio.map;
import com.badlogic.gdx.utils.Array;

8
core/src/zero1hd/rhythmbullet/audio/map/RhythmMapAlgorithm.java → desktop/src/zero1hd/rhythmbullet/desktop/audio/map/RhythmMapAlgorithm.java
View File

@ -1,14 +1,14 @@
package zero1hd.rhythmbullet.audio.map;
package zero1hd.rhythmbullet.desktop.audio.map;
import org.apache.commons.math3.random.MersenneTwister;
import com.badlogic.gdx.math.MathUtils;
import com.badlogic.gdx.utils.FloatArray;
import zero1hd.rhythmbullet.RhythmBullet;
import zero1hd.rhythmbullet.audio.AudioDataPackage;
import zero1hd.rhythmbullet.entity.EntityManager;
import zero1hd.rhythmbullet.entity.coordinator.CoordinatorManager;
import zero1hd.rhythmbullet.desktop.RhythmBullet;
import zero1hd.rhythmbullet.desktop.entity.EntityManager;
import zero1hd.rhythmbullet.desktop.entity.coordinator.CoordinatorManager;
import zero1hd.rhythmbullet.util.MiniEvents;
import zero1hd.rhythmbullet.util.MiniSender;

4
core/src/zero1hd/rhythmbullet/entity/CollisionDetector.java → desktop/src/zero1hd/rhythmbullet/desktop/entity/CollisionDetector.java
View File

@ -1,4 +1,4 @@
package zero1hd.rhythmbullet.entity;
package zero1hd.rhythmbullet.desktop.entity;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.Preferences;
@ -10,7 +10,7 @@ import com.badlogic.gdx.graphics.g2d.ParticleEffectPool;
import com.badlogic.gdx.graphics.g2d.ParticleEffectPool.PooledEffect;
import com.badlogic.gdx.utils.Array;
import zero1hd.rhythmbullet.RhythmBullet;
import zero1hd.rhythmbullet.desktop.RhythmBullet;
public class CollisionDetector {
Array<Entity> enemies;

6
core/src/zero1hd/rhythmbullet/entity/Entity.java → desktop/src/zero1hd/rhythmbullet/desktop/entity/Entity.java
View File

@ -1,4 +1,4 @@
package zero1hd.rhythmbullet.entity;
package zero1hd.rhythmbullet.desktop.entity;
import java.util.HashMap;
@ -13,8 +13,8 @@ import com.badlogic.gdx.math.Vector2;
import com.badlogic.gdx.scenes.scene2d.Actor;
import com.badlogic.gdx.utils.Pool.Poolable;
import zero1hd.rhythmbullet.RhythmBullet;
import zero1hd.rhythmbullet.entity.coordinator.Coordinator;
import zero1hd.rhythmbullet.desktop.RhythmBullet;
import zero1hd.rhythmbullet.desktop.entity.coordinator.Coordinator;
public class Entity extends Actor implements Poolable {
private Coordinator coordinator;

2
core/src/zero1hd/rhythmbullet/entity/EntityFrame.java → desktop/src/zero1hd/rhythmbullet/desktop/entity/EntityFrame.java
View File

@ -1,4 +1,4 @@
package zero1hd.rhythmbullet.entity;
package zero1hd.rhythmbullet.desktop.entity;
import com.badlogic.gdx.utils.Pool;

12
core/src/zero1hd/rhythmbullet/entity/EntityManager.java → desktop/src/zero1hd/rhythmbullet/desktop/entity/EntityManager.java
View File

@ -1,15 +1,15 @@
package zero1hd.rhythmbullet.entity;
package zero1hd.rhythmbullet.desktop.entity;
import com.badlogic.gdx.Preferences;
import com.badlogic.gdx.assets.AssetManager;
import com.badlogic.gdx.scenes.scene2d.Stage;
import com.badlogic.gdx.utils.Array;
import zero1hd.rhythmbullet.entity.ally.Laser;
import zero1hd.rhythmbullet.entity.enemies.Flake;
import zero1hd.rhythmbullet.entity.enemies.Pellet;
import zero1hd.rhythmbullet.entity.enemies.Shard;
import zero1hd.rhythmbullet.entity.enemies.VoidCircle;
import zero1hd.rhythmbullet.desktop.entity.ally.Laser;
import zero1hd.rhythmbullet.desktop.entity.enemies.Flake;
import zero1hd.rhythmbullet.desktop.entity.enemies.Pellet;
import zero1hd.rhythmbullet.desktop.entity.enemies.Shard;
import zero1hd.rhythmbullet.desktop.entity.enemies.VoidCircle;
public class EntityManager {
private AssetManager assets;

6
core/src/zero1hd/rhythmbullet/entity/ally/Laser.java → desktop/src/zero1hd/rhythmbullet/desktop/entity/ally/Laser.java
View File

@ -1,4 +1,4 @@
package zero1hd.rhythmbullet.entity.ally;
package zero1hd.rhythmbullet.desktop.entity.ally;
import java.util.HashMap;
@ -7,8 +7,8 @@ import com.badlogic.gdx.graphics.Texture;
import com.badlogic.gdx.graphics.g2d.Batch;
import com.badlogic.gdx.graphics.g2d.Sprite;
import zero1hd.rhythmbullet.RhythmBullet;
import zero1hd.rhythmbullet.entity.Entity;
import zero1hd.rhythmbullet.desktop.RhythmBullet;
import zero1hd.rhythmbullet.desktop.entity.Entity;
public class Laser extends Entity {
Sound sfx;

6
core/src/zero1hd/rhythmbullet/entity/ally/PolyjetEntity.java → desktop/src/zero1hd/rhythmbullet/desktop/entity/ally/PolyjetEntity.java
View File

@ -1,4 +1,4 @@
package zero1hd.rhythmbullet.entity.ally;
package zero1hd.rhythmbullet.desktop.entity.ally;
import com.badlogic.gdx.assets.AssetManager;
import com.badlogic.gdx.graphics.Texture;
@ -7,8 +7,8 @@ import com.badlogic.gdx.graphics.g2d.ParticleEffect;
import com.badlogic.gdx.math.Rectangle;
import com.badlogic.gdx.scenes.scene2d.actions.Actions;
import zero1hd.rhythmbullet.RhythmBullet;
import zero1hd.rhythmbullet.entity.Entity;
import zero1hd.rhythmbullet.desktop.RhythmBullet;
import zero1hd.rhythmbullet.desktop.entity.Entity;
public class PolyjetEntity extends Entity {
public float health;

6
core/src/zero1hd/rhythmbullet/entity/coordinator/Coordinator.java → desktop/src/zero1hd/rhythmbullet/desktop/entity/coordinator/Coordinator.java
View File

@ -1,9 +1,9 @@
package zero1hd.rhythmbullet.entity.coordinator;
package zero1hd.rhythmbullet.desktop.entity.coordinator;
import com.badlogic.gdx.utils.Pool.Poolable;
import zero1hd.rhythmbullet.entity.Entity;
import zero1hd.rhythmbullet.entity.EntityManager;
import zero1hd.rhythmbullet.desktop.entity.Entity;
import zero1hd.rhythmbullet.desktop.entity.EntityManager;
public class Coordinator implements Poolable {
private CoordinatorFrame<? extends Coordinator> cf;

4
core/src/zero1hd/rhythmbullet/entity/coordinator/CoordinatorFrame.java → desktop/src/zero1hd/rhythmbullet/desktop/entity/coordinator/CoordinatorFrame.java
View File

@ -1,8 +1,8 @@
package zero1hd.rhythmbullet.entity.coordinator;
package zero1hd.rhythmbullet.desktop.entity.coordinator;
import com.badlogic.gdx.utils.Pool;
import zero1hd.rhythmbullet.entity.EntityManager;
import zero1hd.rhythmbullet.desktop.entity.EntityManager;
public class CoordinatorFrame<T extends Coordinator> {
private Pool<T> pool;

4
core/src/zero1hd/rhythmbullet/entity/coordinator/CoordinatorManager.java → desktop/src/zero1hd/rhythmbullet/desktop/entity/coordinator/CoordinatorManager.java
View File

@ -1,6 +1,6 @@
package zero1hd.rhythmbullet.entity.coordinator;
package zero1hd.rhythmbullet.desktop.entity.coordinator;
import zero1hd.rhythmbullet.entity.EntityManager;
import zero1hd.rhythmbullet.desktop.entity.EntityManager;
public class CoordinatorManager {
private EntityManager em;

2
core/src/zero1hd/rhythmbullet/entity/coordinator/SlowLeftCoordinator.java → desktop/src/zero1hd/rhythmbullet/desktop/entity/coordinator/SlowLeftCoordinator.java
View File

@ -1,4 +1,4 @@
package zero1hd.rhythmbullet.entity.coordinator;
package zero1hd.rhythmbullet.desktop.entity.coordinator;
public class SlowLeftCoordinator extends Coordinator {
@Override

2
core/src/zero1hd/rhythmbullet/entity/coordinator/SlowRightCoordinator.java → desktop/src/zero1hd/rhythmbullet/desktop/entity/coordinator/SlowRightCoordinator.java
View File

@ -1,4 +1,4 @@
package zero1hd.rhythmbullet.entity.coordinator;
package zero1hd.rhythmbullet.desktop.entity.coordinator;
public class SlowRightCoordinator extends Coordinator {
@Override

6
core/src/zero1hd/rhythmbullet/entity/enemies/Flake.java → desktop/src/zero1hd/rhythmbullet/desktop/entity/enemies/Flake.java
View File

@ -1,4 +1,4 @@
package zero1hd.rhythmbullet.entity.enemies;
package zero1hd.rhythmbullet.desktop.entity.enemies;
import java.util.HashMap;
@ -7,8 +7,8 @@ import com.badlogic.gdx.graphics.g2d.Batch;
import com.badlogic.gdx.graphics.g2d.Sprite;
import com.badlogic.gdx.math.Rectangle;
import zero1hd.rhythmbullet.entity.Entity;
import zero1hd.rhythmbullet.entity.ally.Laser;
import zero1hd.rhythmbullet.desktop.entity.Entity;
import zero1hd.rhythmbullet.desktop.entity.ally.Laser;
public class Flake extends Entity {
private float timer;

4
core/src/zero1hd/rhythmbullet/entity/enemies/Pellet.java → desktop/src/zero1hd/rhythmbullet/desktop/entity/enemies/Pellet.java
View File

@ -1,4 +1,4 @@
package zero1hd.rhythmbullet.entity.enemies;
package zero1hd.rhythmbullet.desktop.entity.enemies;
import java.util.HashMap;
@ -6,7 +6,7 @@ import com.badlogic.gdx.graphics.Texture;
import com.badlogic.gdx.graphics.g2d.Sprite;
import com.badlogic.gdx.utils.Pool.Poolable;
import zero1hd.rhythmbullet.entity.Entity;
import zero1hd.rhythmbullet.desktop.entity.Entity;
public class Pellet extends Entity implements Poolable {

6
core/src/zero1hd/rhythmbullet/entity/enemies/Shard.java → desktop/src/zero1hd/rhythmbullet/desktop/entity/enemies/Shard.java
View File

@ -1,4 +1,4 @@
package zero1hd.rhythmbullet.entity.enemies;
package zero1hd.rhythmbullet.desktop.entity.enemies;
import java.util.HashMap;
@ -7,8 +7,8 @@ import com.badlogic.gdx.graphics.g2d.Batch;
import com.badlogic.gdx.graphics.g2d.Sprite;
import com.badlogic.gdx.math.Rectangle;
import zero1hd.rhythmbullet.entity.Entity;
import zero1hd.rhythmbullet.entity.ally.Laser;
import zero1hd.rhythmbullet.desktop.entity.Entity;
import zero1hd.rhythmbullet.desktop.entity.ally.Laser;
public class Shard extends Entity {
private int hp;

4
core/src/zero1hd/rhythmbullet/entity/enemies/VoidCircle.java → desktop/src/zero1hd/rhythmbullet/desktop/entity/enemies/VoidCircle.java
View File

@ -1,4 +1,4 @@
package zero1hd.rhythmbullet.entity.enemies;
package zero1hd.rhythmbullet.desktop.entity.enemies;
import java.util.HashMap;
@ -7,7 +7,7 @@ import com.badlogic.gdx.graphics.Texture;
import com.badlogic.gdx.graphics.g2d.Batch;
import com.badlogic.gdx.graphics.g2d.Sprite;
import zero1hd.rhythmbullet.entity.Entity;
import zero1hd.rhythmbullet.desktop.entity.Entity;
public class VoidCircle extends Entity {
private float timer;

4
core/src/zero1hd/rhythmbullet/graphics/ui/components/AudioGraph.java → desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/components/AudioGraph.java
View File

@ -1,4 +1,4 @@
package zero1hd.rhythmbullet.graphics.ui.components;
package zero1hd.rhythmbullet.desktop.graphics.ui.components;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.Input.Keys;
@ -9,7 +9,7 @@ import com.badlogic.gdx.math.MathUtils;
import com.badlogic.gdx.scenes.scene2d.Actor;
import com.badlogic.gdx.utils.FloatArray;
import zero1hd.rhythmbullet.audio.MusicManager;
import zero1hd.rhythmbullet.util.MusicManager;
public class AudioGraph extends Actor {
private MusicManager audioData;

4
core/src/zero1hd/rhythmbullet/graphics/ui/components/AudioGraphRelation.java → desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/components/AudioGraphRelation.java
View File

@ -1,4 +1,4 @@
package zero1hd.rhythmbullet.graphics.ui.components;
package zero1hd.rhythmbullet.desktop.graphics.ui.components;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.Input.Keys;
@ -9,7 +9,7 @@ import com.badlogic.gdx.math.MathUtils;
import com.badlogic.gdx.scenes.scene2d.Actor;
import com.badlogic.gdx.utils.FloatArray;
import zero1hd.rhythmbullet.audio.MusicManager;
import zero1hd.rhythmbullet.util.MusicManager;
public class AudioGraphRelation extends Actor {
private MusicManager audioData;

2
core/src/zero1hd/rhythmbullet/graphics/ui/components/ControlOptions.java → desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/components/ControlOptions.java
View File

@ -1,4 +1,4 @@
package zero1hd.rhythmbullet.graphics.ui.components;
package zero1hd.rhythmbullet.desktop.graphics.ui.components;
import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.scenes.scene2d.Actor;

6
core/src/zero1hd/rhythmbullet/graphics/ui/components/GraphicsOptions.java → desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/components/GraphicsOptions.java
View File

@ -1,4 +1,4 @@
package zero1hd.rhythmbullet.graphics.ui.components;
package zero1hd.rhythmbullet.desktop.graphics.ui.components;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.Preferences;
@ -11,7 +11,7 @@ import com.badlogic.gdx.scenes.scene2d.ui.TextButton;
import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
import com.badlogic.gdx.utils.Align;
import zero1hd.rhythmbullet.screens.MainMenu;
import zero1hd.rhythmbullet.desktop.screens.MainMenu;
public class GraphicsOptions extends Table {
private Label resolutions, shaders;
@ -28,7 +28,7 @@ public class GraphicsOptions extends Table {
_1366x768;
public GraphicsOptions(MainMenu mainMenu, Skin skin, Preferences prefs) {
public GraphicsOptions(final MainMenu mainMenu, Skin skin, final Preferences prefs) {
align(Align.center);
defaults().space(10f);
this.prefs = prefs;

4
core/src/zero1hd/rhythmbullet/graphics/ui/components/HealthBar.java → desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/components/HealthBar.java
View File

@ -1,4 +1,4 @@
package zero1hd.rhythmbullet.graphics.ui.components;
package zero1hd.rhythmbullet.desktop.graphics.ui.components;
import com.badlogic.gdx.math.MathUtils;
import com.badlogic.gdx.scenes.scene2d.actions.Actions;
@ -6,7 +6,7 @@ import com.badlogic.gdx.scenes.scene2d.ui.Image;
import com.badlogic.gdx.scenes.scene2d.ui.Skin;
import com.badlogic.gdx.scenes.scene2d.ui.WidgetGroup;
import zero1hd.rhythmbullet.entity.ally.PolyjetEntity;
import zero1hd.rhythmbullet.desktop.entity.ally.PolyjetEntity;
public class HealthBar extends WidgetGroup {
Image empty;

2
core/src/zero1hd/rhythmbullet/graphics/ui/components/KeyBindButton.java → desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/components/KeyBindButton.java
View File

@ -1,4 +1,4 @@
package zero1hd.rhythmbullet.graphics.ui.components;
package zero1hd.rhythmbullet.desktop.graphics.ui.components;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.Input.Keys;

6
core/src/zero1hd/rhythmbullet/graphics/ui/components/MusicControls.java → desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/components/MusicControls.java
View File

@ -1,4 +1,4 @@
package zero1hd.rhythmbullet.graphics.ui.components;
package zero1hd.rhythmbullet.desktop.graphics.ui.components;
import com.badlogic.gdx.scenes.scene2d.Actor;
import com.badlogic.gdx.scenes.scene2d.ui.CheckBox;
@ -7,13 +7,13 @@ import com.badlogic.gdx.scenes.scene2d.ui.ImageButton;
import com.badlogic.gdx.scenes.scene2d.ui.Skin;
import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
import zero1hd.rhythmbullet.audio.MusicListController;
import zero1hd.rhythmbullet.desktop.audio.MusicListController;
public class MusicControls extends HorizontalGroup {
private ImageButton reverse, forward;
private CheckBox shuffle, play;
private float disableTimer;
public MusicControls(Skin skin, MusicListController sc) {
public MusicControls(Skin skin, final MusicListController sc) {
reverse = new ImageButton(skin, "rewind-button");
reverse.addListener(new ChangeListener() {
@Override

4
core/src/zero1hd/rhythmbullet/graphics/ui/components/MusicSelectable.java → desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/components/MusicSelectable.java
View File

@ -1,4 +1,4 @@
package zero1hd.rhythmbullet.graphics.ui.components;
package zero1hd.rhythmbullet.desktop.graphics.ui.components;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.files.FileHandle;
@ -12,7 +12,7 @@ import com.badlogic.gdx.scenes.scene2d.utils.ClickListener;
import com.badlogic.gdx.utils.Disposable;
import zero1hd.rhythmbullet.audio.MusicInfo;
import zero1hd.rhythmbullet.graphics.ui.pages.MusicSelectionPage;
import zero1hd.rhythmbullet.desktop.graphics.ui.pages.MusicSelectionPage;
public class MusicSelectable extends WidgetGroup implements Disposable {
private Table table;

2
core/src/zero1hd/rhythmbullet/graphics/ui/components/ResolutionButton.java → desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/components/ResolutionButton.java
View File

@ -1,4 +1,4 @@
package zero1hd.rhythmbullet.graphics.ui.components;
package zero1hd.rhythmbullet.desktop.graphics.ui.components;
import java.awt.Dimension;
import java.awt.Toolkit;

2
core/src/zero1hd/rhythmbullet/graphics/ui/components/ScrollText.java → desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/components/ScrollText.java
View File

@ -1,4 +1,4 @@
package zero1hd.rhythmbullet.graphics.ui.components;
package zero1hd.rhythmbullet.desktop.graphics.ui.components;
import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.graphics.g2d.Batch;

2
core/src/zero1hd/rhythmbullet/graphics/ui/components/ShortenedTextLabel.java → desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/components/ShortenedTextLabel.java
View File

@ -1,4 +1,4 @@
package zero1hd.rhythmbullet.graphics.ui.components;
package zero1hd.rhythmbullet.desktop.graphics.ui.components;
import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.graphics.g2d.BitmapFont;

2
core/src/zero1hd/rhythmbullet/graphics/ui/components/TitleBarVisualizer.java → desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/components/TitleBarVisualizer.java
View File

@ -1,4 +1,4 @@
package zero1hd.rhythmbullet.graphics.ui.components;
package zero1hd.rhythmbullet.desktop.graphics.ui.components;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.assets.AssetManager;

4
core/src/zero1hd/rhythmbullet/graphics/ui/components/Visualizer.java → desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/components/Visualizer.java
View File

@ -1,4 +1,4 @@
package zero1hd.rhythmbullet.graphics.ui.components;
package zero1hd.rhythmbullet.desktop.graphics.ui.components;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.graphics.Color;
@ -6,8 +6,8 @@ import com.badlogic.gdx.graphics.g2d.Batch;
import com.badlogic.gdx.scenes.scene2d.ui.Widget;
import com.badlogic.gdx.utils.Disposable;
import zero1hd.rhythmbullet.audio.MusicManager;
import zero1hd.rhythmbullet.audio.visualizer.BasicVisualizer;
import zero1hd.rhythmbullet.util.MusicManager;
public class Visualizer extends Widget implements Disposable {
private BasicVisualizer vis;

4
core/src/zero1hd/rhythmbullet/graphics/ui/pages/AnalysisPage.java → desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/pages/AnalysisPage.java
View File

@ -1,4 +1,4 @@
package zero1hd.rhythmbullet.graphics.ui.pages;
package zero1hd.rhythmbullet.desktop.graphics.ui.pages;
import com.badlogic.gdx.assets.AssetManager;
import com.badlogic.gdx.graphics.g2d.TextureAtlas;
@ -10,8 +10,8 @@ import com.badlogic.gdx.scenes.scene2d.ui.Table;
import com.badlogic.gdx.scenes.scene2d.ui.TextButton;
import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
import zero1hd.rhythmbullet.audio.MusicManager;
import zero1hd.rhythmbullet.audio.analyzer.AudioAnalyzer;
import zero1hd.rhythmbullet.util.MusicManager;
public class AnalysisPage extends Page {
private boolean confirmed;

2
core/src/zero1hd/rhythmbullet/graphics/ui/pages/CreditsPage.java → desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/pages/CreditsPage.java
View File

@ -1,4 +1,4 @@
package zero1hd.rhythmbullet.graphics.ui.pages;
package zero1hd.rhythmbullet.desktop.graphics.ui.pages;
import com.badlogic.gdx.scenes.scene2d.ui.Label;
import com.badlogic.gdx.scenes.scene2d.ui.Skin;

6
core/src/zero1hd/rhythmbullet/graphics/ui/pages/KeybindOptionsPage.java → desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/pages/KeybindOptionsPage.java
View File

@ -1,4 +1,4 @@
package zero1hd.rhythmbullet.graphics.ui.pages;
package zero1hd.rhythmbullet.desktop.graphics.ui.pages;
import com.badlogic.gdx.assets.AssetManager;
import com.badlogic.gdx.graphics.g2d.TextureAtlas;
@ -9,13 +9,13 @@ import com.badlogic.gdx.scenes.scene2d.ui.TextButton;
import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
import zero1hd.rhythmbullet.controls.KeyMap;
import zero1hd.rhythmbullet.graphics.ui.components.ControlOptions;
import zero1hd.rhythmbullet.desktop.graphics.ui.components.ControlOptions;
public class KeybindOptionsPage extends Page {
private ControlOptions controlTable;
private KeyMap keyMap;
private TextButton backButton;
public KeybindOptionsPage(Skin skin, AssetManager assets, Vector3 cameraPosition) {
public KeybindOptionsPage(Skin skin, AssetManager assets, final Vector3 cameraPosition) {
setTextureBackground(assets.get("gradients.atlas", TextureAtlas.class).findRegion("red-round"));
keyMap = new KeyMap(assets);
controlTable = new ControlOptions(skin, keyMap);

18
core/src/zero1hd/rhythmbullet/graphics/ui/pages/MainPage.java → desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/pages/MainPage.java
View File

@ -1,4 +1,4 @@
package zero1hd.rhythmbullet.graphics.ui.pages;
package zero1hd.rhythmbullet.desktop.graphics.ui.pages;
import java.util.Observable;
import java.util.Observer;
@ -14,13 +14,13 @@ import com.badlogic.gdx.scenes.scene2d.ui.TextButton;
import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
import com.badlogic.gdx.utils.Align;
import zero1hd.rhythmbullet.RhythmBullet;
import zero1hd.rhythmbullet.audio.MusicManager;
import zero1hd.rhythmbullet.audio.MusicListController;
import zero1hd.rhythmbullet.graphics.ui.components.MusicControls;
import zero1hd.rhythmbullet.graphics.ui.components.ScrollText;
import zero1hd.rhythmbullet.graphics.ui.components.TitleBarVisualizer;
import zero1hd.rhythmbullet.screens.MainMenu;
import zero1hd.rhythmbullet.desktop.RhythmBullet;
import zero1hd.rhythmbullet.desktop.audio.MusicListController;
import zero1hd.rhythmbullet.desktop.graphics.ui.components.MusicControls;
import zero1hd.rhythmbullet.desktop.graphics.ui.components.ScrollText;
import zero1hd.rhythmbullet.desktop.graphics.ui.components.TitleBarVisualizer;
import zero1hd.rhythmbullet.desktop.screens.MainMenu;
import zero1hd.rhythmbullet.util.MusicManager;
public class MainPage extends Page implements Observer {
private Label versionLabel;
@ -36,7 +36,7 @@ public class MainPage extends Page implements Observer {
private MainMenu mMenu;
private ScrollText scrollText;
public MainPage(RhythmBullet core, Vector3 targetPosition, MusicListController mlc, MainMenu mainMenu) {
public MainPage(RhythmBullet core, final Vector3 targetPosition, MusicListController mlc, final MainMenu mainMenu) {
this.mlc = mlc;
setTextureBackground(core.getAssetManager().get("gradients.atlas", TextureAtlas.class).findRegion("red-linear"));
this.mMenu = mainMenu;

14
core/src/zero1hd/rhythmbullet/graphics/ui/pages/MusicSelectionPage.java → desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/pages/MusicSelectionPage.java
View File

@ -1,4 +1,4 @@
package zero1hd.rhythmbullet.graphics.ui.pages;
package zero1hd.rhythmbullet.desktop.graphics.ui.pages;
import java.util.Observable;
import java.util.Observer;
@ -25,12 +25,12 @@ import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
import com.badlogic.gdx.scenes.scene2d.utils.TextureRegionDrawable;
import com.badlogic.gdx.utils.Array;
import zero1hd.rhythmbullet.audio.MusicManager;
import zero1hd.rhythmbullet.audio.MusicInfo;
import zero1hd.rhythmbullet.audio.MusicInfoController;
import zero1hd.rhythmbullet.audio.MusicListController;
import zero1hd.rhythmbullet.graphics.ui.components.MusicSelectable;
import zero1hd.rhythmbullet.graphics.ui.components.ScrollText;
import zero1hd.rhythmbullet.desktop.audio.MusicInfoController;
import zero1hd.rhythmbullet.desktop.audio.MusicListController;
import zero1hd.rhythmbullet.desktop.graphics.ui.components.MusicSelectable;
import zero1hd.rhythmbullet.desktop.graphics.ui.components.ScrollText;
import zero1hd.rhythmbullet.util.MusicManager;
public class MusicSelectionPage extends Page implements Observer {
Preferences musicFileAnnotation;
@ -65,7 +65,7 @@ public class MusicSelectionPage extends Page implements Observer {
private int uiSongInfoCount;
private float scrollTimer, scrollDelay = 0.2f, scrollDelMod, songSelectionTimer;
public MusicSelectionPage(Skin skin, MusicListController musicListController, AssetManager assetManager, Vector3 cameraTarget, AnalysisPage ap) {
public MusicSelectionPage(Skin skin, MusicListController musicListController, AssetManager assetManager, final Vector3 cameraTarget, final AnalysisPage ap) {
setTextureBackground(assetManager.get("gradients.atlas", TextureAtlas.class).findRegion("red-round"));
this.assets = assetManager;
this.skin = skin;

2
core/src/zero1hd/rhythmbullet/graphics/ui/pages/MusicStatusPage.java → desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/pages/MusicStatusPage.java
View File

@ -1,4 +1,4 @@
package zero1hd.rhythmbullet.graphics.ui.pages;
package zero1hd.rhythmbullet.desktop.graphics.ui.pages;
import com.badlogic.gdx.math.Vector3;
import com.badlogic.gdx.scenes.scene2d.Actor;

10
core/src/zero1hd/rhythmbullet/graphics/ui/pages/OptionsPage.java → desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/pages/OptionsPage.java
View File

@ -1,4 +1,4 @@
package zero1hd.rhythmbullet.graphics.ui.pages;
package zero1hd.rhythmbullet.desktop.graphics.ui.pages;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.graphics.g2d.TextureAtlas;
@ -14,8 +14,8 @@ import com.badlogic.gdx.scenes.scene2d.ui.TextButton;
import com.badlogic.gdx.scenes.scene2d.ui.TextField;
import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
import zero1hd.rhythmbullet.RhythmBullet;
import zero1hd.rhythmbullet.audio.MusicListController;
import zero1hd.rhythmbullet.desktop.RhythmBullet;
import zero1hd.rhythmbullet.desktop.audio.MusicListController;
public class OptionsPage extends Page {
Table optionsTable;
@ -24,7 +24,7 @@ public class OptionsPage extends Page {
private TextField directoryField;
private float musicSearchTimer;
public OptionsPage(RhythmBullet core, Vector3 targetPosition, KeybindOptionsPage moreOptionsPage, MusicListController sc) {
public OptionsPage(final RhythmBullet core, final Vector3 targetPosition, KeybindOptionsPage moreOptionsPage, final MusicListController sc) {
super("General", core.getDefaultSkin());
setTextureBackground(core.getAssetManager().get("gradients.atlas", TextureAtlas.class).findRegion("red-round"));
//Back button
@ -84,7 +84,7 @@ public class OptionsPage extends Page {
Label musicDirectoryLabel = new Label("Music Directory: ", core.getDefaultSkin());
optionsTable.add(musicDirectoryLabel);
Label songCount = new Label("Songs: " + sc.getMusicList().getTotal(), core.getDefaultSkin(), "sub-font", core.getDefaultSkin().getColor("default"));
final Label songCount = new Label("Songs: " + sc.getMusicList().getTotal(), core.getDefaultSkin(), "sub-font", core.getDefaultSkin().getColor("default"));
directoryField = new TextField(null, core.getDefaultSkin() ) {
@Override
public void act(float delta) {

2
core/src/zero1hd/rhythmbullet/graphics/ui/pages/Page.java → desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/pages/Page.java
View File

@ -1,4 +1,4 @@
package zero1hd.rhythmbullet.graphics.ui.pages;
package zero1hd.rhythmbullet.desktop.graphics.ui.pages;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.graphics.g2d.Batch;

2
core/src/zero1hd/rhythmbullet/graphics/ui/pages/StatPage.java → desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/pages/StatPage.java
View File

@ -1,4 +1,4 @@
package zero1hd.rhythmbullet.graphics.ui.pages;
package zero1hd.rhythmbullet.desktop.graphics.ui.pages;
import com.badlogic.gdx.scenes.scene2d.ui.Label;
import com.badlogic.gdx.scenes.scene2d.ui.Skin;

8
core/src/zero1hd/rhythmbullet/graphics/ui/pages/VideoOptionsPage.java → desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/pages/VideoOptionsPage.java
View File

@ -1,4 +1,4 @@
package zero1hd.rhythmbullet.graphics.ui.pages;
package zero1hd.rhythmbullet.desktop.graphics.ui.pages;
import com.badlogic.gdx.Preferences;
import com.badlogic.gdx.assets.AssetManager;
@ -10,15 +10,15 @@ import com.badlogic.gdx.scenes.scene2d.ui.Skin;
import com.badlogic.gdx.scenes.scene2d.ui.TextButton;
import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
import zero1hd.rhythmbullet.graphics.ui.components.GraphicsOptions;
import zero1hd.rhythmbullet.screens.MainMenu;
import zero1hd.rhythmbullet.desktop.graphics.ui.components.GraphicsOptions;
import zero1hd.rhythmbullet.desktop.screens.MainMenu;
public class VideoOptionsPage extends Page {
private ScrollPane scrollPane;
private GraphicsOptions graphicsTable;
private TextButton backButton;
public VideoOptionsPage(Skin skin, Preferences prefs, MainMenu menu, AssetManager assets) {
public VideoOptionsPage(Skin skin, Preferences prefs, final MainMenu menu, AssetManager assets) {
setTextureBackground(assets.get("gradients.atlas", TextureAtlas.class).findRegion("red-round"));
graphicsTable = new GraphicsOptions(menu, skin, prefs);
scrollPane = new ScrollPane(graphicsTable, skin);

4
core/src/zero1hd/rhythmbullet/graphics/ui/windows/BeatViewer.java → desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/windows/BeatViewer.java
View File

@ -1,4 +1,4 @@
package zero1hd.rhythmbullet.graphics.ui.windows;
package zero1hd.rhythmbullet.desktop.graphics.ui.windows;
import com.badlogic.gdx.graphics.Pixmap;
import com.badlogic.gdx.graphics.Pixmap.Format;
@ -10,7 +10,7 @@ import com.badlogic.gdx.scenes.scene2d.ui.WidgetGroup;
import com.badlogic.gdx.scenes.scene2d.ui.Window;
import zero1hd.rhythmbullet.audio.AudioDataPackage;
import zero1hd.rhythmbullet.audio.MusicManager;
import zero1hd.rhythmbullet.util.MusicManager;
public class BeatViewer extends Window {
Pixmap lights;

2
core/src/zero1hd/rhythmbullet/graphics/ui/windows/DifficultyWindow.java → desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/windows/DifficultyWindow.java
View File

@ -1,4 +1,4 @@
package zero1hd.rhythmbullet.graphics.ui.windows;
package zero1hd.rhythmbullet.desktop.graphics.ui.windows;
import com.badlogic.gdx.scenes.scene2d.Actor;
import com.badlogic.gdx.scenes.scene2d.ui.Label;

2
core/src/zero1hd/rhythmbullet/graphics/ui/windows/FPSWindow.java → desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/windows/FPSWindow.java
View File

@ -1,4 +1,4 @@
package zero1hd.rhythmbullet.graphics.ui.windows;
package zero1hd.rhythmbullet.desktop.graphics.ui.windows;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.scenes.scene2d.ui.Label;

2
core/src/zero1hd/rhythmbullet/graphics/ui/windows/LoadingWindow.java → desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/windows/LoadingWindow.java
View File

@ -1,4 +1,4 @@
package zero1hd.rhythmbullet.graphics.ui.windows;
package zero1hd.rhythmbullet.desktop.graphics.ui.windows;
import com.badlogic.gdx.assets.AssetManager;
import com.badlogic.gdx.audio.Sound;

2
core/src/zero1hd/rhythmbullet/graphics/ui/windows/NoticeWindow.java → desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/windows/NoticeWindow.java
View File

@ -1,4 +1,4 @@
package zero1hd.rhythmbullet.graphics.ui.windows;
package zero1hd.rhythmbullet.desktop.graphics.ui.windows;
import com.badlogic.gdx.assets.AssetManager;
import com.badlogic.gdx.audio.Sound;

2
core/src/zero1hd/rhythmbullet/graphics/ui/windows/PauseMenu.java → desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/windows/PauseMenu.java
View File

@ -1,4 +1,4 @@
package zero1hd.rhythmbullet.graphics.ui.windows;
package zero1hd.rhythmbullet.desktop.graphics.ui.windows;
import com.badlogic.gdx.scenes.scene2d.ui.Label;
import com.badlogic.gdx.scenes.scene2d.ui.Skin;

2
core/src/zero1hd/rhythmbullet/graphics/ui/windows/Spawnables.java → desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/windows/Spawnables.java
View File

@ -1,4 +1,4 @@
package zero1hd.rhythmbullet.graphics.ui.windows;
package zero1hd.rhythmbullet.desktop.graphics.ui.windows;
import com.badlogic.gdx.scenes.scene2d.ui.ScrollPane;
import com.badlogic.gdx.scenes.scene2d.ui.Skin;

24
core/src/zero1hd/rhythmbullet/graphics/ui/windows/SpawnerWindow.java → desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/windows/SpawnerWindow.java
View File

@ -1,4 +1,4 @@
package zero1hd.rhythmbullet.graphics.ui.windows;
package zero1hd.rhythmbullet.desktop.graphics.ui.windows;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.Input.Keys;
@ -11,17 +11,17 @@ import com.badlogic.gdx.scenes.scene2d.ui.Slider;
import com.badlogic.gdx.scenes.scene2d.ui.Window;
import com.badlogic.gdx.utils.Array;
import zero1hd.rhythmbullet.entity.Entity;
import zero1hd.rhythmbullet.entity.EntityFrame;
import zero1hd.rhythmbullet.entity.EntityManager;
import zero1hd.rhythmbullet.entity.ally.Laser;
import zero1hd.rhythmbullet.entity.coordinator.Coordinator;
import zero1hd.rhythmbullet.entity.coordinator.CoordinatorFrame;
import zero1hd.rhythmbullet.entity.coordinator.CoordinatorManager;
import zero1hd.rhythmbullet.entity.enemies.Flake;
import zero1hd.rhythmbullet.entity.enemies.Pellet;
import zero1hd.rhythmbullet.entity.enemies.Shard;
import zero1hd.rhythmbullet.entity.enemies.VoidCircle;
import zero1hd.rhythmbullet.desktop.entity.Entity;
import zero1hd.rhythmbullet.desktop.entity.EntityFrame;
import zero1hd.rhythmbullet.desktop.entity.EntityManager;
import zero1hd.rhythmbullet.desktop.entity.ally.Laser;
import zero1hd.rhythmbullet.desktop.entity.coordinator.Coordinator;
import zero1hd.rhythmbullet.desktop.entity.coordinator.CoordinatorFrame;
import zero1hd.rhythmbullet.desktop.entity.coordinator.CoordinatorManager;
import zero1hd.rhythmbullet.desktop.entity.enemies.Flake;
import zero1hd.rhythmbullet.desktop.entity.enemies.Pellet;
import zero1hd.rhythmbullet.desktop.entity.enemies.Shard;
import zero1hd.rhythmbullet.desktop.entity.enemies.VoidCircle;
public class SpawnerWindow extends Window {
private Stage stage;

4
core/src/zero1hd/rhythmbullet/graphics/ui/windows/VolumeWindow.java → desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/windows/VolumeWindow.java
View File

@ -1,4 +1,4 @@
package zero1hd.rhythmbullet.graphics.ui.windows;
package zero1hd.rhythmbullet.desktop.graphics.ui.windows;
import com.badlogic.gdx.Preferences;
import com.badlogic.gdx.math.MathUtils;
@ -9,7 +9,7 @@ import com.badlogic.gdx.scenes.scene2d.ui.Slider;
import com.badlogic.gdx.scenes.scene2d.ui.Window;
import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
import zero1hd.rhythmbullet.audio.MusicManager;
import zero1hd.rhythmbullet.util.MusicManager;
public class VolumeWindow extends Window {

2
core/src/zero1hd/rhythmbullet/screens/EndScreen.java → desktop/src/zero1hd/rhythmbullet/desktop/screens/EndScreen.java
View File

@ -1,4 +1,4 @@
package zero1hd.rhythmbullet.screens;
package zero1hd.rhythmbullet.desktop.screens;
import com.badlogic.gdx.ScreenAdapter;

12
core/src/zero1hd/rhythmbullet/screens/GameScreen.java → desktop/src/zero1hd/rhythmbullet/desktop/screens/GameScreen.java
View File

@ -1,4 +1,4 @@
package zero1hd.rhythmbullet.screens;
package zero1hd.rhythmbullet.desktop.screens;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.InputMultiplexer;
@ -16,11 +16,11 @@ import com.badlogic.gdx.scenes.scene2d.ui.ImageButton;
import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
import com.badlogic.gdx.utils.viewport.ScreenViewport;
import zero1hd.rhythmbullet.RhythmBullet;
import zero1hd.rhythmbullet.audio.MusicManager;
import zero1hd.rhythmbullet.audio.map.GamePlayMap;
import zero1hd.rhythmbullet.stages.GameHUD;
import zero1hd.rhythmbullet.stages.GamePlayArea;
import zero1hd.rhythmbullet.desktop.RhythmBullet;
import zero1hd.rhythmbullet.desktop.audio.map.GamePlayMap;
import zero1hd.rhythmbullet.desktop.stages.GameHUD;
import zero1hd.rhythmbullet.desktop.stages.GamePlayArea;
import zero1hd.rhythmbullet.util.MusicManager;
public class GameScreen extends ScreenAdapter {

4
core/src/zero1hd/rhythmbullet/screens/LoadingScreen.java → desktop/src/zero1hd/rhythmbullet/desktop/screens/LoadingScreen.java
View File

@ -1,4 +1,4 @@
package zero1hd.rhythmbullet.screens;
package zero1hd.rhythmbullet.desktop.screens;
import com.badlogic.gdx.ApplicationListener;
import com.badlogic.gdx.Gdx;
@ -11,7 +11,7 @@ import com.badlogic.gdx.scenes.scene2d.actions.Actions;
import com.badlogic.gdx.scenes.scene2d.ui.Image;
import com.badlogic.gdx.utils.viewport.ScreenViewport;
import zero1hd.rhythmbullet.RhythmBullet;
import zero1hd.rhythmbullet.desktop.RhythmBullet;
public class LoadingScreen extends ScreenAdapter implements ApplicationListener {
private Stage stage;

22
core/src/zero1hd/rhythmbullet/screens/MainMenu.java → desktop/src/zero1hd/rhythmbullet/desktop/screens/MainMenu.java
View File

@ -1,4 +1,4 @@
package zero1hd.rhythmbullet.screens;
package zero1hd.rhythmbullet.desktop.screens;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.Input.Keys;
@ -18,16 +18,16 @@ import com.badlogic.gdx.scenes.scene2d.Stage;
import com.badlogic.gdx.scenes.scene2d.utils.ClickListener;
import com.badlogic.gdx.utils.viewport.ScreenViewport;
import zero1hd.rhythmbullet.RhythmBullet;
import zero1hd.rhythmbullet.audio.MusicList;
import zero1hd.rhythmbullet.audio.MusicListController;
import zero1hd.rhythmbullet.graphics.ui.pages.AnalysisPage;
import zero1hd.rhythmbullet.graphics.ui.pages.CreditsPage;
import zero1hd.rhythmbullet.graphics.ui.pages.KeybindOptionsPage;
import zero1hd.rhythmbullet.graphics.ui.pages.MainPage;
import zero1hd.rhythmbullet.graphics.ui.pages.MusicSelectionPage;
import zero1hd.rhythmbullet.graphics.ui.pages.OptionsPage;
import zero1hd.rhythmbullet.graphics.ui.pages.VideoOptionsPage;
import zero1hd.rhythmbullet.desktop.RhythmBullet;
import zero1hd.rhythmbullet.desktop.audio.MusicList;
import zero1hd.rhythmbullet.desktop.audio.MusicListController;
import zero1hd.rhythmbullet.desktop.graphics.ui.pages.AnalysisPage;
import zero1hd.rhythmbullet.desktop.graphics.ui.pages.CreditsPage;
import zero1hd.rhythmbullet.desktop.graphics.ui.pages.KeybindOptionsPage;
import zero1hd.rhythmbullet.desktop.graphics.ui.pages.MainPage;
import zero1hd.rhythmbullet.desktop.graphics.ui.pages.MusicSelectionPage;
import zero1hd.rhythmbullet.desktop.graphics.ui.pages.OptionsPage;
import zero1hd.rhythmbullet.desktop.graphics.ui.pages.VideoOptionsPage;
import zero1hd.rhythmbullet.util.TransitionAdapter;
public class MainMenu extends ScreenAdapter implements TransitionAdapter {

12
core/src/zero1hd/rhythmbullet/stages/GameHUD.java → desktop/src/zero1hd/rhythmbullet/desktop/stages/GameHUD.java
View File

@ -1,4 +1,4 @@
package zero1hd.rhythmbullet.stages;
package zero1hd.rhythmbullet.desktop.stages;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.Input.Keys;
@ -17,11 +17,11 @@ import com.badlogic.gdx.scenes.scene2d.ui.Label;
import com.badlogic.gdx.scenes.scene2d.ui.Skin;
import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
import zero1hd.rhythmbullet.RhythmBullet;
import zero1hd.rhythmbullet.audio.MusicManager;
import zero1hd.rhythmbullet.graphics.ui.components.HealthBar;
import zero1hd.rhythmbullet.graphics.ui.windows.FPSWindow;
import zero1hd.rhythmbullet.graphics.ui.windows.PauseMenu;
import zero1hd.rhythmbullet.desktop.RhythmBullet;
import zero1hd.rhythmbullet.desktop.graphics.ui.components.HealthBar;
import zero1hd.rhythmbullet.desktop.graphics.ui.windows.FPSWindow;
import zero1hd.rhythmbullet.desktop.graphics.ui.windows.PauseMenu;
import zero1hd.rhythmbullet.util.MusicManager;
import zero1hd.rhythmbullet.util.ScoreManager;
public class GameHUD extends Stage {

22
core/src/zero1hd/rhythmbullet/stages/GamePlayArea.java → desktop/src/zero1hd/rhythmbullet/desktop/stages/GamePlayArea.java
View File

@ -1,4 +1,4 @@
package zero1hd.rhythmbullet.stages;
package zero1hd.rhythmbullet.desktop.stages;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.Preferences;
@ -6,17 +6,17 @@ import com.badlogic.gdx.assets.AssetManager;
import com.badlogic.gdx.scenes.scene2d.Stage;
import com.badlogic.gdx.utils.viewport.FitViewport;
import zero1hd.rhythmbullet.RhythmBullet;
import zero1hd.rhythmbullet.audio.map.EntitySpawnInfo;
import zero1hd.rhythmbullet.audio.map.GamePlayMap;
import zero1hd.rhythmbullet.audio.map.MapWindowData;
import zero1hd.rhythmbullet.controls.KeyMap;
import zero1hd.rhythmbullet.entity.CollisionDetector;
import zero1hd.rhythmbullet.entity.Entity;
import zero1hd.rhythmbullet.entity.EntityManager;
import zero1hd.rhythmbullet.entity.ally.Laser;
import zero1hd.rhythmbullet.entity.ally.PolyjetEntity;
import zero1hd.rhythmbullet.entity.coordinator.CoordinatorManager;
import zero1hd.rhythmbullet.desktop.RhythmBullet;
import zero1hd.rhythmbullet.desktop.audio.map.EntitySpawnInfo;
import zero1hd.rhythmbullet.desktop.audio.map.GamePlayMap;
import zero1hd.rhythmbullet.desktop.audio.map.MapWindowData;
import zero1hd.rhythmbullet.desktop.entity.CollisionDetector;
import zero1hd.rhythmbullet.desktop.entity.Entity;
import zero1hd.rhythmbullet.desktop.entity.EntityManager;
import zero1hd.rhythmbullet.desktop.entity.ally.Laser;
import zero1hd.rhythmbullet.desktop.entity.ally.PolyjetEntity;
import zero1hd.rhythmbullet.desktop.entity.coordinator.CoordinatorManager;
import zero1hd.rhythmbullet.util.ScoreManager;