diff --git a/android/assets/1280x720/void_circle.png b/android/assets/1280x720/void_circle.png index 7a8ab60..28a9e58 100755 Binary files a/android/assets/1280x720/void_circle.png and b/android/assets/1280x720/void_circle.png differ diff --git a/android/assets/1280x800/void_circle.png b/android/assets/1280x800/void_circle.png index 735a329..edca8e5 100755 Binary files a/android/assets/1280x800/void_circle.png and b/android/assets/1280x800/void_circle.png differ diff --git a/android/assets/1366x768/void_circle.png b/android/assets/1366x768/void_circle.png index c7b589c..eafeb24 100755 Binary files a/android/assets/1366x768/void_circle.png and b/android/assets/1366x768/void_circle.png differ diff --git a/android/assets/1920x1080/void_circle.png b/android/assets/1920x1080/void_circle.png index 54d2100..9dad9e7 100755 Binary files a/android/assets/1920x1080/void_circle.png and b/android/assets/1920x1080/void_circle.png differ diff --git a/android/assets/1920x1200/void_circle.png b/android/assets/1920x1200/void_circle.png index dfdff1f..c4a71c2 100755 Binary files a/android/assets/1920x1200/void_circle.png and b/android/assets/1920x1200/void_circle.png differ diff --git a/android/assets/2560x1440/void_circle.png b/android/assets/2560x1440/void_circle.png index b8f1a7b..b8ad109 100755 Binary files a/android/assets/2560x1440/void_circle.png and b/android/assets/2560x1440/void_circle.png differ diff --git a/android/assets/3840x2160/void_circle.png b/android/assets/3840x2160/void_circle.png index 90fb880..396d5f1 100755 Binary files a/android/assets/3840x2160/void_circle.png and b/android/assets/3840x2160/void_circle.png differ diff --git a/android/assets/800x480/void_circle.png b/android/assets/800x480/void_circle.png index 92c26db..291caa1 100755 Binary files a/android/assets/800x480/void_circle.png and b/android/assets/800x480/void_circle.png differ diff --git a/core/src/zero1hd/polyjet/Polyjet.java b/core/src/zero1hd/polyjet/Polyjet.java index 33846af..e0ff06c 100755 --- a/core/src/zero1hd/polyjet/Polyjet.java +++ b/core/src/zero1hd/polyjet/Polyjet.java @@ -129,7 +129,7 @@ public class Polyjet extends Game { assetManager.load("bar.png", Texture.class); assetManager.load("flake.png", Texture.class); assetManager.load("star_bg.png", Texture.class); -// assetManager.load(""); + assetManager.load("void_circle.png", Texture.class); } public void generateFonts() { initComplete = true; diff --git a/core/src/zero1hd/polyjet/audio/AudioAnalyzer.java b/core/src/zero1hd/polyjet/audio/AudioAnalyzer.java index 1381cd5..28749e1 100755 --- a/core/src/zero1hd/polyjet/audio/AudioAnalyzer.java +++ b/core/src/zero1hd/polyjet/audio/AudioAnalyzer.java @@ -56,7 +56,6 @@ public class AudioAnalyzer { public AudioAnalyzer() { sender = new MiniSender(); - analysisAlgorithm = new Runnable() { @Override @@ -359,4 +358,12 @@ public class AudioAnalyzer { public float getsecondsPerWindow() { return secondsPerWindow; } + + public float getBassAvg() { + return bassAvg; + } + + public float getUmAvg() { + return umAvg; + } } diff --git a/core/src/zero1hd/polyjet/entity/ally/PolyJetEntity.java b/core/src/zero1hd/polyjet/entity/ally/PolyJetEntity.java index fc1271b..a129657 100755 --- a/core/src/zero1hd/polyjet/entity/ally/PolyJetEntity.java +++ b/core/src/zero1hd/polyjet/entity/ally/PolyJetEntity.java @@ -1,7 +1,6 @@ package zero1hd.polyjet.entity.ally; import com.badlogic.gdx.assets.AssetManager; -import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.graphics.Texture; import com.badlogic.gdx.graphics.g2d.Batch; import com.badlogic.gdx.graphics.g2d.ParticleEffect; diff --git a/core/src/zero1hd/polyjet/entity/enemies/VoidCircle.java b/core/src/zero1hd/polyjet/entity/enemies/VoidCircle.java index fad0c75..f8b9d6e 100755 --- a/core/src/zero1hd/polyjet/entity/enemies/VoidCircle.java +++ b/core/src/zero1hd/polyjet/entity/enemies/VoidCircle.java @@ -41,8 +41,13 @@ public VoidCircle(Texture voidTexture) { @Override public void act(float delta) { toFront(); - voidCircleTexture.setCenter(getX()+center.x, getY()+center.y); - hitBox.setCenter(getX()+center.x, getY()+center.y); + if (begin) { + voidCircleTexture.setSize(2*currentRadius, 2*currentRadius); + voidCircleTexture.setColor(0f,0f,0f,1f); + } else { + voidCircleTexture.setSize(2*endRadius, 2*endRadius); + voidCircleTexture.setColor(1f,1f,1f,0.1f); + } hitBox.setCenter(getX()+center.x, getY()+center.y); if (timer > 0) { timer -= delta; @@ -59,21 +64,14 @@ public VoidCircle(Texture voidTexture) { } } } + voidCircleTexture.setCenter(getX()+center.x, getY()+center.y); super.act(delta); } @Override public void draw(Batch batch, float parentAlpha) { - if (begin) { - voidCircleTexture.setSize(2*currentRadius, 2*currentRadius); - voidCircleTexture.setCenter(getX()+center.x, getY()+center.y); - } else { - voidCircleTexture.setSize(2*endRadius, 2*endRadius); - voidCircleTexture.setColor(1f,0f,0f,0.5f); - voidCircleTexture.draw(batch); - } - + voidCircleTexture.draw(batch); batch.setColor(Color.WHITE); super.draw(batch, parentAlpha); } @@ -90,6 +88,7 @@ public VoidCircle(Texture voidTexture) { center.set(0, 0); voidCircleTexture.setPosition(0, 0); setSize(0, 0); + setPosition(0, 0); } public void growCurrentRadius(float radius) { diff --git a/core/src/zero1hd/polyjet/ui/stages/CreativeStage.java b/core/src/zero1hd/polyjet/ui/stages/CreativeStage.java index d31509b..8b0d25b 100755 --- a/core/src/zero1hd/polyjet/ui/stages/CreativeStage.java +++ b/core/src/zero1hd/polyjet/ui/stages/CreativeStage.java @@ -63,7 +63,7 @@ public class CreativeStage extends Stage implements MiniListener { addActor(backButton); - toolbox = new Window("Tools", core.getDefaultSkin()); + toolbox = new Window("Tools", core.getDefaultSkin(), "tinted"); toolbox.defaults().pad(5f); Table toolboxToolSet = new Table(core.getDefaultSkin()); diff --git a/core/src/zero1hd/polyjet/ui/stages/GamePlayArea.java b/core/src/zero1hd/polyjet/ui/stages/GamePlayArea.java index 24dc947..19fcac1 100755 --- a/core/src/zero1hd/polyjet/ui/stages/GamePlayArea.java +++ b/core/src/zero1hd/polyjet/ui/stages/GamePlayArea.java @@ -54,7 +54,7 @@ public class GamePlayArea extends Stage { } /** - * needs to be called right after set (should be called in show method). + * needs to be called right after set as screen (should be called in show method). * @param prefs */ public void loadShaders(Preferences prefs) { @@ -106,6 +106,8 @@ public class GamePlayArea extends Stage { getBatch().draw(background, 0f, 0f, Polyjet.GAME_AREA_WIDTH, Polyjet.GAME_AREA_HEIGHT); getBatch().end(); + + getBatch().setShader(null); super.draw(); } diff --git a/core/src/zero1hd/polyjet/ui/windows/DifficultyWindow.java b/core/src/zero1hd/polyjet/ui/windows/DifficultyWindow.java new file mode 100755 index 0000000..7e927a6 --- /dev/null +++ b/core/src/zero1hd/polyjet/ui/windows/DifficultyWindow.java @@ -0,0 +1,67 @@ +package zero1hd.polyjet.ui.windows; + +import com.badlogic.gdx.scenes.scene2d.Actor; +import com.badlogic.gdx.scenes.scene2d.ui.Label; +import com.badlogic.gdx.scenes.scene2d.ui.Skin; +import com.badlogic.gdx.scenes.scene2d.ui.Slider; +import com.badlogic.gdx.scenes.scene2d.ui.Window; +import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener; + +public class DifficultyWindow extends Window { + private Slider sensitivityRating; + private Label sensitivityRatingTitle; + private Slider speedModifier; + private Label speedModifierTitle; + private Slider healthModifier; + private Label healthModifierTitle; + + public DifficultyWindow(String title, Skin skin) { + super(title, skin, "tinted"); + sensitivityRating = new Slider(-5f, 5f, 1f, false, skin); + sensitivityRating.setValue(0f); + sensitivityRating.addListener(new ChangeListener() { + + @Override + public void changed(ChangeEvent event, Actor actor) { + sensitivityRatingTitle.setText("Base Difficulty: " + sensitivityRating.getValue()); + } + }); + + sensitivityRatingTitle = new Label("Base Difficulty: " + sensitivityRating.getValue(), skin, "sub-font", skin.getColor("default")); + add(sensitivityRatingTitle); + row(); + add(sensitivityRating).fillX(); + + row(); + + speedModifier = new Slider(1f, 3f, 0.25f, false, skin); + speedModifier.setValue(1f); + speedModifier.addListener(new ChangeListener() { + @Override + public void changed(ChangeEvent event, Actor actor) { + speedModifierTitle.setText("Speed Modifier: " + speedModifier.getValue()); + } + }); + speedModifierTitle = new Label("Speed Modifier: " + speedModifier.getValue(), skin, "sub-font", skin.getColor("default")); + add(speedModifierTitle); + row(); + add(speedModifier).fillX(); + + row(); + + healthModifier = new Slider(0f, 5f, 1f, false, skin); + healthModifier.setValue(0f); + healthModifier.addListener(new ChangeListener() { + + @Override + public void changed(ChangeEvent event, Actor actor) { + healthModifierTitle.setText("Health modifier: " + healthModifier.getValue()); + } + }); + healthModifierTitle = new Label("Health modifier: " + healthModifier.getValue(), skin, "sub-font", skin.getColor("default")); + add(healthModifierTitle); + row(); + add(healthModifier).fillX().spaceBottom(15f); + } + +} diff --git a/core/src/zero1hd/polyjet/ui/windows/FPSWindow.java b/core/src/zero1hd/polyjet/ui/windows/FPSWindow.java index e9d978f..9c3d3e1 100755 --- a/core/src/zero1hd/polyjet/ui/windows/FPSWindow.java +++ b/core/src/zero1hd/polyjet/ui/windows/FPSWindow.java @@ -6,7 +6,6 @@ import com.badlogic.gdx.scenes.scene2d.ui.Skin; import com.badlogic.gdx.scenes.scene2d.ui.Window; public class FPSWindow extends Window { - public FPSWindow(String title, Skin skin) { super(title, skin, "tinted"); Label FPS = new Label("FPS: ", skin, "window-font", skin.getColor("default")) {