From 34fd88cae0745b51dad1fb27febd0da63a40fa9a Mon Sep 17 00:00:00 2001
From: Recrown <yunyangdeng@gmail.com>
Date: Sat, 15 Jul 2017 14:57:18 -0500
Subject: [PATCH] Revert "tuning and adjustments"

This reverts commit e4359f41b2fc35283fe732911bb68166a8588a2a.
---
 core/src/zero1hd/polyjet/audio/AudioAnalyzer.java     |  2 +-
 core/src/zero1hd/polyjet/audio/map/GamePlayMap.java   | 11 +++++++++++
 .../zero1hd/polyjet/audio/map/RhythmMapAlgorithm.java |  7 ++++++-
 core/src/zero1hd/polyjet/ui/builders/AudioGraph.java  |  2 +-
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/core/src/zero1hd/polyjet/audio/AudioAnalyzer.java b/core/src/zero1hd/polyjet/audio/AudioAnalyzer.java
index 0f02e04..3fd2b9b 100755
--- a/core/src/zero1hd/polyjet/audio/AudioAnalyzer.java
+++ b/core/src/zero1hd/polyjet/audio/AudioAnalyzer.java
@@ -64,7 +64,7 @@ public class AudioAnalyzer {
 				int tasksDone = 0;
 				int totalTasks = audioData.getSampleCount()/audioData.getReadWindowSize();
 				
-				bassThresholdMultiplier = 1.5f;
+				bassThresholdMultiplier = 1.7f;
 				umThresholdMultiplier = 1.5f;
 				
 				bassBinBegin = 1;
diff --git a/core/src/zero1hd/polyjet/audio/map/GamePlayMap.java b/core/src/zero1hd/polyjet/audio/map/GamePlayMap.java
index 8c306e6..fa81aeb 100755
--- a/core/src/zero1hd/polyjet/audio/map/GamePlayMap.java
+++ b/core/src/zero1hd/polyjet/audio/map/GamePlayMap.java
@@ -1,5 +1,11 @@
 package zero1hd.polyjet.audio.map;
 
+<<<<<<< HEAD
+=======
+import com.badlogic.gdx.Gdx;
+import com.badlogic.gdx.audio.Music;
+import com.badlogic.gdx.math.MathUtils;
+>>>>>>> parent of e4359f4... tuning and adjustments
 import com.badlogic.gdx.utils.Array;
 
 import zero1hd.polyjet.audio.AudioData;
@@ -95,7 +101,12 @@ public class GamePlayMap {
 		playableClip.readIndexUpdate();
 		if (index != playableClip.getReadIndex()) {
 			index = playableClip.getReadIndex();
+<<<<<<< HEAD
 			return nextEntityBatch(false);
+=======
+			Gdx.app.debug("GPM", "index: " + index);
+			return nextEntity(false);
+>>>>>>> parent of e4359f4... tuning and adjustments
 		} else {
 			return null;
 		}
diff --git a/core/src/zero1hd/polyjet/audio/map/RhythmMapAlgorithm.java b/core/src/zero1hd/polyjet/audio/map/RhythmMapAlgorithm.java
index f17beef..cda08c1 100755
--- a/core/src/zero1hd/polyjet/audio/map/RhythmMapAlgorithm.java
+++ b/core/src/zero1hd/polyjet/audio/map/RhythmMapAlgorithm.java
@@ -56,7 +56,12 @@ public class RhythmMapAlgorithm implements Runnable {
 		map.beginBuild();
 		for (int index = 0; index < bassPeaks.size; index++) {
 			if (bassPeaks.get(index) != 0 || UMPeaks.get(index) != 0) {
+<<<<<<< HEAD
 				if (bassPeaks.get(index) > avgBass) {
+=======
+				int warningTime = (int) ((3/speedMod)*windowPerSecond);
+				if ((index+warningTime < bassPeaks.size) && bassPeaks.get(index + warningTime) >= avgBass) {
+>>>>>>> parent of e4359f4... tuning and adjustments
 					//TODO basic void circle spawning
 					float endRadius = (bassPeaks.get(index)/bassMax)*(Polyjet.GAME_AREA_HEIGHT/2f);
 					
@@ -64,7 +69,7 @@ public class RhythmMapAlgorithm implements Runnable {
 							endRadius, 
 							rand.nextFloat()*Polyjet.GAME_AREA_WIDTH, 
 							rand.nextFloat()*Polyjet.GAME_AREA_HEIGHT,
-							endRadius/(avgSPB*0.6f),
+							endRadius/(avgSPB*0.5f),
 							3f/speedMod
 							);
 				}
diff --git a/core/src/zero1hd/polyjet/ui/builders/AudioGraph.java b/core/src/zero1hd/polyjet/ui/builders/AudioGraph.java
index 1859fb1..ed6ef0e 100755
--- a/core/src/zero1hd/polyjet/ui/builders/AudioGraph.java
+++ b/core/src/zero1hd/polyjet/ui/builders/AudioGraph.java
@@ -66,7 +66,7 @@ public class AudioGraph extends Actor {
 					audioGraph.drawLine(x, audioGraph.getHeight(), x, (int) (audioGraph.getHeight()-(mainGraph.get(dataIndex+x-audioGraph.getWidth()/2)/normalDataG1)*scale));
 				} catch (NullPointerException | IndexOutOfBoundsException e) {
 				}
-				audioGraph.drawLine(0, audioGraph.getHeight() - MathUtils.round(scale*(avgG1/normalDataG1)), audioGraph.getWidth(), audioGraph.getHeight() - MathUtils.round(scale*(avgG1/normalDataG1)));
+				audioGraph.drawLine(0,audioGraph.getHeight() - MathUtils.round(scale*(avgG1/normalDataG1)), audioGraph.getWidth(), audioGraph.getHeight() - MathUtils.round(scale*(avgG1/normalDataG1)));
 			}
 
 		case 1: