From f1b0a2b20e8f611b46e968b904e32a9bf67ddd41 Mon Sep 17 00:00:00 2001 From: Recrown Date: Tue, 11 Jul 2017 18:04:40 -0500 Subject: [PATCH] minor cleanup --- core/src/zero1hd/polyjet/audio/AudioAnalyzer.java | 4 ++-- core/src/zero1hd/polyjet/audio/map/GamePlayMap.java | 2 +- core/src/zero1hd/polyjet/audio/map/RhythmMapAlgorithm.java | 3 ++- core/src/zero1hd/polyjet/ui/pages/AnalyzePage.java | 7 ++----- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/core/src/zero1hd/polyjet/audio/AudioAnalyzer.java b/core/src/zero1hd/polyjet/audio/AudioAnalyzer.java index f7d009b..1381cd5 100755 --- a/core/src/zero1hd/polyjet/audio/AudioAnalyzer.java +++ b/core/src/zero1hd/polyjet/audio/AudioAnalyzer.java @@ -284,8 +284,8 @@ public class AudioAnalyzer { } public void runThresholdCleaning(float rangeModifier) { - this.bassThresholdMultiplier /= rangeModifier; - this.umThresholdMultiplier /= rangeModifier; + this.bassThresholdMultiplier -= rangeModifier; + this.umThresholdMultiplier -= rangeModifier; work = true; Thread thresholdClean = new Thread(thresholdCalculator); thresholdClean.start(); diff --git a/core/src/zero1hd/polyjet/audio/map/GamePlayMap.java b/core/src/zero1hd/polyjet/audio/map/GamePlayMap.java index de00693..f5f730e 100755 --- a/core/src/zero1hd/polyjet/audio/map/GamePlayMap.java +++ b/core/src/zero1hd/polyjet/audio/map/GamePlayMap.java @@ -69,7 +69,7 @@ public class GamePlayMap { /** * use this to add rest for current index position */ - public void addRestToMap() { + public void addNullToMap() { if (building) { spawnList.add(null); } diff --git a/core/src/zero1hd/polyjet/audio/map/RhythmMapAlgorithm.java b/core/src/zero1hd/polyjet/audio/map/RhythmMapAlgorithm.java index 60ff262..c273678 100755 --- a/core/src/zero1hd/polyjet/audio/map/RhythmMapAlgorithm.java +++ b/core/src/zero1hd/polyjet/audio/map/RhythmMapAlgorithm.java @@ -67,8 +67,9 @@ public class RhythmMapAlgorithm implements Runnable { speedMod*(Polyjet.GAME_AREA_HEIGHT/3)/avgBPS); } } + } else { - map.addRestToMap(); + map.addNullToMap(); } progress = (int) (100f*index/bassPeaks.size); diff --git a/core/src/zero1hd/polyjet/ui/pages/AnalyzePage.java b/core/src/zero1hd/polyjet/ui/pages/AnalyzePage.java index 01721af..32f8a5f 100755 --- a/core/src/zero1hd/polyjet/ui/pages/AnalyzePage.java +++ b/core/src/zero1hd/polyjet/ui/pages/AnalyzePage.java @@ -85,9 +85,6 @@ public class AnalyzePage extends Page implements MiniListener { @Override public void changed(ChangeEvent event, Actor actor) { speedModifierTitle.setText("Speed Modifier: " + speedModifier.getValue()); - if (audioAnalyzer.containsData()) { - audioAnalyzer.runThresholdCleaning(sensitivityRating.getValue()); - } } }); speedModifierTitle = new Label("Speed Modifier: " + speedModifier.getValue(), skin, "sub-font", skin.getColor("default")); @@ -109,7 +106,7 @@ public class AnalyzePage extends Page implements MiniListener { healthModifierTitle = new Label("Health modifier: " + healthModifier.getValue(), skin, "sub-font", skin.getColor("default")); difficultyTable.add(healthModifierTitle); difficultyTable.row(); - difficultyTable.add(healthModifier).fillX(); + difficultyTable.add(healthModifier).fillX().spaceBottom(15f); difficultyTable.row(); @@ -121,7 +118,7 @@ public class AnalyzePage extends Page implements MiniListener { info[2].setText("Confirmed."); confirmed = true; confirmDiffButton.setDisabled(true); - if (audioAnalyzer.containsData()) { + if (audioAnalyzer.containsData() ) { finalizeData(); } }