From 05cf360e71cae1ef1311ead5533cb3af87c82664 Mon Sep 17 00:00:00 2001
From: Recrown <yunyangdeng@gmail.com>
Date: Thu, 13 Jul 2017 00:55:37 -0500
Subject: [PATCH] slight revisions on analysis and map gen

---
 .../zero1hd/polyjet/audio/AudioAnalyzer.java  |  4 ++--
 .../polyjet/audio/map/GamePlayMap.java        |  3 ++-
 .../polyjet/audio/map/RhythmMapAlgorithm.java | 20 +++++++++----------
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/core/src/zero1hd/polyjet/audio/AudioAnalyzer.java b/core/src/zero1hd/polyjet/audio/AudioAnalyzer.java
index 1b58992..e120891 100755
--- a/core/src/zero1hd/polyjet/audio/AudioAnalyzer.java
+++ b/core/src/zero1hd/polyjet/audio/AudioAnalyzer.java
@@ -68,12 +68,12 @@ public class AudioAnalyzer {
 				umThresholdMultiplier = 2f;
 				
 				bassBinBegin = 2;
-				bassBinEnd = 16;
+				bassBinEnd = 17;
 				
 				UMBinBegin = 300;
 				UMBinEnd = 450;
 				
-				UMThresholdCalcRange = thresholdRangeCalc(0.5f);
+				UMThresholdCalcRange = thresholdRangeCalc(0.6f);
 				bassThresholdCalcRange = thresholdRangeCalc(0.7f);
 				
 				Gdx.app.debug("Read freq", String.valueOf(audioData.getFormat().getSampleRate()));
diff --git a/core/src/zero1hd/polyjet/audio/map/GamePlayMap.java b/core/src/zero1hd/polyjet/audio/map/GamePlayMap.java
index 422d06d..092c71c 100755
--- a/core/src/zero1hd/polyjet/audio/map/GamePlayMap.java
+++ b/core/src/zero1hd/polyjet/audio/map/GamePlayMap.java
@@ -95,7 +95,8 @@ public class GamePlayMap {
 	public EntitySpawnInfo safeNextEntity() {
 		playableClip.readIndexUpdate();
 		if (index != playableClip.getReadIndex()) {
-			index = Math.max(0, playableClip.getReadIndex()-1);
+			index = playableClip.getReadIndex();
+			Gdx.app.debug("GPM", "index: " + index);
 			return nextEntity(false);
 		} else {
 			return null;
diff --git a/core/src/zero1hd/polyjet/audio/map/RhythmMapAlgorithm.java b/core/src/zero1hd/polyjet/audio/map/RhythmMapAlgorithm.java
index 15f624c..6d474c6 100755
--- a/core/src/zero1hd/polyjet/audio/map/RhythmMapAlgorithm.java
+++ b/core/src/zero1hd/polyjet/audio/map/RhythmMapAlgorithm.java
@@ -60,21 +60,19 @@ public class RhythmMapAlgorithm implements Runnable {
 							);
 				}
 				if (bassPeaks.get(index) != 0) {
-//					float xSpawnLocation = (rand.nextFloat()*(Polyjet.GAME_AREA_WIDTH-2))+1;
-//					map.addToMap(Entities.PELLET,
-//							xSpawnLocation,
-//							Polyjet.GAME_AREA_HEIGHT-0.25f, 
-//							180*rand.nextFloat()+90, 
-//							speedMod*(1f/avgBPS));
-					
 					map.addToMap(Entities.BAR, 
-							MathUtils.round(3), 
+							MathUtils.round(1.5f+rand.nextFloat()*(Polyjet.GAME_AREA_WIDTH-3)), 
 							(8f/avgBPS)*speedMod);
 				} else {
 					if (UMPeaks.get(index) != 0) {
-//					map.addToMap(Entities.BAR, 
-//							MathUtils.round(3), 
-//							(1.5f/avgBPS)*speedMod);
+						float xSpawnLocation = (rand.nextFloat()*(Polyjet.GAME_AREA_WIDTH-2))+1;
+						map.addToMap(Entities.PELLET,
+								xSpawnLocation,
+								Polyjet.GAME_AREA_HEIGHT-0.25f, 
+								180*rand.nextFloat()+90, 
+								speedMod*(1f/avgBPS));
+						
+						
 					}
 				}